r23517 - /trunk/test_suite/gui_tests/test_user_functions.py -- May 28, 2014 - 15:40

Author: bugman
Date: Wed May 28 15:40:32 2014
New Revision: 23517

URL: http://svn.gna.org/viewcvs/relax?rev=23517&view=rev
Log:
Clean up of the User_functions.test_structure_rotate GUI test.

The invalid value check is simpler and the Sequence_2D GUI object return 
value is now checked to be
None.


Modified:
    trunk/test_suite/gui_tests/test_user_functions.py

Modified: trunk/test_suite/gui_tests/test_user_functions.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/test_user_functions.py?rev=23517&r1=23516&r2=23517&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/test_user_functions.py   (original)
+++ trunk/test_suite/gui_tests/test_user_functions.py   Wed May 28 15:40:32 
2014
@@ -191,22 +191,14 @@
         print("Rotation matrix:\n%s" % R)
         self.assertEqual(R, None)
 
-        # Set the rotation matrix to a number of invalid values.
-        uf.page.uf_args['R'].SetValue(str_to_gui('2'))
-        uf.page.uf_args['R'].selection_win_show()
-        uf.page.uf_args['R'].selection_win_data()
-        uf.page.uf_args['R'].SetValue(str_to_gui('die'))
-        uf.page.uf_args['R'].selection_win_show()
-        uf.page.uf_args['R'].selection_win_data()
-        uf.page.uf_args['R'].SetValue(str_to_gui('[1, 2, 3]'))
-        uf.page.uf_args['R'].selection_win_show()
-        uf.page.uf_args['R'].selection_win_data()
-        uf.page.uf_args['R'].SetValue(str_to_gui('[1]'))
-        uf.page.uf_args['R'].selection_win_show()
-        uf.page.uf_args['R'].selection_win_data()
-        uf.page.uf_args['R'].SetValue(str_to_gui('[[1, 2, 3], 1, 2, 3], [1, 
2, 3]]'))
-        uf.page.uf_args['R'].selection_win_show()
-        uf.page.uf_args['R'].selection_win_data()
+        # Set the rotation matrix 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]]']:
+            uf.page.uf_args['R'].SetValue(str_to_gui('2'))
+            uf.page.uf_args['R'].selection_win_show()
+            uf.page.uf_args['R'].selection_win_data()
+            R = uf.page.uf_args['R'].GetValue()
+            print("Rotation matrix:\n%s" % R)
+            self.assertEqual(R, None)
 
         # Check the structural data.
         self.assert_(hasattr(cdp, 'structure'))