[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py Changed some tests that used the old loadEx method to use load or the

[Jim Fulton]

Log message for revision 74838:
  Changed some tests that used the old loadEx method to use load or the
  loadEx helper function from VersionStorage, since loadEx isn't a
  storage method.
  

Changed:
  U   ZODB/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py

-=-
Modified: ZODB/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py	2007-04-26 23:20:12 UTC (rev 74837)
+++ ZODB/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py	2007-04-26 23:20:15 UTC (rev 74838)
@@ -22,6 +22,7 @@
 from ZODB.tests.MinPO import MinPO
 from ZODB.tests.StorageTestBase import zodb_unpickle
 
+from ZODB.tests.VersionStorage import loadEx
 
 class TransactionalUndoVersionStorage:
 
@@ -132,16 +133,15 @@
         self.assertEqual(load_value(oid1), 0)
         self.assertEqual(load_value(oid1, version), 2)
 
-        data, tid, ver = self._storage.loadEx(oid1, "")
+        data, tid = self._storage.load(oid1, "")
         # After undoing the version commit, the non-version data
         # once again becomes the non-version data from 'create1'.
         self.assertEqual(tid, self._storage.lastTransaction())
-        self.assertEqual(ver, "")
 
         # The current version data comes from an undo record, which
         # means that it gets data via the backpointer but tid from the
         # current txn.
-        data, tid, ver = self._storage.loadEx(oid1, version)
+        data, tid, ver = loadEx(self._storage, oid1, version)
         self.assertEqual(ver, version)
         self.assertEqual(tid, self._storage.lastTransaction())