Author: tlinnet Date: Thu Dec 5 22:48:18 2013 New Revision: 21801 URL: http://svn.gna.org/viewcvs/relax?rev=21801&view=rev Log: Expanded system test and made it pass for user function spectrum.read_spins. Work in progress for Support Request #3044, (https://gna.org/support/index.php?3044) - Load spins from SPARKY list. Modified: trunk/test_suite/system_tests/peak_lists.py Modified: trunk/test_suite/system_tests/peak_lists.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/peak_lists.py?rev=21801&r1=21800&r2=21801&view=diff ============================================================================== --- trunk/test_suite/system_tests/peak_lists.py (original) +++ trunk/test_suite/system_tests/peak_lists.py Thu Dec 5 22:48:18 2013 @@ -157,8 +157,44 @@ self.assertEqual(cdp.mol[0].res[0].name, 'LEU') self.assertEqual(len(cdp.mol[0].res[0].spin), 1) self.assertEqual(cdp.mol[0].res[0].spin[0].num, None) - #self.assertEqual(cdp.mol[0].res[0].spin[0].name, None) - + self.assertEqual(cdp.mol[0].res[0].spin[0].name, 'N') + + # 2nd residue. + self.assertEqual(cdp.mol[0].res[1].num, 4) + self.assertEqual(cdp.mol[0].res[1].name, 'GLY') + self.assertEqual(len(cdp.mol[0].res[1].spin), 1) + self.assertEqual(cdp.mol[0].res[1].spin[0].num, None) + self.assertEqual(cdp.mol[0].res[1].spin[0].name, 'N') + + # 3rd residue. + self.assertEqual(cdp.mol[0].res[2].num, 5) + self.assertEqual(cdp.mol[0].res[2].name, 'SER') + self.assertEqual(len(cdp.mol[0].res[2].spin), 1) + self.assertEqual(cdp.mol[0].res[2].spin[0].num, None) + self.assertEqual(cdp.mol[0].res[2].spin[0].name, 'N') + + # 4th residue. + self.assertEqual(cdp.mol[0].res[3].num, 6) + self.assertEqual(cdp.mol[0].res[3].name, 'MET') + self.assertEqual(len(cdp.mol[0].res[3].spin), 1) + self.assertEqual(cdp.mol[0].res[3].spin[0].num, None) + self.assertEqual(cdp.mol[0].res[3].spin[0].name, 'N') + + # 5th residue. + self.assertEqual(cdp.mol[0].res[4].num, 40) + self.assertEqual(cdp.mol[0].res[4].name, 'TRP') + self.assertEqual(len(cdp.mol[0].res[4].spin), 2) + self.assertEqual(cdp.mol[0].res[4].spin[0].num, None) + self.assertEqual(cdp.mol[0].res[4].spin[0].name, 'N') + self.assertEqual(cdp.mol[0].res[4].spin[1].num, None) + self.assertEqual(cdp.mol[0].res[4].spin[1].name, 'NE1') + + # 6th residue. + self.assertEqual(cdp.mol[0].res[5].num, 55) + self.assertEqual(cdp.mol[0].res[5].name, 'ASN') + self.assertEqual(len(cdp.mol[0].res[5].spin), 1) + self.assertEqual(cdp.mol[0].res[5].spin[0].num, None) + self.assertEqual(cdp.mol[0].res[5].spin[0].name, 'N') def test_read_peak_list_generic(self): """Test the reading of a generic peak intensity list."""