r22240 - /trunk/test_suite/system_tests/peak_lists.py -- February 21, 2014 - 16:51

Author: bugman
Date: Fri Feb 21 16:51:17 2014
New Revision: 22240

URL: http://svn.gna.org/viewcvs/relax?rev=22240&view=rev
Log:
Expanded the Peak_lists.test_read_peak_list_sparky_double system test to 
check all intensities.

This now checks all of the peak heights read by the spectrum.read_intensities 
user function.


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=22240&r1=22239&r2=22240&view=diff
==============================================================================
--- trunk/test_suite/system_tests/peak_lists.py (original)
+++ trunk/test_suite/system_tests/peak_lists.py Fri Feb 21 16:51:17 2014
@@ -818,10 +818,14 @@
         self.interpreter.spectrum.read_intensities(file=["ref_ave.list", 
"sat_ave.list"], dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id=['ref', 
'sat'], int_method='height')
 
         # Test the data.
-        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
6262)
-        
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities.values())[0], 
148614)
-        
self.assertEqual(list(cdp.mol[0].res[2].spin[0].intensities.values())[0], 
166842)
-        
self.assertEqual(list(cdp.mol[0].res[3].spin[0].intensities.values())[0], 
128690)
+        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities['ref'], 6262)
+        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities['sat'], 
2535.0)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities['ref'], 
148614)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities['sat'], 
5050.0)
+        self.assertEqual(cdp.mol[0].res[2].spin[0].intensities['ref'], 
166842)
+        self.assertEqual(cdp.mol[0].res[2].spin[0].intensities['sat'], 
51643.0)
+        self.assertEqual(cdp.mol[0].res[3].spin[0].intensities['ref'], 
128690)
+        self.assertEqual(cdp.mol[0].res[3].spin[0].intensities['sat'], 
53663.0)
 
 
     def test_read_peak_list_xeasy(self):