Author: bugman
Date: Wed Oct 5 11:43:01 2011
New Revision: 14781
URL: http://svn.gna.org/viewcvs/relax?rev=14781&view=rev
Log:
Stated to adapt the GUI tests to be able to run with relax in GUI mode.
Modified:
1.3/test_suite/gui_tests/base_classes.py
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
1.3/test_suite/gui_tests/state.py
Modified: 1.3/test_suite/gui_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/base_classes.py?rev=14781&r1=14780&r2=14781&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/base_classes.py (original)
+++ 1.3/test_suite/gui_tests/base_classes.py Wed Oct 5 11:43:01 2011
@@ -56,7 +56,15 @@
self.interpreter = Interpreter(show_script=False, quit=False,
raise_relax_error=True)
self.interpreter.populate_self()
self.interpreter.on(verbose=False)
-
+
+ # Get the wx app, if the test suite is launched from the gui.
+ self.app = wx.GetApp()
+
+ # Flag for the GUI.
+ self._gui_launch = False
+ if self.app != None:
+ self._gui_launch = True
+
def check_exceptions(self):
"""Check that no exception has occurred."""
@@ -80,11 +88,12 @@
# Create a temporary directory for the results.
ds.tmpdir = mkdtemp()
- # Start the GUI.
- self.app = wx.App(redirect=False)
+ # Start the GUI if not launched from the GUI.
+ if not self._gui_launch:
+ self.app = wx.App(redirect=False)
- # Build the GUI.
- self.gui = Main(parent=None, id=-1, title="")
+ # Build the GUI.
+ self.app.gui = Main(parent=None, id=-1, title="")
def tearDown(self):
@@ -129,5 +138,5 @@
status._setup_observers()
# Destroy the GUI.
- if hasattr(self, 'gui'):
- self.gui.Destroy()
+ if not self._gui_launch and hasattr(self.app, 'gui'):
+ self.app.gui.Destroy()
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=14781&r1=14780&r2=14781&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/model_free.py (original)
+++ 1.3/test_suite/gui_tests/model_free.py Wed Oct 5 11:43:01 2011
@@ -46,28 +46,28 @@
"""Test the model-free auto-analysis."""
# Simulate the new analysis wizard.
- self.gui.analysis.menu_new(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(0)
+ self.app.gui.analysis.menu_new(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(0)
page.select_mf(None)
page.analysis_name.SetValue(str_to_gui("Model-free test"))
- self.gui.analysis.new_wizard.wizard._go_next(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(1)
- self.gui.analysis.new_wizard.wizard._go_next(None)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(1)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
# Get the data.
- analysis_type, analysis_name, pipe_name =
self.gui.analysis.new_wizard.get_data()
+ analysis_type, analysis_name, pipe_name =
self.app.gui.analysis.new_wizard.get_data()
# Set up the analysis.
- self.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
+ self.app.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
# Alias the analysis.
- analysis = self.gui.analysis.get_page_from_name("Model-free test")
+ analysis = self.app.gui.analysis.get_page_from_name("Model-free
test")
# Change the results directory.
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(self.gui)
+ wizard = Wiz_window(self.app.gui)
# The data path.
data_path = status.install_path + sep + 'test_suite' + sep +
'shared_data' + sep + 'model_free' + sep + 'sphere' + sep
@@ -169,9 +169,9 @@
self.check_exceptions()
# Check the relax controller.
- self.assertEqual(self.gui.controller.mc_gauge_mf.GetValue(), 100)
- self.assertEqual(self.gui.controller.progress_gauge_mf.GetValue(),
100)
- self.assertEqual(self.gui.controller.main_gauge.GetValue(), 100)
+ self.assertEqual(self.app.gui.controller.mc_gauge_mf.GetValue(), 100)
+
self.assertEqual(self.app.gui.controller.progress_gauge_mf.GetValue(), 100)
+ self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 100)
# Check the diffusion tensor.
self.assertEqual(cdp.diff_tensor.type, 'sphere')
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=14781&r1=14780&r2=14781&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/noe.py (original)
+++ 1.3/test_suite/gui_tests/noe.py Wed Oct 5 11:43:01 2011
@@ -45,26 +45,26 @@
"""Test the NOE analysis."""
# Initialise all the special windows (to sometimes catch rare race
conditions).
- self.gui.show_prompt(None)
- self.gui.show_tree(None)
- self.gui.show_pipe_editor(None)
+ self.app.gui.show_prompt(None)
+ self.app.gui.show_tree(None)
+ self.app.gui.show_pipe_editor(None)
# Simulate the new analysis wizard.
- self.gui.analysis.menu_new(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(0)
+ self.app.gui.analysis.menu_new(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(0)
page.select_noe(None)
- self.gui.analysis.new_wizard.wizard._go_next(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(1)
- self.gui.analysis.new_wizard.wizard._go_next(None)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(1)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
# Get the data.
- analysis_type, analysis_name, pipe_name =
self.gui.analysis.new_wizard.get_data()
+ analysis_type, analysis_name, pipe_name =
self.app.gui.analysis.new_wizard.get_data()
# Set up the analysis.
- self.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
+ self.app.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
# Alias the analysis.
- analysis = self.gui.analysis.get_page_from_name("Steady-state NOE")
+ analysis = self.app.gui.analysis.get_page_from_name("Steady-state
NOE")
# The frequency label.
analysis.field_nmr_frq.SetValue(str_to_gui('500'))
@@ -73,7 +73,7 @@
analysis.field_results_dir.SetValue(str_to_gui(ds.tmpdir))
# Load the sequence.
- wizard = Wiz_window(self.gui)
+ wizard = Wiz_window(self.app.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))
@@ -148,7 +148,7 @@
self.check_exceptions()
# Check the relax controller.
- self.assertEqual(self.gui.controller.main_gauge.GetValue(), 100)
+ self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 100)
# The real data.
res_nums = [4, 5, 6]
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=14781&r1=14780&r2=14781&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/rx.py (original)
+++ 1.3/test_suite/gui_tests/rx.py Wed Oct 5 11:43:01 2011
@@ -89,21 +89,21 @@
data_path = status.install_path + sep + 'test_suite' + sep +
'shared_data' + sep + 'curve_fitting' + sep
# Simulate the new analysis wizard.
- self.gui.analysis.menu_new(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(0)
+ self.app.gui.analysis.menu_new(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(0)
page.select_r1(None)
- self.gui.analysis.new_wizard.wizard._go_next(None)
- page = self.gui.analysis.new_wizard.wizard.get_page(1)
- self.gui.analysis.new_wizard.wizard._go_next(None)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
+ page = self.app.gui.analysis.new_wizard.wizard.get_page(1)
+ self.app.gui.analysis.new_wizard.wizard._go_next(None)
# Get the data.
- analysis_type, analysis_name, pipe_name =
self.gui.analysis.new_wizard.get_data()
+ analysis_type, analysis_name, pipe_name =
self.app.gui.analysis.new_wizard.get_data()
# Set up the analysis.
- self.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
+ self.app.gui.analysis.new_analysis(analysis_type=analysis_type,
analysis_name=analysis_name, pipe_name=pipe_name)
# Alias the analysis.
- analysis = self.gui.analysis.get_page_from_name("R1 relaxation")
+ analysis = self.app.gui.analysis.get_page_from_name("R1 relaxation")
# The frequency label.
analysis.field_nmr_frq.SetValue(str_to_gui('600'))
@@ -112,7 +112,7 @@
analysis.field_results_dir.SetValue(str_to_gui(ds.tmpdir))
# Load the sequence.
- wizard = Wiz_window(self.gui)
+ wizard = Wiz_window(self.app.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))
@@ -232,8 +232,8 @@
self.check_exceptions()
# Check the relax controller.
- self.assertEqual(self.gui.controller.mc_gauge_rx.GetValue(), 100)
- self.assertEqual(self.gui.controller.main_gauge.GetValue(), 100)
+ self.assertEqual(self.app.gui.controller.mc_gauge_rx.GetValue(), 100)
+ self.assertEqual(self.app.gui.controller.main_gauge.GetValue(), 100)
# Check the data pipe.
self.assertEqual(cdp_name(), ds.relax_gui.analyses[0].pipe_name)
Modified: 1.3/test_suite/gui_tests/state.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/state.py?rev=14781&r1=14780&r2=14781&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/state.py (original)
+++ 1.3/test_suite/gui_tests/state.py Wed Oct 5 11:43:01 2011
@@ -45,26 +45,26 @@
# Simulate the 'Open relax state' menu entry.
file = status.install_path + sep + 'test_suite' + sep +
'shared_data' + sep + 'model_free' + sep + 'OMP' + sep +
'final_results_trunc_1.3'
- self.gui.state_load(file_name=file)
+ self.app.gui.state_load(file_name=file)
# Show the pipe editor.
- self.gui.show_pipe_editor(None)
+ self.app.gui.show_pipe_editor(None)
# The menu (this is used to set the selected pipe).
- self.gui.pipe_editor.menu(Fake_grid_cell_right_click())
+ self.app.gui.pipe_editor.menu(Fake_grid_cell_right_click())
# Associated an auto-analysis with the data pipe.
- self.gui.pipe_editor.associate_auto(None)
+ self.app.gui.pipe_editor.associate_auto(None)
# The index.
index = 0
# Test that the model-free analysis tab is loaded.
- self.assert_(not self.gui.analysis.init_state)
- self.assertEqual(self.gui.analysis._num_analyses, 1)
- self.assertEqual(len(self.gui.analysis._analyses), 1)
- self.assertEqual(self.gui.analysis.notebook.GetPageCount(), 1)
- self.assert_(self.gui.analysis._analyses[index].init_flag)
+ self.assert_(not self.app.gui.analysis.init_state)
+ self.assertEqual(self.app.gui.analysis._num_analyses, 1)
+ self.assertEqual(len(self.app.gui.analysis._analyses), 1)
+ self.assertEqual(self.app.gui.analysis.notebook.GetPageCount(), 1)
+ self.assert_(self.app.gui.analysis._analyses[index].init_flag)
# Test the relax data store.
self.assert_(hasattr(ds, 'relax_gui'))
r14781 - in /1.3/test_suite/gui_tests: base_classes.py model_free.py noe.py rx.py state.py