r23518 - /trunk/test_suite/gui_tests/test_user_functions.py -- May 28, 2014 - 15:45

Author: bugman
Date: Wed May 28 15:45:36 2014
New Revision: 23518

URL: http://svn.gna.org/viewcvs/relax?rev=23518&view=rev
Log:
Expanded the User_functions.test_structure_rotate GUI once more.

This time the setting of invalid values in the Sequence_2D element itself is 
now checked.  For
example for the rotation matrix of the structure.rotate user function, if a 
matrix element is set to
a string, a NameError is raised.


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=23518&r1=23517&r2=23518&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:45:36 
2014
@@ -193,12 +193,33 @@
 
         # 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'].SetValue(str_to_gui(val))
             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)
+
+        # Set the Sequence_2D elements to invalid values.
+        for val in ['x']:
+            uf.page.uf_args['R'].SetValue(str_to_gui(''))
+            uf.page.uf_args['R'].selection_win_show()
+            uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, 
col=1, label=str_to_gui(val))
+            uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=0, 
col=0, label=int_to_gui(1))
+            uf.page.uf_args['R'].selection_win_data()
+            R = uf.page.uf_args['R'].GetValue()
+            print("Rotation matrix:\n%s" % R)
+            self.assertEqual(len(R), 3)
+            self.assertEqual(len(R[0]), 3)
+            self.assertEqual(R[0][0], 1.0)
+            self.assertEqual(R[0][1], None)
+            self.assertEqual(R[0][2], None)
+            self.assertEqual(R[1][0], None)
+            self.assertEqual(R[1][1], None)
+            self.assertEqual(R[1][2], None)
+            self.assertEqual(R[2][0], None)
+            self.assertEqual(R[2][1], None)
+            self.assertEqual(R[2][2], None)
 
         # Check the structural data.
         self.assert_(hasattr(cdp, 'structure'))