Author: bugman
Date: Wed Jun 6 12:52:21 2012
New Revision: 16689
URL: http://svn.gna.org/viewcvs/relax?rev=16689&view=rev
Log:
Created the Relax_data.test_reset() system test for testing relax_data.frq
and relax_data.type.
These two user functions do not yet exist.
Added:
branches/uf_redesign/test_suite/system_tests/scripts/relax_data_reset.py
- copied, changed from r16685,
branches/uf_redesign/test_suite/system_tests/scripts/bug_19785_relax_data_delete.py
Modified:
branches/uf_redesign/test_suite/system_tests/relax_data.py
Modified: branches/uf_redesign/test_suite/system_tests/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/relax_data.py?rev=16689&r1=16688&r2=16689&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/relax_data.py (original)
+++ branches/uf_redesign/test_suite/system_tests/relax_data.py Wed Jun 6
12:52:21 2012
@@ -128,3 +128,21 @@
for spin in spin_loop():
self.assert_(not hasattr(spin, 'ri_data'))
self.assert_(not hasattr(spin, 'ri_data_err'))
+
+
+ def test_reset(self):
+ """Test the relax_data.frq and relax_data.type user functions to
reset the data."""
+
+ # Execute the script.
+ self.interpreter.run(script_file=status.install_path +
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_data_reset.py')
+
+ # The data, as it should be.
+ ids = ['R1_900', 'R2_900', 'NOE_900', 'R1_500', 'R2_500', 'NOE_500']
+ frqs = [900100000, 900100000, 900100000, 400100000, 500*1e6, 500*1e6]
+ types = ['R1', 'R2', 'R2', 'R1', 'R2', 'R2']
+
+ # Checks.
+ for i in range(len(ids)):
+ self.assertEqual(cdp.ri_ids[i], ids[i])
+ self.assertAlmostEqual(cdp.frq[ids[i]], frqs[i])
+ self.assertEqual(cdp.ri_types[ids[i]], types[i])
Copied:
branches/uf_redesign/test_suite/system_tests/scripts/relax_data_reset.py
(from r16685,
branches/uf_redesign/test_suite/system_tests/scripts/bug_19785_relax_data_delete.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/scripts/relax_data_reset.py?p2=branches/uf_redesign/test_suite/system_tests/scripts/relax_data_reset.py&p1=branches/uf_redesign/test_suite/system_tests/scripts/bug_19785_relax_data_delete.py&r1=16685&r2=16689&rev=16689&view=diff
==============================================================================
---
branches/uf_redesign/test_suite/system_tests/scripts/bug_19785_relax_data_delete.py
(original)
+++ branches/uf_redesign/test_suite/system_tests/scripts/relax_data_reset.py
Wed Jun 6 12:52:21 2012
@@ -1,8 +1,4 @@
-"""This system test script catches the relax_data.delete bug submitted by
Martin Ballaschk.
-
-The bug is:
- - Bug #19785 (https://gna.org/bugs/?19785).
-"""
+"""This system test script tests out the relax_data.frq and relax_data.type
user functions."""
# Python module imports.
from os import sep
@@ -15,33 +11,29 @@
# The data path.
DATA_PATH = status.install_path + sep + 'test_suite' + sep + 'shared_data' +
sep + 'model_free' + sep + 'sphere' + sep
-# Two pipes for the tests.
-pipes = ['delete 1', 'delete 2']
+# Create a data pipe.
+self._execute_uf(uf_name='pipe.create', pipe_name='test', pipe_type='mf')
-# Load the data for each pipe.
-for pipe_name in pipes:
- # Create a data pipe.
- pipe.create(pipe_name, 'mf')
+# Load the sequence.
+self._execute_uf(uf_name='sequence.read', file='noe.500.out', dir=DATA_PATH,
mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4,
spin_name_col=5)
- # Load the sequence.
- sequence.read(file='noe.500.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5)
+# Name the spins.
+self._execute_uf(uf_name='spin.name', name='N')
- # Name the spins.
- spin.name(name='N')
+# Load the relaxation data.
+self._execute_uf(uf_name='relax_data.read', ri_id='R1_900', ri_type='R1',
frq=900*1e6, file='r1.900.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
+self._execute_uf(uf_name='relax_data.read', ri_id='R2_900', ri_type='R2',
frq=900*1e6, file='r2.900.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
+self._execute_uf(uf_name='relax_data.read', ri_id='NOE_900', ri_type='NOE',
frq=900*1e6, file='noe.900.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
+self._execute_uf(uf_name='relax_data.read', ri_id='R1_500', ri_type='R1',
frq=500*1e6, file='r1.500.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
+self._execute_uf(uf_name='relax_data.read', ri_id='R2_500', ri_type='R2',
frq=500*1e6, file='r2.500.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
+self._execute_uf(uf_name='relax_data.read', ri_id='NOE_500', ri_type='NOE',
frq=500*1e6, file='noe.500.out', dir=DATA_PATH, mol_name_col=1,
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6,
error_col=7)
- # Load the relaxation data.
- relax_data.read(ri_id='R1_900', ri_type='R1', frq=900*1e6,
file='r1.900.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- relax_data.read(ri_id='R2_900', ri_type='R2', frq=900*1e6,
file='r2.900.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- relax_data.read(ri_id='NOE_900', ri_type='NOE', frq=900*1e6,
file='noe.900.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- relax_data.read(ri_id='R1_500', ri_type='R1', frq=500*1e6,
file='r1.500.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- relax_data.read(ri_id='R2_500', ri_type='R2', frq=500*1e6,
file='r2.500.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
- relax_data.read(ri_id='NOE_500', ri_type='NOE', frq=500*1e6,
file='noe.500.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2,
res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
+# Reset a few frequencies.
+self._execute_uf(uf_name='relax_data.frq', ri_id="R1_900", frq=900100000)
+self._execute_uf(uf_name='relax_data.frq', ri_id="R2_900", frq=900100000)
+self._execute_uf(uf_name='relax_data.frq', ri_id="NOE_900", frq=900100000)
+self._execute_uf(uf_name='relax_data.frq', ri_id="R1_500", frq=400100000)
- # Relaxation data deletion.
- relax_data.delete('R2_900')
- if pipe_name == 'delete 2':
- relax_data.delete('R1_900')
- relax_data.delete('NOE_900')
- relax_data.delete('R1_500')
- relax_data.delete('R2_500')
- relax_data.delete('NOE_500')
+# Reset a few types.
+self._execute_uf(uf_name='relax_data.type', ri_id="NOE_900", ri_type="R2")
+self._execute_uf(uf_name='relax_data.type', ri_id="NOE_500", ri_type="R2")
r16689 - in /branches/uf_redesign/test_suite/system_tests: relax_data.py scripts/relax_data_reset.py