r5704 - /1.3/test_suite/unit_tests/_generic_fns/test_selection.py -- April 14, 2008 - 18:20

Author: bugman
Date: Mon Apr 14 18:20:37 2008
New Revision: 5704

URL: http://svn.gna.org/viewcvs/relax?rev=5704&view=rev
Log:
A few changes to the test_boolean_complex_selection() 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=5704&r1=5703&r2=5704&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 
18:20:37 2008
@@ -1382,13 +1382,18 @@
     def test_boolean_complex_selection(self):
         """Test complex boolean mol-res-spin selections."""
 
-        # The selection loop:
+        # The residue selection loop.
         sel = list(selection.residue_loop("#Ap4Aase:4 & :Pro | #RNA"))
 
-        # Test:
+        # Residue names and numbers.
+        names = ['Pro', None, None]
+        numbers = [4, -5, -4]
+
+        # The residues.
         self.assertEqual(len(sel), 3)
-        for res in sel:
-            self.assert_(res.num in [-5,-4,4])
+        for i in xrange(3):
+            self.assertEqual(sel[i].name, names[i])
+            self.assertEqual(sel[i].num, numbers[i])
 
 
     def test_boolean_parenthesis_selection(self):