Author: bugman Date: Fri Oct 9 12:23:47 2009 New Revision: 9683 URL: http://svn.gna.org/viewcvs/relax?rev=9683&view=rev Log: Modified the BMRB system tests to check versions 3.0, 3.1, and 3.2 of the NMR-STAR definition. Modified: branches/bmrb/test_suite/system_tests/bmrb.py branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py Modified: branches/bmrb/test_suite/system_tests/bmrb.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/bmrb.py?rev=9683&r1=9682&r2=9683&view=diff ============================================================================== --- branches/bmrb/test_suite/system_tests/bmrb.py (original) +++ branches/bmrb/test_suite/system_tests/bmrb.py Fri Oct 9 12:23:47 2009 @@ -53,8 +53,31 @@ ds.__reset__() - def test_rw_bmrb_model_free(self): + def test_rw_bmrb_3_0_model_free(self): """Write and then read a BRMB STAR formatted file containing model-free results.""" + + # Set the NMR-STAR version. + ds.version = '3.0' # Execute the script. self.relax.interpreter.run(script_file=sys.path[-1] + '/test_suite/system_tests/scripts/bmrb_rw.py') + + + def test_rw_bmrb_3_1_model_free(self): + """Write and then read a BRMB STAR formatted file containing model-free results.""" + + # Set the NMR-STAR version. + ds.version = '3.1' + + # Execute the script. + self.relax.interpreter.run(script_file=sys.path[-1] + '/test_suite/system_tests/scripts/bmrb_rw.py') + + + def test_rw_bmrb_3_2_model_free(self): + """Write and then read a BRMB STAR formatted file containing model-free results.""" + + # Set the NMR-STAR version. + ds.version = '3.2' + + # Execute the script. + self.relax.interpreter.run(script_file=sys.path[-1] + '/test_suite/system_tests/scripts/bmrb_rw.py') Modified: branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py URL: http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py?rev=9683&r1=9682&r2=9683&view=diff ============================================================================== --- branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py (original) +++ branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py Fri Oct 9 12:23:47 2009 @@ -10,6 +10,7 @@ # Missing temp file (allow this script to run outside of the system test framework). if not hasattr(ds, 'tmpfile'): ds.tmpfile = 'temp_bmrb' + ds.version = '3.1' # Create the data pipe. pipe.create(pipe_name='results', pipe_type='mf')