r23541 - in /branches/frame_order_cleanup: ./ test_suite/gui_tests/test_user_functions.py -- May 28, 2014 - 17:41

Author: bugman
Date: Wed May 28 17:41:33 2014
New Revision: 23541

URL: http://svn.gna.org/viewcvs/relax?rev=23541&view=rev
Log:
Merged revisions 23532 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23532 | bugman | 2014-05-28 17:00:48 +0200 (Wed, 28 May 2014) | 3 lines
  
  Modified the User_functions.test_dx_map GUI test to catch another problem 
with the Sequence_2D element.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 28 17:41:33 2014
@@ -1 +1 @@
-/trunk:1-23493,23495-23500,23505-23521
+/trunk:1-23540

Modified: 
branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py?rev=23541&r1=23540&r2=23541&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py  
  (original)
+++ branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py  
  Wed May 28 17:41:33 2014
@@ -86,6 +86,20 @@
         points = uf.page.uf_args['point'].GetValue()
         print("Points:  %s" % points)
         self.assertEqual(points, None)
+
+        # Set a valid point in the wizard, open and close the Sequence_2D 
window (twice), and check that the point comes back.
+        uf.page.uf_args['point'].SetValue(str_to_gui('[1, 2, -3.]'))
+        uf.page.uf_args['point'].selection_win_show()
+        uf.page.uf_args['point'].selection_win_data()
+        uf.page.uf_args['point'].selection_win_show()
+        uf.page.uf_args['point'].selection_win_data()
+        points = uf.page.uf_args['point'].GetValue()
+        print("Points:  %s" % points)
+        self.assertEqual(len(points), 1)
+        self.assertEqual(len(points[0]), 3)
+        self.assertEqual(points[0][0], 1.0)
+        self.assertEqual(points[0][1], 2.0)
+        self.assertEqual(points[0][2], -3.0)
 
         # Set the points to a number of invalid values, checking that they 
are ignored.
         for val in ['2', 'die', '[1, 2, 3]', '[1]', '[[1, 2, 3], 1, 2, 3], 
[1, 2, 3]]']: