Hi again
Here are other patches for solving formating issues in the 1.3 line.
patch_test_suite_unit_tests_data_test_diff_tensor
test_suite/unit_tests/data/test_diff_tensor.py
patch_test_suite_unit_tests_data_test___init__
test_suite/unit_tests/data/test___init__.py
patch_test_suite_unit_tests_data_test_mol_res_spin
test_suite/unit_tests/data/test_mol_res_spin.py
patch_test_suite_unit_tests_generic_fns_test_pipes
test_suite/unit_tests/generic_fns/test_pipes
patch_test_suite_unit_tests_generic_fns_test_selection
test_suite/unit_tests/generic_fns/test_residue
patch_test_suite_unit_tests_generic_fns_test_residue
test_suite/unit_tests/generic_fns/test_selection
Ciao !
Séb :)
Selon Sébastien Morin <sebastien.morin.1@xxxxxxxxx>, 09.07.2007:
Hi all,
Here are a few patches solving fomating issues in the 1.3 line (revision
3324).
patch_sample_scripts_palmer -> sample_scripts/palmer.py
patch_test_suite_runner ->
sample_scripts/relax_curve_diff.py
patch_sample_scripts_relax_curve_diff -> sample_scripts/remap.py
patch_test_suite_system_tests_jw_mapping -> test_suite/formatting.py
patch_sample_scripts_remap -> test_suite/runner.py
patch_test_suite_system_tests_main ->
test_suite/system_tests/jw_mapping.py
patch_test_suite_formatting -> test_suite/system_tests/main.py
patch_test_suite_system_tests_model_free ->
test_suite/system_tests/model_free.py
These are low importance changes but nevertheless the work needs to be done.
Cheers.
Séb :)
------------------------
Sébastien Morin
Étudiant M.Sc. Biochimie
Laboratoire S. Gagné
3252 Pav. Marchand (Université Laval)
Tél : (418) 656-2131 #4530
Fax : (418) 656-7176
e-mail : sebastien.morin.1@xxxxxxxxx
Index: test_suite/unit_tests/data/test_diff_tensor.py
===================================================================
--- test_suite/unit_tests/data/test_diff_tensor.py (revision 3324)
+++ test_suite/unit_tests/data/test_diff_tensor.py (working copy)
@@ -33,6 +33,7 @@
class Test_diff_tensor(TestCase):
"""Unit tests for the data.diff_tensor relax module."""
+
def calc_spheroid_objects(self, tm, Da, theta, phi):
"""Function for calculating the spheroidal diffusion tensor
objects."""
Index: test_suite/unit_tests/data/test___init__.py
===================================================================
--- test_suite/unit_tests/data/test___init__.py (revision 3324)
+++ test_suite/unit_tests/data/test___init__.py (working copy)
@@ -35,10 +35,11 @@
class Test___init__(TestCase):
"""Unit tests for the data.Data class."""
+
def setUp(self):
"""Set up a complex relax data store."""
- # Get an instance of the relax data object fot testing. This is a
deliberate breach of
+ # Get an instance of the relax data object fot testing. This is a
deliberate breach of
# the Singleton design of this class for testing purposes only. Dont
try this at home!
self.data_store = Data.__class__()
Index: test_suite/unit_tests/data/test_mol_res_spin.py
===================================================================
--- test_suite/unit_tests/data/test_mol_res_spin.py (revision 3324)
+++ test_suite/unit_tests/data/test_mol_res_spin.py (working copy)
@@ -30,6 +30,7 @@
class Test_mol_res_spin(TestCase):
"""Unit tests for the data.mol_res_spin relax module."""
+
def setUp(self):
"""Create a mol-res-spin structure for testing all the object
methods."""
Index: test_suite/unit_tests/generic_fns/test_pipes.py
===================================================================
--- test_suite/unit_tests/generic_fns/test_pipes.py (revision 3324)
+++ test_suite/unit_tests/generic_fns/test_pipes.py (working copy)
@@ -34,6 +34,7 @@
class Test_pipes(TestCase):
"""Unit tests for the functions of the 'generic_fns.pipes' module."""
+
def setUp(self):
"""Set up for all the data pipe unit tests."""
@@ -125,7 +126,8 @@
def test_copy_fail(self):
- """Test the failure of the copying of data pipes when the data pipe
to copy to already exists.
+ """Test the failure of the copying of data pipes when the data pipe
to copy to already
+ exists.
The function tested is generic_fns.pipes.copy()
"""
Index: test_suite/unit_tests/generic_fns/test_residue.py
===================================================================
--- test_suite/unit_tests/generic_fns/test_residue.py (revision 3324)
+++ test_suite/unit_tests/generic_fns/test_residue.py (working copy)
@@ -34,6 +34,7 @@
class Test_residue(TestCase):
"""Unit tests for the functions of the 'generic_fns.residue' module."""
+
def setUp(self):
"""Set up for all the residue unit tests."""
Index: test_suite/unit_tests/generic_fns/test_selection.py
===================================================================
--- test_suite/unit_tests/generic_fns/test_selection.py (revision 3324)
+++ test_suite/unit_tests/generic_fns/test_selection.py (working copy)
@@ -32,6 +32,7 @@
class Test_selection(TestCase):
"""Unit tests for the functions of the 'generic_fns.selection' module."""
+
def setUp(self):
"""Set up some residues and spins for testing their selection and
deselection."""
@@ -106,10 +107,9 @@
# Increment i.
i = i + 1
-
+
# Test loop length.
self.assertEqual(len(list(selection.molecule_loop())), 2)
-
def test_parse_token_single_element_num(self):
@@ -275,11 +275,11 @@
for res in selection.residue_loop('#Ap4Aase:Glu'):
# Test the selection.
self.assertEqual(res.num, 2)
-
+
# Test loop length.
self.assertEqual(len(list(selection.residue_loop('#Ap4Aase:Glu'))),
1)
-
+
def test_residue_loop_no_selection(self):
"""Test the proper operation of the residue loop when no selection
is present.
@@ -304,7 +304,8 @@
# Test loop length.
self.assertEqual(i, 5)
-
+
+
def test_reverse(self):
"""Test spin system selection reversal.
@@ -347,10 +348,9 @@
# Increment i.
i = i + 1
-
+
# Test loop length.
self.assertEqual(i, 2)
-
def test_spin_loop_no_selection(self):
@@ -374,11 +374,11 @@
# Increment i.
i = i + 1
-
+
# Test loop length.
self.assertEqual(i, 7)
-
+
def test_tokenise1(self):
"""Test the generic_fns.selection.tokenise() function on the string
'@1'."""
@@ -671,29 +671,29 @@
# Tokenise an invalid string.
self.assertRaises(RelaxError, selection.tokenise, '')
-
-
+
+
def test_boolean_or_selection(self):
"""Test boolean or in mol-res-spin selections."""
self.assert_(list(selection.spin_loop("#Ap4Aase | #RNA@N5")) ==
list(selection.spin_loop()))
-
-
+
+
def test_boolean_and_selection(self):
"""Test boolean and in mol-res-spin selections."""
-
+
# The selection loop:
sel = list(selection.residue_loop("#Ap4Aase:4 & :Pro"))
-
+
# Test:
self.assertEqual(len(sel), 1)
for res in sel:
self.assert_(res.name == "Pro" and res.num == 4)
-
-
+
+
def test_boolean_complex_selection(self):
"""Test complex boolean mol-res-spin selections."""
-
+
# The selection loop:
sel = list(selection.residue_loop("#Ap4Aase:4 & :Pro | #RNA"))
@@ -701,8 +701,8 @@
self.assertEqual(len(sel), 3)
for res in sel:
self.assert_(res.num in [-5,-4,4])
-
+
def test_boolean_parenthesis_selection(self):
"""Test complex boolean mol-res-spin selections with parenthesis."""
@@ -713,4 +713,4 @@
self.assertEqual(len(sel), 2)
for res in sel:
self.assert_(res.num in [-4,4])
-
+
Re: Formating issues in the 1.3 line