Author: bugman
Date: Wed May 2 21:27:35 2012
New Revision: 15886
URL: http://svn.gna.org/viewcvs/relax?rev=15886&view=rev
Log:
The Bmrb.test_bmrb_rw GUI test now uses the new execute_uf() method for the
bmrb.citation uf.
Modified:
1.3/test_suite/gui_tests/bmrb.py
Modified: 1.3/test_suite/gui_tests/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/gui_tests/bmrb.py?rev=15886&r1=15885&r2=15886&view=diff
==============================================================================
--- 1.3/test_suite/gui_tests/bmrb.py (original)
+++ 1.3/test_suite/gui_tests/bmrb.py Wed May 2 21:27:35 2012
@@ -48,30 +48,30 @@
"""
# Create a wizard instance to be used in all user function pages.
- wizard = Wiz_window(self.app.gui)
+ self._wizard = Wiz_window(self.app.gui)
# Create the data pipe.
- pipe_create = user_functions.pipe.Create_page(wizard)
+ pipe_create = user_functions.pipe.Create_page(self._wizard)
pipe_create.pipe_name.SetValue(str_to_gui('results'))
pipe_create.pipe_type.SetSelection(VALID_TYPES.index('mf'))
pipe_create.on_execute()
# Read the results.
- results_read = user_functions.results.Read_page(wizard)
+ results_read = user_functions.results.Read_page(self._wizard)
results_read.file.SetValue(str_to_gui(status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'OMP'+sep+'final_results_trunc_1.3'))
results_read.on_execute()
# Play with the data.
- deselect_all = user_functions.deselect.All_page(wizard)
+ deselect_all = user_functions.deselect.All_page(self._wizard)
deselect_all.on_execute()
- spin_copy = user_functions.spin.Copy_page(wizard)
+ spin_copy = user_functions.spin.Copy_page(self._wizard)
spin_copy.res_from.SetValue(str_to_gui('9 None'))
spin_copy.res_num_to.SetValue(str_to_gui('9'))
spin_copy.spin_name_to.SetValue(str_to_gui('NE'))
spin_copy.on_execute()
- select_spin = user_functions.select.Spin_page(wizard)
+ select_spin = user_functions.select.Spin_page(self._wizard)
select_spin.spin_id.SetValue(str_to_gui(':9'))
select_spin.on_execute()
select_spin.spin_id.SetValue(str_to_gui(':10'))
@@ -79,25 +79,25 @@
select_spin.spin_id.SetValue(str_to_gui(':11'))
select_spin.on_execute()
- spin_name = user_functions.spin.Name_page(wizard)
+ spin_name = user_functions.spin.Name_page(self._wizard)
spin_name.name.SetValue(str_to_gui('N'))
spin_name.on_execute()
- spin_element = user_functions.spin.Element_page(wizard)
+ spin_element = user_functions.spin.Element_page(self._wizard)
spin_element.spin_id.SetValue(str_to_gui('N'))
spin_element.on_execute()
- #molecule_name = user_functions.molecule.Name_page(wizard)
+ #molecule_name = user_functions.molecule.Name_page(self._wizard)
#molecule_name.name.SetValue(str_to_gui('OMP'))
#molecule_name.type.SetValue(str_to_gui('protein'))
#molecule_name.on_execute()
- #bmrb_thiol_state = user_functions.bmrb.Thiol_state_page(wizard)
+ #bmrb_thiol_state =
user_functions.bmrb.Thiol_state_page(self._wizard)
#bmrb_thiol_state.state.SetValue(str_to_gui('reduced'))
#bmrb_thiol_state.on_execute()
# Display the data (as a test).
- #relax_data_display = user_functions.relax_data.Display_page(wizard)
+ #relax_data_display =
user_functions.relax_data.Display_page(self._wizard)
#relax_data_display.ri_id.SetValue(str_to_gui('R1_800'))
#relax_data_display.on_execute()
@@ -105,35 +105,30 @@
ri_ids = ['R1_600', 'R2_600', 'NOE_600', 'R1_800', 'R2_800',
'NOE_800']
for i in range(6):
pass
- #relax_data_temp_calibration =
user_functions.relax_data.Temp_calibration_page(wizard)
+ #relax_data_temp_calibration =
user_functions.relax_data.Temp_calibration_page(self._wizard)
#relax_data_temp_calibration.ri_id.SetValue(str_to_gui(ri_ids[i]))
#relax_data_temp_calibration.method.SetValue(str_to_gui('methanol'))
#relax_data_temp_calibration.on_execute()
- #relax_data_temp_control =
user_functions.relax_data.Temp_control_page(wizard)
+ #relax_data_temp_control =
user_functions.relax_data.Temp_control_page(self._wizard)
#relax_data_temp_control.ri_id.SetValue(str_to_gui(ri_ids[i]))
#relax_data_temp_control.method.SetValue(str_to_gui('single fid
interleaving'))
#relax_data_temp_control.on_execute()
- #relax_data_peak_intensity_type =
user_functions.relax_data.Peak_intensity_type_page(wizard)
+ #relax_data_peak_intensity_type =
user_functions.relax_data.Peak_intensity_type_page(self._wizard)
#relax_data_peak_intensity_type.ri_id.SetValue(str_to_gui(ri_ids[i]))
#relax_data_peak_intensity_type.type.SetValue(str_to_gui('height'))
#relax_data_peak_intensity_type.on_execute()
# Set up some BMRB information.
- #bmrb_software_select =
user_functions.bmrb.Software_select_page(wizard)
+ #bmrb_software_select =
user_functions.bmrb.Software_select_page(self._wizard)
#bmrb_software_select.name.SetValue(str_to_gui('NMRPipe'))
#bmrb_software_select.on_execute()
#bmrb_software_select.name.SetValue(str_to_gui('Sparky'))
#bmrb_software_select.version.SetValue(str_to_gui('3.106'))
#bmrb_software_select.on_execute()
- bmrb_citation = user_functions.bmrb.Citation_page(wizard)
- bmrb_citation.cite_id.SetValue(str_to_gui('test'))
- bmrb_citation.SetValue(key='authors', value=[["Edward",
"d'Auvergne", "E.", "J."], ["Paul", "Gooley", "P.", "R."]])
- bmrb_citation.on_execute()
-
- #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(page=user_functions.bmrb.Citation_page,
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)
#bmrb.software(name='X', url='http://www.nmr-relax.com',
vendor_name='me', cite_ids=['test'], tasks=['procrastinating', 'nothing
much', 'wasting time'])
r15886 - /1.3/test_suite/gui_tests/bmrb.py