Author: bugman
Date: Fri Dec 17 10:03:04 2010
New Revision: 11847
URL: http://svn.gna.org/viewcvs/relax?rev=11847&view=rev
Log:
Fixes for the system tests - the data is now in dictionaries.
Modified:
branches/peak_list_handling/test_suite/system_tests/peak_lists.py
branches/peak_list_handling/test_suite/system_tests/relax_fit.py
Modified: branches/peak_list_handling/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/test_suite/system_tests/peak_lists.py?rev=11847&r1=11846&r2=11847&view=diff
==============================================================================
--- branches/peak_list_handling/test_suite/system_tests/peak_lists.py
(original)
+++ branches/peak_list_handling/test_suite/system_tests/peak_lists.py Fri Dec
17 10:03:04 2010
@@ -96,7 +96,7 @@
# Test the data.
for i in range(10):
for j in range(5):
- self.assertEqual(cdp.mol[0].res[j].spin[0].intensities[i],
heights[j][i])
+
self.assertEqual(cdp.mol[0].res[j].spin[0].intensities[repr(i)],
heights[j][i])
def test_read_peak_list_nmrview(self):
@@ -111,8 +111,8 @@
self.interpreter.spectrum.read_intensities(file="cNTnC.xpk",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], -0.1694)
- self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0], -0.1142)
+ self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
-0.1694)
+ self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0],
-0.1142)
def test_read_peak_list_sparky(self):
@@ -129,10 +129,10 @@
self.interpreter.spectrum.read_intensities(file="ref_ave.list",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 6262)
- self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0], 148614)
- self.assertEqual(cdp.mol[0].res[2].spin[0].intensities[0], 166842)
- self.assertEqual(cdp.mol[0].res[3].spin[0].intensities[0], 128690)
+ self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
6262)
+ self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0],
148614)
+ self.assertEqual(cdp.mol[0].res[2].spin[0].intensities.values()[0],
166842)
+ self.assertEqual(cdp.mol[0].res[3].spin[0].intensities.values()[0],
128690)
def test_read_peak_list_xeasy(self):
@@ -166,25 +166,25 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 9.714e+03)
- self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0], 7.919e+03)
- self.assertEqual(cdp.mol[0].res[2].spin[0].intensities[0], 1.356e+04)
- self.assertEqual(cdp.mol[0].res[3].spin[0].intensities[0], 9.884e+03)
- self.assertEqual(cdp.mol[0].res[4].spin[0].intensities[0], 2.041e+04)
- self.assertEqual(cdp.mol[0].res[5].spin[0].intensities[0], 9.305e+03)
- self.assertEqual(cdp.mol[0].res[6].spin[0].intensities[0], 3.154e+04)
- self.assertEqual(cdp.mol[0].res[7].spin[0].intensities[0], 9.180e+03)
- self.assertEqual(cdp.mol[0].res[9].spin[0].intensities[0], 1.104e+04)
- self.assertEqual(cdp.mol[0].res[10].spin[0].intensities[0],
7.680e+03)
- self.assertEqual(cdp.mol[0].res[11].spin[0].intensities[0],
5.206e+03)
- self.assertEqual(cdp.mol[0].res[12].spin[0].intensities[0],
2.863e+04)
- self.assertEqual(cdp.mol[0].res[14].spin[0].intensities[0],
9.271e+03)
- self.assertEqual(cdp.mol[0].res[15].spin[0].intensities[0],
7.919e+03)
- self.assertEqual(cdp.mol[0].res[16].spin[0].intensities[0],
9.962e+03)
- self.assertEqual(cdp.mol[0].res[17].spin[0].intensities[0],
1.260e+04)
- self.assertEqual(cdp.mol[0].res[18].spin[0].intensities[0],
1.545e+04)
- self.assertEqual(cdp.mol[0].res[19].spin[0].intensities[0],
1.963e+04)
- self.assertEqual(cdp.mol[0].res[20].spin[0].intensities[0],
1.918e+04)
+ self.assertEqual(cdp.mol[0].res[ 0].spin[0].intensities.values()[0],
9.714e+03)
+ self.assertEqual(cdp.mol[0].res[ 1].spin[0].intensities.values()[0],
7.919e+03)
+ self.assertEqual(cdp.mol[0].res[ 2].spin[0].intensities.values()[0],
1.356e+04)
+ self.assertEqual(cdp.mol[0].res[ 3].spin[0].intensities.values()[0],
9.884e+03)
+ self.assertEqual(cdp.mol[0].res[ 4].spin[0].intensities.values()[0],
2.041e+04)
+ self.assertEqual(cdp.mol[0].res[ 5].spin[0].intensities.values()[0],
9.305e+03)
+ self.assertEqual(cdp.mol[0].res[ 6].spin[0].intensities.values()[0],
3.154e+04)
+ self.assertEqual(cdp.mol[0].res[ 7].spin[0].intensities.values()[0],
9.180e+03)
+ self.assertEqual(cdp.mol[0].res[ 9].spin[0].intensities.values()[0],
1.104e+04)
+ self.assertEqual(cdp.mol[0].res[10].spin[0].intensities.values()[0],
7.680e+03)
+ self.assertEqual(cdp.mol[0].res[11].spin[0].intensities.values()[0],
5.206e+03)
+ self.assertEqual(cdp.mol[0].res[12].spin[0].intensities.values()[0],
2.863e+04)
+ self.assertEqual(cdp.mol[0].res[14].spin[0].intensities.values()[0],
9.271e+03)
+ self.assertEqual(cdp.mol[0].res[15].spin[0].intensities.values()[0],
7.919e+03)
+ self.assertEqual(cdp.mol[0].res[16].spin[0].intensities.values()[0],
9.962e+03)
+ self.assertEqual(cdp.mol[0].res[17].spin[0].intensities.values()[0],
1.260e+04)
+ self.assertEqual(cdp.mol[0].res[18].spin[0].intensities.values()[0],
1.545e+04)
+ self.assertEqual(cdp.mol[0].res[19].spin[0].intensities.values()[0],
1.963e+04)
+ self.assertEqual(cdp.mol[0].res[20].spin[0].intensities.values()[0],
1.918e+04)
def test_read_peak_list_xeasy_2(self):
@@ -198,7 +198,7 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='NE1', proton='HE1', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.532e+04)
+ self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
1.532e+04)
def test_read_peak_list_xeasy_3(self):
@@ -212,7 +212,7 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='C', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 6.877e+03)
+ self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
6.877e+03)
def test_read_peak_list_xeasy_4(self):
@@ -226,4 +226,4 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='C', proton='HE1', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 7.123e+03)
+ self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
7.123e+03)
Modified: branches/peak_list_handling/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/test_suite/system_tests/relax_fit.py?rev=11847&r1=11846&r2=11847&view=diff
==============================================================================
--- branches/peak_list_handling/test_suite/system_tests/relax_fit.py
(original)
+++ branches/peak_list_handling/test_suite/system_tests/relax_fit.py Fri Dec
17 10:03:04 2010
@@ -101,8 +101,10 @@
self.assertEqual(cdp.curve_type, 'exp')
self.assertEqual(cdp.int_method, 'height')
self.assertEqual(len(cdp.relax_times), 10)
+ cdp_relax_times = cdp.relax_times.values()
+ cdp_relax_times.sort()
for i in range(10):
- self.assertEqual(cdp.relax_times[i], relax_times[i])
+ self.assertEqual(cdp_relax_times[i], relax_times[i])
# Spin data check.
i = 0
r11847 - in /branches/peak_list_handling/test_suite/system_tests: peak_lists.py relax_fit.py