more unit test work

Author: Richard Jones

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: db_test_base.py,v 1.1 2003-10-25 22:53:26 richard Exp $ 
+# $Id: db_test_base.py,v 1.2 2003-11-02 08:44:17 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time
 
@@ -817,6 +817,10 @@ def test_addNewClass(self):
         self.assertEqual(self.db.b.get(bid, 'name'), 'bear')
         self.assertEqual(self.db.b.lookup('bear'), bid)
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+        self.db.getjournal('b', bid)
+
     def init_amod(self):
         self.db = self.module.Database(config, 'admin')
         a = self.module.Class(self.db, "a", name=String(), fooz=String())
@@ -849,6 +853,10 @@ def test_modifyClass(self):
         self.assertEqual(self.db.a.get(aid2, 'name'), 'aardvark')
         self.assertEqual(self.db.a.get(aid2, 'fooz'), 'booz')
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+        self.db.getjournal('a', aid2)
+
     def init_amodkey(self):
         self.db = self.module.Database(config, 'admin')
         a = self.module.Class(self.db, "a", name=String(), fooz=String())
@@ -875,6 +883,9 @@ def test_changeClassKey(self):
         self.init_amodkey()
         self.assertEqual(self.db.a.lookup('booz'), aid2)
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+
     def init_ml(self):
         self.db = self.module.Database(config, 'admin')
         a = self.module.Class(self.db, "a", name=String())
@@ -903,6 +914,10 @@ def test_makeNewMultilink(self):
         self.assertEqual(self.db.a.lookup('apple'), aid)
         self.assertEqual(self.db.b.lookup('bear'), bid)
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+        self.db.getjournal('b', bid)
+
     def test_removeMultilink(self):
         # add a multilink prop
         self.init_ml()
@@ -918,6 +933,10 @@ def test_removeMultilink(self):
         self.assertEqual(self.db.a.lookup('apple'), aid)
         self.assertEqual(self.db.b.lookup('bear'), bid)
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+        self.db.getjournal('b', bid)
+
     def test_removeClass(self):
         self.init_ml()
         aid = self.db.a.create(name='apple')
@@ -935,6 +954,10 @@ def test_removeClass(self):
         self.assertEqual(self.db.a.get(aid, 'name'), 'apple')
         self.assertEqual(self.db.a.lookup('apple'), aid)
 
+        # confirm journal's ok
+        self.db.getjournal('a', aid)
+        self.db.getjournal('b', bid)
+
 
 class ClassicInitTest(unittest.TestCase):
     count = 0

test/test_mysql.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_mysql.py,v 1.2 2003-10-26 14:13:04 jlgijsbers Exp $ 
+# $Id: test_mysql.py,v 1.3 2003-11-02 08:44:17 richard Exp $ 
 
 import unittest, os, shutil, time, imp
 
@@ -86,7 +86,8 @@ def testCreation(self):
         l = db.issue.list()
         ae(l, [])
 
-    from roundup.backends import mysql as module
+    if hasattr(backends, 'mysql'):
+        from roundup.backends import mysql as module
     def tearDown(self):
         ClassicInitTest.tearDown(self)
         self.module.db_nuke(config)

test/test_sqlite.py

@@ -15,15 +15,17 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_sqlite.py,v 1.1 2003-10-25 22:53:26 richard Exp $ 
+# $Id: test_sqlite.py,v 1.2 2003-11-02 08:44:17 richard Exp $ 
 
 import unittest, os, shutil, time
 
 from db_test_base import DBTest, ROTest, SchemaTest, \
     ClassicInitTest
 
 class sqliteOpener:
-    from roundup.backends import sqlite as module
+    from roundup import backends
+    if hasattr(backends, 'sqlite'):
+        from roundup.backends import sqlite as module
 
 class sqliteDBTest(sqliteOpener, DBTest):
     pass