r6088 - in /branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns: test_mol_res_spin.py test_selection.py -- May 04, 2008 - 14:29

Author: bugman
Date: Sun May  4 14:29:27 2008
New Revision: 6088

URL: http://svn.gna.org/viewcvs/relax?rev=6088&view=rev
Log:
Shifted the test_reverse unit test back into test_selection.py.


Modified:
    
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
    
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_selection.py

Modified: 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=6088&r1=6087&r2=6088&view=diff
==============================================================================
--- 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
 (original)
+++ 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
 Sun May  4 14:29:27 2008
@@ -1219,28 +1219,6 @@
         self.assertRaises(RelaxNoPipeError, mol_res_spin.return_spin, 
selection=':2', pipe='new')
 
 
-    def test_reverse(self):
-        """Test spin system selection reversal.
-
-        The function tested is generic_fns.mol_res_spin.reverse().
-        """
-
-        # Reverse the selection.
-        mol_res_spin.reverse()
-
-        # Alias the current data pipe.
-        cdp = relax_data_store[relax_data_store.current_pipe]
-
-        # Test the selection status.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].select, 1)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].select, 0)
-        self.assertEqual(cdp.mol[0].res[2].spin[0].select, 1)
-        self.assertEqual(cdp.mol[1].res[0].spin[0].select, 1)
-        self.assertEqual(cdp.mol[1].res[0].spin[1].select, 0)
-        self.assertEqual(cdp.mol[1].res[1].spin[0].select, 0)
-        self.assertEqual(cdp.mol[1].res[1].spin[1].select, 1)
-
-
     def test_spin_loop(self):
         """Test the proper operation of the spin loop with spin selection.
 

Modified: 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_selection.py?rev=6088&r1=6087&r2=6088&view=diff
==============================================================================
--- 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_selection.py
 (original)
+++ 
branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_selection.py
 Sun May  4 14:29:27 2008
@@ -80,3 +80,25 @@
 
         # Reset.
         relax_data_store.__reset__()
+
+
+    def test_reverse(self):
+        """Test spin system selection reversal.
+
+        The function tested is generic_fns.selection.reverse().
+        """
+
+        # Reverse the selection.
+        selection.reverse()
+
+        # Alias the current data pipe.
+        cdp = relax_data_store[relax_data_store.current_pipe]
+
+        # Test the selection status.
+        self.assertEqual(cdp.mol[0].res[0].spin[0].select, 1)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].select, 0)
+        self.assertEqual(cdp.mol[0].res[2].spin[0].select, 1)
+        self.assertEqual(cdp.mol[1].res[0].spin[0].select, 1)
+        self.assertEqual(cdp.mol[1].res[0].spin[1].select, 0)
+        self.assertEqual(cdp.mol[1].res[1].spin[0].select, 0)
+        self.assertEqual(cdp.mol[1].res[1].spin[1].select, 1)