Author: bugman
Date: Fri Mar 22 21:53:55 2013
New Revision: 19010
URL: http://svn.gna.org/viewcvs/relax?rev=19010&view=rev
Log:
Rearrangements for the unit tests of the old relax_io module (now lib.io).
Added:
trunk/test_suite/unit_tests/_lib/test_io.py
- copied unchanged from r19009,
trunk/test_suite/unit_tests/test_relax_io.py
Removed:
trunk/test_suite/unit_tests/test_relax_io.py
Modified:
trunk/test_suite/unit_tests/_lib/__init__.py
Modified: trunk/test_suite/unit_tests/_lib/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_lib/__init__.py?rev=19010&r1=19009&r2=19010&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_lib/__init__.py (original)
+++ trunk/test_suite/unit_tests/_lib/__init__.py Fri Mar 22 21:53:55 2013
@@ -21,5 +21,7 @@
__all__ = [
- 'geometry'
+ '_geometry'
+ '_text'
+ 'test_io'
]
Removed: trunk/test_suite/unit_tests/test_relax_io.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/test_relax_io.py?rev=19009&view=auto
==============================================================================
--- trunk/test_suite/unit_tests/test_relax_io.py (original)
+++ trunk/test_suite/unit_tests/test_relax_io.py (removed)
@@ -1,76 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2007-2013 Edward d'Auvergne
#
-#
#
-# This file is part of the program relax (http://www.nmr-relax.com).
#
-#
#
-# This program 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 3 of the License, or
#
-# (at your option) any later version.
#
-#
#
-# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
#
-#
#
-###############################################################################
-
-# Python module imports.
-from os import sep
-from unittest import TestCase
-
-# relax module imports.
-import lib.io
-
-
-class Test_lib_io(TestCase):
- """Unit tests for the functions of the 'lib.io' module."""
-
-
- def test_get_file_path(self):
- """Test for file paths which should remain unmodified by
lib.io.get_file_path."""
-
- # Some file paths that shouldn't change.
- file1 = 'test'
- file2 = 'test'+sep+'aaa'
- file3 = sep+'home'+sep+'test'+sep+'aaa'
-
- # Check that nothing changes.
- self.assertEqual(lib.io.get_file_path(file1), file1)
- self.assertEqual(lib.io.get_file_path(file2), file2)
- self.assertEqual(lib.io.get_file_path(file3), file3)
-
-
- def test_get_file_path_with_dir(self):
- """The modification of file paths by lib.io.get_file_path when a
directory is supplied."""
-
- # Some file paths.
- file1 = 'test'
- file2 = 'test'+sep+'aaa'
- file3 = sep+'home'+sep+'test'+sep+'aaa'
-
- # Some directories.
- dir1 = sep+'usr'
- dir2 = 'usr'
- dir3 = sep+'usr'
-
- # Check that nothing changes.
- self.assertEqual(lib.io.get_file_path(file1, dir1), dir1+sep+file1)
- self.assertEqual(lib.io.get_file_path(file2, dir2), dir2+sep+file2)
- self.assertEqual(lib.io.get_file_path(file3, dir=dir3),
dir3+sep+file3)
-
-
- def test_get_file_path_with_homedir(self):
- """The modification of file paths with '~', by
lib.io.get_file_path."""
-
- # Some file paths.
- file1 = '~'+sep+'test'
- file2 = '~'+sep+'test'+sep+'aaa'
-
- # Check that nothing changes.
- self.assertNotEqual(lib.io.get_file_path(file1), file1)
- self.assertNotEqual(lib.io.get_file_path(file2), file2)
r19010 - in /trunk/test_suite/unit_tests: _lib/__init__.py _lib/test_io.py test_relax_io.py