Hi,
This commit causes a name clash since there is another class named
Generic and imported into the system tests.
Why is the class 'Generic' in the file
'test_suite/system_tests/generic.py' named so ?
Shouldn't it be called something like 'Curve_ftting' ?
Or should the code in this file be moved with that of the file
'test_suite/system_tests/relax_fit.py' ?
Regards,
Séb
sebastien.morin.1@xxxxxxxxx wrote:
Author: semor
Date: Fri Oct 17 20:01:24 2008
New Revision: 7798
URL: http://svn.gna.org/viewcvs/relax?rev=7798&view=rev
Log:
Started to write a system test for the support of the generic peak
intensities file.
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=7798&r1=7797&r2=7798&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/__init__.py (original)
+++ 1.3/test_suite/system_tests/__init__.py Fri Oct 17 20:01:24 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 NMRView, Sparky, XEasy
+from peak_lists import Generic, NMRView, Sparky, XEasy
from pipe_create import Pipe_create
from relax_fit import Relax_fit
from results import Results
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=7798&r1=7797&r2=7798&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/peak_lists.py (original)
+++ 1.3/test_suite/system_tests/peak_lists.py Fri Oct 17 20:01:24 2008
@@ -28,6 +28,39 @@
# relax module imports.
from data import Relax_data_store; ds = Relax_data_store()
from generic_fns import pipes
+
+
+class Generic(TestCase):
+ """TestCase class for the functional tests for the support of a
generic peak intensity file."""
+
+ 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):
+ """Test the reading of a generic peak intensity list."""
+
+ # Get the current data pipe.
+ cdp = pipes.get_pipe()
+
+ # Create the sequence data, and name the spins.
+ #self.relax.interpreter._Residue.create(72)
+ #self.relax.interpreter._Spin.name(name='N')
+
+ # Read the peak list.
+ #self.relax.interpreter._Relax_fit.read(file="cNTnC.xpk",
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists",
relax_time=0.0176, format='generic')
+
+ # Test the data.
+ #self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0],
-0.1694)
class NMRView(TestCase):
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel