r20617 - /branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py -- August 16, 2013 - 19:54

Author: bugman
Date: Fri Aug 16 19:54:36 2013
New Revision: 20617

URL: http://svn.gna.org/viewcvs/relax?rev=20617&view=rev
Log:
Unit test fixes for the spectrum.read_intensities user function argument 
changes.


Modified:
    branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py

Modified: 
branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py?rev=20617&r1=20616&r2=20617&view=diff
==============================================================================
--- branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py 
(original)
+++ branches/peak_intensities/test_suite/unit_tests/_prompt/test_spectrum.py 
Fri Aug 16 19:54:36 2013
@@ -165,30 +165,17 @@
             self.assertRaises(RelaxStrError, 
self.spectrum_fns.read_intensities, spectrum_id=data[1])
 
 
-    def test_read_intensities_argfail_heteronuc(self):
-        """The heteronuc arg test of the spectrum.read_intensities() user 
function."""
-
-        # Loop over the data types.
-        for data in DATA_TYPES:
-            # Catch the str argument, and skip it.
-            if data[0] == 'str':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxStrError, 
self.spectrum_fns.read_intensities, heteronuc=data[1])
-
-
-    def test_read_intensities_argfail_proton(self):
-        """The proton arg test of the spectrum.read_intensities() user 
function."""
-
-        # Loop over the data types.
-        for data in DATA_TYPES:
-            # Catch the str argument, and skip it.
-            if data[0] == 'str':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxStrError, 
self.spectrum_fns.read_intensities, proton=data[1])
+    def test_read_intensities_argfail_dim(self):
+        """The dim arg test of the spectrum.read_intensities() user 
function."""
+
+        # Loop over the data types.
+        for data in DATA_TYPES:
+            # Catch the int argument, and skip it.
+            if data[0] == 'int':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxStrError, 
self.spectrum_fns.read_intensities, dim=data[1])
 
 
     def test_read_intensities_argfail_int_col(self):