[Zope-Checkins] CVS: Zope2 - testFileStorage.py:1.2

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/ZODB/tests
In directory korak:/tmp/cvs-serv31294

Modified Files:
	testFileStorage.py 
Log Message:
Updated to reflect Barry's refactoring of the test base classes.
We now pass the tests we test. We still have to add the version tests,
which we were failing before.



--- Updated File testFileStorage.py in package Zope2/lib/python/ZODB --
--- testFileStorage.py	2001/04/10 20:45:58	1.1
+++ testFileStorage.py	2001/04/12 20:32:51	1.2
@@ -1,20 +1,23 @@
-import sys, os
-
+import sys
 sys.path.insert(0, '.')
 
 import ZODB.FileStorage
-import unittest, UndoVersionStorage
+import os, unittest
+import StorageTestBase, BasicStorage, TransactionalUndoStorage
 
-class FileStorageTests(UndoVersionStorage.UndoVersionStorage,
-                       unittest.TestCase):
+class FileStorageTests(
+    StorageTestBase.StorageTestBase,
+    BasicStorage.BasicStorage,
+    TransactionalUndoStorage.TransactionalUndoStorage,
+    ):
 
     def setUp(self):
         self._storage = ZODB.FileStorage.FileStorage(
             'FileStorageTests.fs', create=1)
-        UndoVersionStorage.UndoVersionStorage.setUp(self)
+        StorageTestBase.StorageTestBase.setUp(self)
 
     def tearDown(self):
-        UndoVersionStorage.UndoVersionStorage.tearDown(self)
+        StorageTestBase.StorageTestBase.tearDown(self)
         os.remove('FileStorageTests.fs')
 
 def test_suite():



--- Updated File testFileStorage.py in package Zope2 --
--- testFileStorage.py	2001/04/10 20:45:58	1.1
+++ testFileStorage.py	2001/04/12 20:32:51	1.2
@@ -1,20 +1,23 @@
-import sys, os
-
+import sys
 sys.path.insert(0, '.')
 
 import ZODB.FileStorage
-import unittest, UndoVersionStorage
+import os, unittest
+import StorageTestBase, BasicStorage, TransactionalUndoStorage
 
-class FileStorageTests(UndoVersionStorage.UndoVersionStorage,
-                       unittest.TestCase):
+class FileStorageTests(
+    StorageTestBase.StorageTestBase,
+    BasicStorage.BasicStorage,
+    TransactionalUndoStorage.TransactionalUndoStorage,
+    ):
 
     def setUp(self):
         self._storage = ZODB.FileStorage.FileStorage(
             'FileStorageTests.fs', create=1)
-        UndoVersionStorage.UndoVersionStorage.setUp(self)
+        StorageTestBase.StorageTestBase.setUp(self)
 
     def tearDown(self):
-        UndoVersionStorage.UndoVersionStorage.tearDown(self)
+        StorageTestBase.StorageTestBase.tearDown(self)
         os.remove('FileStorageTests.fs')
 
 def test_suite():