r5701 - /1.3/test_suite/unit_tests/_generic_fns/test_selection.py -- April 14, 2008 - 17:58

Author: bugman
Date: Mon Apr 14 17:58:26 2008
New Revision: 5701

URL: http://svn.gna.org/viewcvs/relax?rev=5701&view=rev
Log:
Code rearrangment in the test_Selection_boolean_and() unit test.


Modified:
    1.3/test_suite/unit_tests/_generic_fns/test_selection.py

Modified: 1.3/test_suite/unit_tests/_generic_fns/test_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/test_selection.py?rev=5701&r1=5700&r2=5701&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_generic_fns/test_selection.py (original)
+++ 1.3/test_suite/unit_tests/_generic_fns/test_selection.py Mon Apr 14 
17:58:26 2008
@@ -88,25 +88,23 @@
         # The Selection object.
         obj = selection.Selection("#Ap4Aase:4 & :Pro@Ca")
 
-        # Test the union and intersection structure.
+        # Test the highest level object.
         self.assertEqual(obj._union, None)
         self.assertNotEqual(obj._intersect, None)
-        self.assertEqual(obj._intersect[0]._union, None)
-        self.assertEqual(obj._intersect[0]._intersect, None)
-        self.assertEqual(obj._intersect[1]._union, None)
-        self.assertEqual(obj._intersect[1]._intersect, None)
-
-        # Test the molecule, residue, and spins structures of the highest 
level object.
         self.assertEqual(obj.molecules, [])
         self.assertEqual(obj.residues, [])
         self.assertEqual(obj.spins, [])
 
-        # Test the molecule, residue, and spins structures of the first 
intersection.
+        # Test the first intersection.
+        self.assertEqual(obj._intersect[0]._union, None)
+        self.assertEqual(obj._intersect[0]._intersect, None)
         self.assertEqual(obj._intersect[0].molecules, ['Ap4Aase'])
         self.assertEqual(obj._intersect[0].residues, [4])
         self.assertEqual(obj._intersect[0].spins, [])
 
-        # Test the molecule, residue, and spins structures of the second 
intersection.
+        # Test the second intersection.
+        self.assertEqual(obj._intersect[1]._union, None)
+        self.assertEqual(obj._intersect[1]._intersect, None)
         self.assertEqual(obj._intersect[1].molecules, [])
         self.assertEqual(obj._intersect[1].residues, ['Pro'])
         self.assertEqual(obj._intersect[1].spins, ['Ca'])