r13732 - /branches/gui_testing/test_suite/gui_tests/rx.py -- July 19, 2011 - 15:46

Author: bugman
Date: Tue Jul 19 15:46:53 2011
New Revision: 13732

URL: http://svn.gna.org/viewcvs/relax?rev=13732&view=rev
Log:
Fixes for the R1 auto analysis GUI test.


Modified:
    branches/gui_testing/test_suite/gui_tests/rx.py

Modified: branches/gui_testing/test_suite/gui_tests/rx.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/gui_tests/rx.py?rev=13732&r1=13731&r2=13732&view=diff
==============================================================================
--- branches/gui_testing/test_suite/gui_tests/rx.py (original)
+++ branches/gui_testing/test_suite/gui_tests/rx.py Tue Jul 19 15:46:53 2011
@@ -42,9 +42,6 @@
 
     def test_r1_analysis(self):
         """Test the r1 analysis."""
-
-        # The path to the data files.
-        data_path = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'curve_fitting'
 
         # Simulate the new analysis wizard.
         self.gui.analysis.menu_new(None)
@@ -90,6 +87,9 @@
         page = spin.Name_page(wizard, self.gui)
         page.name.SetValue(str_to_gui('N'))
         page.on_execute()
+
+        # The path to the data files.
+        data_path = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'curve_fitting' + sep
 
         # Spectrum names.
         names = [
@@ -136,11 +136,18 @@
 
             # The spectrum.
             page = analysis.wizard.get_page(analysis.page_indices['read'])
-            page.file.SetValue(str_to_gui(files[i]))
-            page.spectrum_id.SetValue(str_to_gui(ids[i]))
+            page.file.SetValue(str_to_gui("%s%s.list" % (data_path, 
names[i])))
+            page.spectrum_id.SetValue(str_to_gui(names[i]))
             page.heteronuc.SetValue(str_to_gui('HN'))
 
-            # Go to the next page (replicated spectra).
+            # Go to the next page.
+            analysis.wizard._go_next(None)
+
+            # The error type.
+            page = 
analysis.wizard.get_page(analysis.page_indices['err_type'])
+            page.selection = 'repl'
+
+            # Go to the next page.
             analysis.wizard._go_next(None)
 
             # Replicated spectra:
@@ -148,23 +155,21 @@
                 page = 
analysis.wizard.get_page(analysis.page_indices['repl'])
                 page.spectrum_id2.SetValue(str_to_gui(replicated[names[i]]))
 
-            # Move down 3 pages.
-            analysis.wizard._go_next(None)
-            analysis.wizard._go_next(None)
+            # Go to the next page.
             analysis.wizard._go_next(None)
 
             # Set the delay time.
             page = 
analysis.wizard.get_page(analysis.page_indices['relax_time'])
-            page.relax_time.SetValue(float_to_gui(ncyc[i]*time))
+            page.time.SetValue(float_to_gui(ncyc[i]*time))
 
             # Go to the next page (i.e. finish).
             analysis.wizard._go_next(None)
 
         # Execute relax.
-        page.execute(wx.CommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, 
page.button_exec_id))
+        analysis.execute(wx.CommandEvent(wx.wxEVT_COMMAND_BUTTON_CLICKED, 
analysis.button_exec_id))
 
         # Wait for execution to complete.
-        page.thread.join()
+        analysis.thread.join()
 
         # Exceptions in the thread.
         self.check_exceptions()