r14628 - in /1.3/test_suite/gui_tests: model_free.py noe.py rx.py -- September 13, 2011 - 17:37

Author: bugman
Date: Tue Sep 13 17:37:22 2011
New Revision: 14628

URL: http://svn.gna.org/viewcvs/relax?rev=14628&view=rev
Log:
Fixes for the GUI tests for the new design of the user function GUI pages.


Modified:
    1.3/test_suite/gui_tests/model_free.py
    1.3/test_suite/gui_tests/noe.py
    1.3/test_suite/gui_tests/rx.py

Modified: 1.3/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/model_free.py?rev=14628&r1=14627&r2=14628&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/model_free.py (original)
+++ 1.3/test_suite/gui_tests/model_free.py Tue Sep 13 17:37:22 2011
@@ -72,13 +72,13 @@
         analysis.field_results_dir.SetValue(str_to_gui(ds.tmpdir))
 
         # Set up a wizard window instance for all of the user function pages.
-        wizard = Wiz_window()
+        wizard = Wiz_window(self.gui)
 
         # The data path.
         data_path = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'model_free' + sep + 'sphere' + sep
 
         # Load the sequence.
-        seq_read = sequence.Read_page(wizard, self.gui)
+        seq_read = sequence.Read_page(wizard)
         seq_read.file.SetValue(str_to_gui(data_path + 'noe.500.out'))
         seq_read.on_execute()
 
@@ -92,7 +92,7 @@
             ['r2.900.out',  'r2_900',  'R2',  900e6]
         ]
         for i in range(len(data)):
-            relax_data_read = relax_data.Read_page(wizard, self.gui)
+            relax_data_read = relax_data.Read_page(wizard)
             relax_data_read.file.SetValue(str_to_gui(data_path + data[i][0]))
             relax_data_read.ri_id.SetValue(str_to_gui(data[i][1]))
             relax_data_read.ri_type.SetValue(str_to_gui(data[i][2]))
@@ -100,7 +100,7 @@
             relax_data_read.on_execute()
 
         # Set the values.
-        value_set = value.Set_page(wizard, self.gui)
+        value_set = value.Set_page(wizard)
         value_set.set_param('csa')
         value_set.on_execute()
         value_set.set_param('r')

Modified: 1.3/test_suite/gui_tests/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/noe.py?rev=14628&r1=14627&r2=14628&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/noe.py (original)
+++ 1.3/test_suite/gui_tests/noe.py Tue Sep 13 17:37:22 2011
@@ -67,8 +67,8 @@
         analysis.field_results_dir.SetValue(str_to_gui(ds.tmpdir))
 
         # Load the sequence.
-        wizard = Wiz_window()
-        seq_read = sequence.Read_page(wizard, self.gui)
+        wizard = Wiz_window(self.gui)
+        seq_read = sequence.Read_page(wizard)
         file = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'Ap4Aase.seq'
         seq_read.file.SetValue(str_to_gui(file))
         seq_read.mol_name_col.SetValue(int_to_gui(None))
@@ -79,12 +79,12 @@
         seq_read.on_execute()
 
         # Unresolved spins.
-        deselect_spin = deselect.Spin_page(wizard, self.gui)
+        deselect_spin = deselect.Spin_page(wizard)
         deselect_spin.spin_id.SetValue(str_to_gui(":3"))
         deselect_spin.on_execute()
 
         # Name the spins.
-        page = spin.Name_page(wizard, self.gui)
+        page = spin.Name_page(wizard)
         page.name.SetValue(str_to_gui('N'))
         page.on_execute()
 

Modified: 1.3/test_suite/gui_tests/rx.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/rx.py?rev=14628&r1=14627&r2=14628&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/rx.py (original)
+++ 1.3/test_suite/gui_tests/rx.py Tue Sep 13 17:37:22 2011
@@ -111,8 +111,8 @@
         analysis.field_results_dir.SetValue(str_to_gui(ds.tmpdir))
 
         # Load the sequence.
-        wizard = Wiz_window()
-        seq_read = sequence.Read_page(wizard, self.gui)
+        wizard = Wiz_window(self.gui)
+        seq_read = sequence.Read_page(wizard)
         file = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'Ap4Aase.seq'
         seq_read.file.SetValue(str_to_gui(file))
         seq_read.mol_name_col.SetValue(int_to_gui(None))
@@ -123,7 +123,7 @@
         seq_read.on_execute()
 
         # Unresolved spins.
-        deselect_read = deselect.Read_page(wizard, self.gui)
+        deselect_read = deselect.Read_page(wizard)
         deselect_read.file.SetValue(str_to_gui(data_path + 'unresolved'))
         deselect_read.mol_name_col.SetValue(int_to_gui(None))
         deselect_read.res_name_col.SetValue(int_to_gui(None))
@@ -134,7 +134,7 @@
         deselect_read.on_execute()
 
         # Name the spins.
-        page = spin.Name_page(wizard, self.gui)
+        page = spin.Name_page(wizard)
         page.name.SetValue(str_to_gui('N'))
         page.on_execute()