r7804 - in /1.3/test_suite/system_tests: __init__.py peak_lists.py -- October 18, 2008 - 17:15

Author: semor
Date: Sat Oct 18 17:15:17 2008
New Revision: 7804

URL: http://svn.gna.org/viewcvs/relax?rev=7804&view=rev
Log:
Created a class named Peak_lists including the classes Generic, NMRView, 
Sparky and Xeasy.

This solves a name clash pointed out in a post at:
https://mail.gna.org/public/relax-devel/2008-10/msg00069.html
(Message ID: 48F8E785.8090106@xxxxxxxxx)

and was proposed by Edward in a post at:
https://mail.gna.org/public/relax-devel/2008-10/msg00070.html
(Message ID: 7f080ed10810171437s2103ba32pdf9f10d1ffe0230e@xxxxxxxxxxxxxx)


Modified:
    1.3/test_suite/system_tests/__init__.py
    1.3/test_suite/system_tests/peak_lists.py

Modified: 1.3/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/__init__.py?rev=7804&r1=7803&r2=7804&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/__init__.py (original)
+++ 1.3/test_suite/system_tests/__init__.py Sat Oct 18 17:15:17 2008
@@ -44,7 +44,7 @@
 from n_state_model import N_state_model
 from noe import Noe
 from palmer import Palmer
-from peak_lists import Generic, NMRView, Sparky, XEasy
+from peak_lists import Peak_lists
 from pipe_create import Pipe_create
 from relax_fit import Relax_fit
 from results import Results
@@ -107,17 +107,15 @@
         suite_array.append(TestLoader().loadTestsFromTestCase(Modsel))
         suite_array.append(TestLoader().loadTestsFromTestCase(N_state_model))
         suite_array.append(TestLoader().loadTestsFromTestCase(Noe))
-        suite_array.append(TestLoader().loadTestsFromTestCase(NMRView))
         suite_array.append(TestLoader().loadTestsFromTestCase(Palmer))
+        suite_array.append(TestLoader().loadTestsFromTestCase(Peak_lists))
         suite_array.append(TestLoader().loadTestsFromTestCase(Pipe_create))
         suite_array.append(TestLoader().loadTestsFromTestCase(Relax_fit))
         suite_array.append(TestLoader().loadTestsFromTestCase(Results))
         suite_array.append(TestLoader().loadTestsFromTestCase(Sequence))
-        suite_array.append(TestLoader().loadTestsFromTestCase(Sparky))
         suite_array.append(TestLoader().loadTestsFromTestCase(State))
         suite_array.append(TestLoader().loadTestsFromTestCase(Structure))
         suite_array.append(TestLoader().loadTestsFromTestCase(Unit_vectors))
-        suite_array.append(TestLoader().loadTestsFromTestCase(XEasy))
 
         # Add the relax namespace to each TestCase object.
         for i in xrange(len(suite_array)):

Modified: 1.3/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/peak_lists.py?rev=7804&r1=7803&r2=7804&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/peak_lists.py (original)
+++ 1.3/test_suite/system_tests/peak_lists.py Sat Oct 18 17:15:17 2008
@@ -30,8 +30,8 @@
 from generic_fns import pipes
 
 
-class Generic(TestCase):
-    """TestCase class for the functional tests for the support of a generic 
peak intensity file."""
+class Peak_lists(TestCase):
+    """TestCase class for the functional tests for the support of different 
peak intensity files."""
         
     def setUp(self):
         """Set up for all the functional tests."""
@@ -46,7 +46,7 @@
         ds.__reset__()
         
         
-    def test_read_peak_list(self):
+    def test_read_peak_list_generic(self):
         """Test the reading of a generic peak intensity list."""
         
         # Get the current data pipe.
@@ -67,23 +67,7 @@
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 1.0000)
 
 
-class NMRView(TestCase):
-    """TestCase class for the functional tests for the support of NMRView in 
relax."""
-
-    def setUp(self):
-        """Set up for all the functional tests."""
-
-        # Create a data pipe.
-        self.relax.interpreter._Pipe.create('mf', 'mf')
-
-
-    def tearDown(self):
-        """Reset the relax data storage object."""
-
-        ds.__reset__()
-
-
-    def test_read_peak_list(self):
+    def test_read_peak_list_nmrview(self):
         """Test the reading of an NMRView peak list."""
 
         # Get the current data pipe.
@@ -102,23 +86,7 @@
         self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0][0], 
-0.1142)
 
 
-class Sparky(TestCase):
-    """TestCase class for the functional tests for the support of Sparky in 
relax."""
-
-    def setUp(self):
-        """Set up for all the functional tests."""
-
-        # Create a data pipe.
-        self.relax.interpreter._Pipe.create('mf', 'mf')
-
-
-    def tearDown(self):
-        """Reset the relax data storage object."""
-
-        ds.__reset__()
-
-
-    def test_read_peak_list(self):
+    def test_read_peak_list_sparky(self):
         """Test the reading of an Sparky peak list."""
 
         # Get the current data pipe.
@@ -141,23 +109,7 @@
         self.assertEqual(cdp.mol[0].res[3].spin[0].intensities[0][0], 128690)
 
 
-class XEasy(TestCase):
-    """TestCase class for the functional tests for the support of XEasy in 
relax."""
-
-    def setUp(self):
-        """Set up for all the functional tests."""
-
-        # Create a data pipe.
-        self.relax.interpreter._Pipe.create('mf', 'mf')
-
-
-    def tearDown(self):
-        """Reset the relax data storage object."""
-
-        ds.__reset__()
-
-
-    def test_read_peak_list(self):
+    def test_read_peak_list_xeasy(self):
         """Test the reading of an XEasy peak list."""
 
         # Get the current data pipe.