Author: bugman Date: Wed May 28 18:11:44 2014 New Revision: 23552 URL: http://svn.gna.org/viewcvs/relax?rev=23552&view=rev Log: Merged revisions 23545,23547 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r23545 | bugman | 2014-05-28 17:51:34 +0200 (Wed, 28 May 2014) | 3 lines Fix for a previous commit (r23532). ........ r23547 | bugman | 2014-05-28 17:56:10 +0200 (Wed, 28 May 2014) | 6 lines Expanded the User_functions.test_dx_map GUI test once again. The new test is to set 2 valid points in the wizard, open and close the Sequence_2D window (twice), and check that the points come back. ........ 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 18:11:44 2014 @@ -1 +1 @@ -/trunk:1-23542 +/trunk:1-23548 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=23552&r1=23551&r2=23552&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 18:11:44 2014 @@ -88,7 +88,7 @@ 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'].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() @@ -100,6 +100,24 @@ self.assertEqual(points[0][0], 1.0) self.assertEqual(points[0][1], 2.0) self.assertEqual(points[0][2], -3.0) + + # Set 2 valid points in the wizard, open and close the Sequence_2D window (twice), and check that the points come back. + uf.page.uf_args['point'].SetValue(str_to_gui('[[1, 2, 3], [-2, -3, -4]]')) + 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), 2) + self.assertEqual(len(points[0]), 3) + self.assertEqual(len(points[1]), 3) + self.assertEqual(points[0][0], 1.0) + self.assertEqual(points[0][1], 2.0) + self.assertEqual(points[0][2], 3.0) + self.assertEqual(points[1][0], -2.0) + self.assertEqual(points[1][1], -3.0) + self.assertEqual(points[1][2], -4.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]]']: