Author: bugman
Date: Mon May 7 11:17:42 2012
New Revision: 16031
URL: http://svn.gna.org/viewcvs/relax?rev=16031&view=rev
Log:
Fixes for the GUI tests.
The 'name' argument was converted to 'uf_name' as 'name' already exists as an
argument in many user
functions. A number of keyword args were also added, as these are required
for the execute_uf GUI
test method.
Modified:
branches/uf_redesign/test_suite/gui_tests/base_classes.py
branches/uf_redesign/test_suite/gui_tests/bmrb.py
Modified: branches/uf_redesign/test_suite/gui_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/base_classes.py?rev=16031&r1=16030&r2=16031&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/base_classes.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/base_classes.py Mon May 7
11:17:42 2012
@@ -78,11 +78,11 @@
pass
- def execute_uf(self, name=None, **kargs):
+ def execute_uf(self, uf_name=None, **kargs):
"""Execute the given user function.
- @keyword name: The name of the user function.
- @type name: str
+ @keyword uf_name: The name of the user function.
+ @type uf_name: str
"""
# Create and store a wizard instance to be used in all user function
pages (if needed).
@@ -90,7 +90,7 @@
self._wizard = Wiz_window(self.app.gui)
# Create the page.
- uf_page = Uf_page(name, parent=self._wizard)
+ uf_page = Uf_page(uf_name, parent=self._wizard)
# Set all the values.
for key in kargs:
Modified: branches/uf_redesign/test_suite/gui_tests/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/bmrb.py?rev=16031&r1=16030&r2=16031&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/bmrb.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/bmrb.py Mon May 7 11:17:42 2012
@@ -51,51 +51,51 @@
self._wizard = Wiz_window(self.app.gui)
# Create the data pipe.
- self.execute_uf(name='pipe.create', pipe_name='results',
pipe_type='mf')
+ self.execute_uf(uf_name='pipe.create', pipe_name='results',
pipe_type='mf')
# Read the results.
- self.execute_uf(name='results.read', file='final_results_trunc_1.3',
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
+ self.execute_uf(uf_name='results.read',
file='final_results_trunc_1.3', dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP')
# Play with the data.
- self.execute_uf(name='deselect.all')
- self.execute_uf(name='spin.copy', spin_from=':9', spin_to=':9@NE')
- self.execute_uf(name='select.spin', ':9')
- self.execute_uf(name='select.spin', ':10')
- self.execute_uf(name='select.spin', ':11')
- self.execute_uf(name='spin.name', name='N')
- self.execute_uf(name='spin.element', element='N')
- self.execute_uf(name='molecule.name', name='OMP')
- self.execute_uf(name='molecule.type', type='protein')
- self.execute_uf(name='bmrb.thiol_state', state='reduced')
+ self.execute_uf(uf_name='deselect.all')
+ self.execute_uf(uf_name='spin.copy', spin_from=':9', spin_to=':9@NE')
+ self.execute_uf(uf_name='select.spin', spin_id=':9')
+ self.execute_uf(uf_name='select.spin', spin_id=':10')
+ self.execute_uf(uf_name='select.spin', spin_id=':11')
+ self.execute_uf(uf_name='spin.name', name='N')
+ self.execute_uf(uf_name='spin.element', element='N')
+ self.execute_uf(uf_name='molecule.name', name='OMP')
+ self.execute_uf(uf_name='molecule.type', type='protein')
+ self.execute_uf(uf_name='bmrb.thiol_state', state='reduced')
# Display the data (as a test).
- self.execute_uf(name='relax_data.display', ri_id='R1_800')
+ self.execute_uf(uf_name='relax_data.display', ri_id='R1_800')
# Temperature control and peak intensity type.
ri_ids = ['R1_600', 'R2_600', 'NOE_600', 'R1_800', 'R2_800',
'NOE_800']
for i in range(6):
- self.execute_uf(name='relax_data.temp_calibration',
ri_id=ri_ids[i], method='methanol')
- self.execute_uf(name='relax_data.temp_control', ri_id=ri_ids[i],
method='single fid interleaving')
- self.execute_uf(name='relax_data.peak_intensity_type',
ri_id=ri_ids[i], type='height')
+ self.execute_uf(uf_name='relax_data.temp_calibration',
ri_id=ri_ids[i], method='methanol')
+ self.execute_uf(uf_name='relax_data.temp_control',
ri_id=ri_ids[i], method='single fid interleaving')
+ self.execute_uf(uf_name='relax_data.peak_intensity_type',
ri_id=ri_ids[i], type='height')
# Set up some BMRB information.
- self.execute_uf(name='bmrb.software_select', 'NMRPipe')
- self.execute_uf(name='bmrb.software_select', 'Sparky',
version='3.106')
+ self.execute_uf(uf_name='bmrb.software_select', 'NMRPipe')
+ self.execute_uf(uf_name='bmrb.software_select', 'Sparky',
version='3.106')
- self.execute_uf(name='bmrb.citation', cite_id='test',
authors=[["Edward", "d'Auvergne", "E.", "J."], ["Paul", "Gooley", "P.",
"R."]], doi="10.1039/b702202f", pubmed_id="17579774",
full_citation="d'Auvergne E. J., Gooley P. R. (2007). Set theory formulation
of the model-free problem and the diffusion seeded model-free paradigm. Mol.
Biosyst., 3(7), 483-494.", title="Set theory formulation of the model-free
problem and the diffusion seeded model-free paradigm.", status="published",
type="journal", journal_abbrev="Mol. Biosyst.", journal_full="Molecular
Biosystems", volume=3, issue=7, page_first=483, page_last=498, year=2007)
- self.execute_uf(name='bmrb.software', name='X',
url='http://www.nmr-relax.com', vendor_name='me', cite_ids=['test'],
tasks=['procrastinating', 'nothing much', 'wasting time'])
- self.execute_uf(name='bmrb.script', file='noe.py',
dir=status.install_path+sep+'sample_scripts', analysis_type='noe',
engine='relax')
- self.execute_uf(name='bmrb.script', file='relax_fit.py',
dir=status.install_path+sep+'sample_scripts', analysis_type='relax_fit',
engine='relax')
- self.execute_uf(name='bmrb.script', file='dauvergne_protocol.py',
dir=status.install_path+sep+'sample_scripts'+sep+'model_free',
analysis_type='mf', model_selection='AIC', engine='relax', model_elim=True,
universal_solution=True)
+ self.execute_uf(uf_name='bmrb.citation', cite_id='test',
authors=[["Edward", "d'Auvergne", "E.", "J."], ["Paul", "Gooley", "P.",
"R."]], doi="10.1039/b702202f", pubmed_id="17579774",
full_citation="d'Auvergne E. J., Gooley P. R. (2007). Set theory formulation
of the model-free problem and the diffusion seeded model-free paradigm. Mol.
Biosyst., 3(7), 483-494.", title="Set theory formulation of the model-free
problem and the diffusion seeded model-free paradigm.", status="published",
type="journal", journal_abbrev="Mol. Biosyst.", journal_full="Molecular
Biosystems", volume=3, issue=7, page_first=483, page_last=498, year=2007)
+ self.execute_uf(uf_name='bmrb.software', name='X',
url='http://www.nmr-relax.com', vendor_name='me', cite_ids=['test'],
tasks=['procrastinating', 'nothing much', 'wasting time'])
+ self.execute_uf(uf_name='bmrb.script', file='noe.py',
dir=status.install_path+sep+'sample_scripts', analysis_type='noe',
engine='relax')
+ self.execute_uf(uf_name='bmrb.script', file='relax_fit.py',
dir=status.install_path+sep+'sample_scripts', analysis_type='relax_fit',
engine='relax')
+ self.execute_uf(uf_name='bmrb.script', file='dauvergne_protocol.py',
dir=status.install_path+sep+'sample_scripts'+sep+'model_free',
analysis_type='mf', model_selection='AIC', engine='relax', model_elim=True,
universal_solution=True)
# Write, then read the data to a new data pipe.
- self.execute_uf(name='bmrb.write', file=ds.tmpfile, dir=None,
version=ds.version, force=True)
- self.execute_uf(name='pipe.create', pipe_name='new', pipe_type='mf')
- self.execute_uf(name='bmrb.read', file=ds.tmpfile,
version=ds.version)
+ self.execute_uf(uf_name='bmrb.write', file=ds.tmpfile, dir=None,
version=ds.version, force=True)
+ self.execute_uf(uf_name='pipe.create', pipe_name='new',
pipe_type='mf')
+ self.execute_uf(uf_name='bmrb.read', file=ds.tmpfile,
version=ds.version)
# Display tests.
- self.execute_uf(name='sequence.display')
- self.execute_uf(name='relax_data.display', ri_id='R1_800')
+ self.execute_uf(uf_name='sequence.display')
+ self.execute_uf(uf_name='relax_data.display', ri_id='R1_800')
# Save the program state.
- self.execute_uf(name='state.save', 'devnull', force=True)
+ self.execute_uf(uf_name='state.save', 'devnull', force=True)
r16031 - in /branches/uf_redesign/test_suite/gui_tests: base_classes.py bmrb.py