Fixed to run and pass all tests.

[librarian.git] / tests / utils.py

diff --git a/tests/utils.py b/tests/utils.py
index 1870a07..0c6f8d4 100644 (file)
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,62 +1,46 @@
+# -*- coding: utf-8 -*-
+#
+#    This file is part of Librarian.
+#
+#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
+#    
+#    For full list of contributors see AUTHORS file. 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 from __future__ import with_statement
-
+from os.path import realpath, join, dirname
+import glob
 import os
-from distutils.core import Command
-from unittest import TextTestRunner, TestLoader
-from glob import glob
-from os.path import dirname, join, realpath, splitext, basename, walk
-from os import listdir
-import codecs
-
-class AutoTestMetaclass(type):
-
-    def __new__(cls, name, bases, class_dict):        
-        test_dir = class_dict.pop('TEST_DIR')
-        path = realpath( join(dirname(__file__), 'files', test_dir) )
-
-        for file in listdir(path):
-            base, ext = splitext(file)
-            if ext != '.xml':
-                continue
 
-            class_dict['test_'+base] = cls.make_test_runner(base, \
-                    join(path, base +'.xml'), join(path, base + '.out') )
+def get_fixture_dir(dir_name):
+    """Returns path to fixtures directory dir_name."""
+    return realpath(join(dirname(__file__), 'files', dir_name))
 
-        return type.__new__(cls, name, bases, class_dict)
-    
-    @staticmethod
-    def make_test_runner(name, inputf, outputf):
-        def runner(self):
-            with open(inputf, 'rb') as ifd:
-                with codecs.open(outputf, 'rb', encoding='utf-8') as ofd:
-                    self.run_auto_test(ifd.read(), ofd.read())            
-        return runner
 
+def get_fixture(dir_name, file_name):
+    """Returns path to fixture file_name in directory dir_name."""
+    return join(get_fixture_dir(dir_name), file_name)
 
-def get_file_path(dir_name, file_name):
-    return realpath(join(dirname(__file__), 'files', dir_name, file_name))
 
-class TestCommand(Command):
-    user_options = []
+def get_all_fixtures(dir_name, glob_pattern='*'):
+    """Returns list of paths for fixtures in directory dir_name matching the glob_pattern."""
+    return [get_fixture(dir_name, file_name) for file_name in glob.glob(join(get_fixture_dir(dir_name), glob_pattern))]
 
-    def initialize_options(self):
-        self._dir = os.getcwd()
 
-    def finalize_options(self):
+def remove_output_file(dir_name, file_name):
+    try:
+        os.remove(get_fixture(dir_name, file_name))
+    except:
         pass
-
-    def run(self):
-        '''
-        Finds all the tests modules in tests/, and runs them.
-        '''
-        testfiles = []
-        for t in glob(join(self._dir, 'tests', '*.py')):
-            module_name = splitext(basename(t))[0]
-            if module_name.startswith('test'):
-                testfiles.append('.'.join(['tests', module_name])
-                )
-
-        tests = TestLoader().loadTestsFromNames(testfiles)
-        t = TextTestRunner(verbosity=2)
-        t.run(tests)
-