[Checkins] SVN: zodbupdate/branches/sylvain-persistent-load/src/zodbupdate/tests.py Fix current tests.

[Sylvain Viollon]

Log message for revision 108690:
  Fix current tests.
  

Changed:
  U   zodbupdate/branches/sylvain-persistent-load/src/zodbupdate/tests.py

-=-
Modified: zodbupdate/branches/sylvain-persistent-load/src/zodbupdate/tests.py
===================================================================
--- zodbupdate/branches/sylvain-persistent-load/src/zodbupdate/tests.py	2010-02-01 15:08:15 UTC (rev 108689)
+++ zodbupdate/branches/sylvain-persistent-load/src/zodbupdate/tests.py	2010-02-01 16:01:28 UTC (rev 108690)
@@ -41,10 +41,15 @@
         zodbupdate.update.logger.addFilter(ignore)
 
         sys.modules['module1'] =  types.ModuleType('module1')
+        sys.modules['module2'] =  types.ModuleType('module2')
         class Factory(persistent.Persistent):
             pass
+        class OtherFactory(persistent.Persistent):
+            pass
         sys.modules['module1'].Factory = Factory
         Factory.__module__ = 'module1'
+        sys.modules['module2'].OtherFactory = OtherFactory
+        OtherFactory.__module__ = 'module2'
 
         _, self.dbfile = tempfile.mkstemp()
 
@@ -84,7 +89,7 @@
         transaction.commit()
         del sys.modules['module1'].Factory
 
-        self.assertRaises(ValueError, self.update)
+        self.update()
 
     def test_factory_ignore_missing(self):
         # Create a ZODB with an object referencing a factory, then
@@ -93,13 +98,14 @@
         transaction.commit()
         del sys.modules['module1'].Factory
 
-        updater = self.update(ignore_missing=True)
+        updater = self.update()
 
         self.assertEquals('cmodule1\nFactory\nq\x01.}q\x02.',
                           self.storage.load(self.root['test']._p_oid, '')[0])
         self.assert_(isinstance(self.root['test'],
                                 ZODB.broken.PersistentBroken))
-        self.assertEquals({}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({}, renames)
 
     def test_factory_renamed(self):
         # Create a ZODB with an object referencing a factory, then
@@ -118,7 +124,8 @@
                           self.storage.load(self.root['test']._p_oid, '')[0])
         self.assertEquals('module1', self.root['test'].__class__.__module__)
         self.assertEquals('NewFactory', self.root['test'].__class__.__name__)
-        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, renames)
 
     def test_factory_renamed_dryrun(self):
         # Run an update with "dy run" option and see that the pickle is
@@ -132,12 +139,14 @@
         updater = self.update(dry=True)
         self.assertEquals('cmodule1\nFactory\nq\x01.}q\x02.',
                           self.storage.load(self.root['test']._p_oid, '')[0])
-        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, renames)
 
         updater = self.update(dry=False)
         self.assertEquals('cmodule1\nNewFactory\nq\x01.}q\x02.',
                           self.storage.load(self.root['test']._p_oid, '')[0])
-        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({'module1 Factory': 'module1 NewFactory'}, renames)
 
     def test_factory_registered_with_copy_reg(self):
         # Factories registered with copy_reg.pickle loose their __name__.
@@ -164,7 +173,8 @@
 
         self.assertEquals('module1', self.root['test'].__class__.__module__)
         self.assertEquals('AnonymousFactory', self.root['test'].__class__.__name__)
-        self.assertEquals({}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({}, renames)
 
     def test_no_transaction_if_no_changes(self):
         # If an update run doesn't produce any changes it won't commit the
@@ -172,7 +182,8 @@
         last = self.storage.lastTransaction()
         updater = self.update()
         self.assertEquals(last, self.storage.lastTransaction())
-        self.assertEquals({}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({}, renames)
 
     def test_loaded_renames_override_automatic(self):
         # Same as test_factory_renamed, but provide a pre-defined rename
@@ -188,7 +199,8 @@
 
         self.assertEquals('cmodule2\nOtherFactory\nq\x01.}q\x02.',
                           self.storage.load(self.root['test']._p_oid, '')[0])
-        self.assertEquals({'module1 Factory': 'module2 OtherFactory'}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({}, renames)
 
 
     def test_loaded_renames_override_missing(self):
@@ -203,7 +215,8 @@
 
         self.assertEquals('cmodule2\nOtherFactory\nq\x01.}q\x02.',
                           self.storage.load(self.root['test']._p_oid, '')[0])
-        self.assertEquals({'module1 Factory': 'module2 OtherFactory'}, updater.renames)
+        renames = updater.processor.get_found_implicit_rules()
+        self.assertEquals({}, renames)
 
 
 def test_suite():