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

Author: bugman
Date: Wed May 28 17:30:41 2014
New Revision: 23534

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

........
  r23500 | bugman | 2014-05-28 11:31:19 +0200 (Wed, 28 May 2014) | 3 lines
  
  Fixes for some big mistakes in the previous commit.
........

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:30:41 2014
@@ -1 +1 @@
-/trunk:1-23493,23495-23499
+/trunk:1-23493,23495-23500

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=23534&r1=23533&r2=23534&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:30:41 2014
@@ -133,24 +133,24 @@
         uf = uf_store['structure.rotate']
         uf._sync = True
         uf.create_wizard(parent=self.app.gui)
-        
uf.page.uf_args['set_model_num'].sel_win.sequence.SetStringItem(index=1, 
col=1, label=int_to_gui(2))
+
+        # Change the rotation matrix without changing anything.
+        uf.page.uf_args['R'].open_dialog(None)
+        uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, col=1, 
label=int_to_gui(2))
 
         # GUI data checks for the rotation matrix.
         R = uf.page.uf_args['R'].GetValue()
         self.assertEqual(len(R), 3)
         self.assertEqual(len(R[0]), 3)
-        self.assertEqual(R[0][0]), 1)
-        self.assertEqual(R[0][1]), 0)
-        self.assertEqual(R[0][2]), 0)
-        self.assertEqual(R[1][0]), 0)
-        self.assertEqual(R[1][1]), 2)
-        self.assertEqual(R[1][2]), 0)
-        self.assertEqual(R[2][0]), 0)
-        self.assertEqual(R[2][1]), 0)
-        self.assertEqual(R[2][2]), 1)
-
-        # Change the rotation matrix without changing anything.
-        uf.page.uf_args['R'].open_dialog(None)
+        self.assertEqual(R[0][0], 1)
+        self.assertEqual(R[0][1], 0)
+        self.assertEqual(R[0][2], 0)
+        self.assertEqual(R[1][0], 0)
+        self.assertEqual(R[1][1], 2)
+        self.assertEqual(R[1][2], 0)
+        self.assertEqual(R[2][0], 0)
+        self.assertEqual(R[2][1], 0)
+        self.assertEqual(R[2][2], 1)
 
         # Check the structural data.
         self.assert_(hasattr(cdp, 'structure'))