- unit tests have been migrated from unittest to nose.

See README.unittests for information on how to run
the tests.  [ticket:970]

4 files changed, 26 insertions, 41 deletions

diff --git a/test/zblog/alltests.py b/test/zblog/alltests.py
deleted file mode 100644
index 34a188ed7..000000000
--- a/test/zblog/alltests.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import testenv; testenv.configure_for_tests()
-from testlib import sa_unittest as unittest
-
-def suite():
-    modules_to_test = (
-        'zblog.tests',
-        )
-    alltests = unittest.TestSuite()
-    for name in modules_to_test:
-        mod = __import__(name)
-        for token in name.split('.')[1:]:
-            mod = getattr(mod, token)
-        alltests.addTest(unittest.findTestCases(mod, suiteClass=None))
-    return alltests
-
-
-if __name__ == '__main__':
-    testenv.main(suite())
diff --git a/test/zblog/mappers.py b/test/zblog/mappers.py
index 0d789f3d0..5203bd866 100644
--- a/test/zblog/mappers.py
+++ b/test/zblog/mappers.py
@@ -1,8 +1,7 @@
 """mapper.py - defines mappers for domain objects, mapping operations"""
 
-import zblog.tables as tables
-import zblog.user as user
-from zblog.blog import *
+import tables, user
+from blog import *
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import sqlalchemy.util as util
diff --git a/test/zblog/tables.py b/test/zblog/tables.py
index 4fce48a4c..36c7aeb8b 100644
--- a/test/zblog/tables.py
+++ b/test/zblog/tables.py
@@ -1,7 +1,6 @@
 """application table metadata objects are described here."""
 
 from sqlalchemy import *
-from testlib import *
 
 
 metadata = MetaData()
diff --git a/test/zblog/tests.py b/test/zblog/test_zblog.py
index f784c2796..8170766cb 100644
--- a/test/zblog/tests.py
+++ b/test/zblog/test_zblog.py
@@ -1,33 +1,39 @@
-import testenv; testenv.configure_for_tests()
 from sqlalchemy import *
 from sqlalchemy.orm import *
-from testlib import *
-from zblog import mappers, tables
-from zblog.user import *
-from zblog.blog import *
+from sqlalchemy.test import *
+import mappers, tables
+from user import *
+from blog import *
 
 
 class ZBlogTest(TestBase, AssertsExecutionResults):
 
-    def create_tables(self):
+    @classmethod
+    def create_tables(cls):
         tables.metadata.drop_all(bind=testing.db)
         tables.metadata.create_all(bind=testing.db)
-    def drop_tables(self):
+    
+    @classmethod
+    def drop_tables(cls):
         tables.metadata.drop_all(bind=testing.db)
 
-    def setUpAll(self):
-        self.create_tables()
-    def tearDownAll(self):
-        self.drop_tables()
-    def tearDown(self):
+    @classmethod
+    def setup_class(cls):
+        cls.create_tables()
+    @classmethod
+    def teardown_class(cls):
+        cls.drop_tables()
+    def teardown(self):
         pass
-    def setUp(self):
+    def setup(self):
         pass
 
 
 class SavePostTest(ZBlogTest):
-    def setUpAll(self):
-        super(SavePostTest, self).setUpAll()
+    @classmethod
+    def setup_class(cls):
+        super(SavePostTest, cls).setup_class()
+        
         mappers.zblog_mappers()
         global blog_id, user_id
         s = create_session(bind=testing.db)
@@ -41,9 +47,10 @@ class SavePostTest(ZBlogTest):
         user_id = user.id
         s.close()
 
-    def tearDownAll(self):
+    @classmethod
+    def teardown_class(cls):
         clear_mappers()
-        super(SavePostTest, self).tearDownAll()
+        super(SavePostTest, cls).teardown_class()
 
     def testattach(self):
         """test that a transient/pending instance has proper bi-directional behavior.
@@ -93,5 +100,3 @@ class SavePostTest(ZBlogTest):
             s.rollback()
 
 
-if __name__ == "__main__":
-    testenv.main()