r8423 - /branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py -- January 12, 2009 - 16:39

Author: bugman
Date: Mon Jan 12 16:39:13 2009
New Revision: 8423

URL: http://svn.gna.org/viewcvs/relax?rev=8423&view=rev
Log:
Fix for the test___parse_pdb_record() unit test.  The method is in 
MolContainer now.


Modified:
    
branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py

Modified: 
branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=8423&r1=8422&r2=8423&view=diff
==============================================================================
--- 
branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 (original)
+++ 
branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 Mon Jan 12 16:39:13 2009
@@ -27,7 +27,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
-from generic_fns.structure.internal import Internal
+from generic_fns.structure.internal import Internal, MolContainer
 from relax_io import file_root
 
 
@@ -49,10 +49,12 @@
         self.test_pdb_file_name = expanded[1]
         self.test_pdb_root = file_root(self.test_pdb_path)
 
-
         # Instantiate the structural data object.
         self.data = Internal()
 
+        # Instantiate a MolContainer object.
+        self.mol_cont = MolContainer()
+
 
     def tearDown(self):
         """Reset the relax data storage object."""
@@ -65,10 +67,10 @@
 
 
     def test___parse_pdb_record(self):
-        """Test the private Internal.__parse_pdb_record() method."""
+        """Test the private MolContainer.__parse_pdb_record() method."""
 
         # Parse a PDB record.
-        record = self.data._Internal__parse_pdb_record('ATOM    158  CG  GLU 
   11       9.590  -1.041 -11.596  1.00  0.00           C')
+        record = self.mol_cont._MolContainer__parse_pdb_record('ATOM    158  
CG  GLU    11       9.590  -1.041 -11.596  1.00  0.00           C')
 
         # Test the elements.
         self.assertEqual(record[0], 'ATOM')