Author: bugman Date: Sun May 4 13:31:07 2008 New Revision: 6073 URL: http://svn.gna.org/viewcvs/relax?rev=6073&view=rev Log: Shifted all the molecule, residue, and spin unit tests into test_mol_spin_res. Removed: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_molecule.py branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_residue.py branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_spin.py Modified: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_spin_res.py Modified: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_spin_res.py URL: http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_spin_res.py?rev=6073&r1=6072&r2=6073&view=diff ============================================================================== --- branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_spin_res.py (original) +++ branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_mol_spin_res.py Sun May 4 13:31:07 2008 @@ -27,9 +27,12 @@ from data import Data as relax_data_store from generic_fns import mol_res_spin from relax_errors import RelaxError, RelaxNoPipeError - - -class Test_mol_res_spin(TestCase): +from test_suite.unit_tests.molecule_testing_base import Molecule_base_class +from test_suite.unit_tests.residue_testing_base import Residue_base_class +from test_suite.unit_tests.spin_testing_base import Spin_base_class + + +class Test_mol_res_spin(Molecule_base_class, Residue_base_class, Spin_base_class, TestCase): """Unit tests for the functions of the 'generic_fns.mol_res_spin' module.""" def setUp(self): Removed: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_molecule.py URL: http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_molecule.py?rev=6072&view=auto ============================================================================== --- branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_molecule.py (original) +++ branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_molecule.py (removed) @@ -1,37 +1,0 @@ -############################################################################### -# # -# Copyright (C) 2007 Edward d'Auvergne # -# # -# This file is part of the program relax. # -# # -# relax is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# relax is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with relax; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -############################################################################### - -# Python module imports. -from unittest import TestCase - -# relax module imports. -from generic_fns import molecule, residue -from test_suite.unit_tests.molecule_testing_base import Molecule_base_class - - - -class Test_molecule(Molecule_base_class, TestCase): - """Unit tests for the functions of the 'generic_fns.molecule' module.""" - - # Place the generic_fns.molecule and generic_fns.residue modules into the class namespace. - molecule_fns = molecule - residue_fns = residue Removed: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_residue.py URL: http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_residue.py?rev=6072&view=auto ============================================================================== --- branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_residue.py (original) +++ branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_residue.py (removed) @@ -1,35 +1,0 @@ -############################################################################### -# # -# Copyright (C) 2007 Edward d'Auvergne # -# # -# This file is part of the program relax. # -# # -# relax is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# relax is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with relax; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -############################################################################### - -# Python module imports. -from unittest import TestCase - -# relax module imports. -from generic_fns import residue -from test_suite.unit_tests.residue_testing_base import Residue_base_class - - -class Test_residue(Residue_base_class, TestCase): - """Unit tests for the functions of the 'generic_fns.residue' module.""" - - # Place the generic_fns.residue module into the class namespace. - residue_fns = residue Removed: branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_spin.py?rev=6072&view=auto ============================================================================== --- branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_spin.py (original) +++ branches/mol_res_spin_module_rename/test_suite/unit_tests/_generic_fns/test_spin.py (removed) @@ -1,37 +1,0 @@ -############################################################################### -# # -# Copyright (C) 2007 Edward d'Auvergne # -# # -# This file is part of the program relax. # -# # -# relax is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# relax is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with relax; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -############################################################################### - -# Python module imports. -from unittest import TestCase - -# relax module imports. -from generic_fns import spin -from test_suite.unit_tests.spin_testing_base import Spin_base_class - - - -class Test_spin(Spin_base_class, TestCase): - """Unit tests for the functions of the 'generic_fns.spin' module.""" - - # Place the generic_fns.spin module into the class namespace. - spin_fns = spin -