Rev 3232: Update repository parameterisation tests to match refactoring. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

------------------------------------------------------------
revno: 3232
revision-id:robertc at robertcollins.net-20080222002055-30veteyvioimdvfs
parent: robertc at robertcollins.net-20080221230321-v8cm2p91zd3vbvyv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: external_reference_tests
timestamp: Fri 2008-02-22 11:20:55 +1100
message:
  Update repository parameterisation tests to match refactoring.
modified:
  bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py'
--- a/bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py	2008-02-20 04:45:00 +0000
+++ b/bzrlib/tests/repository_external_reference_implementations/test_all_revision_ids.py	2008-02-22 00:20:55 +0000
@@ -27,13 +27,13 @@
     def test_all_revision_ids_empty(self):
         base = self.make_repository('base')
         repo = self.make_referring('referring', 'base')
-        self.assertEqual(set([]), repo.all_revision_ids())
+        self.assertEqual(set([]), set(repo.all_revision_ids()))
 
     def test_all_revision_ids_from_base(self):
         tree = self.make_branch_and_tree('base')
         revid = tree.commit('one')
         repo = self.make_referring('referring', 'base')
-        self.assertEqual(set([revid]), repo.all_revision_ids())
+        self.assertEqual(set([revid]), set(repo.all_revision_ids()))
 
     def test_all_revision_ids_from_repo(self):
         tree = self.make_branch_and_tree('spare')
@@ -41,7 +41,7 @@
         base = self.make_repository('base')
         repo = self.make_referring('referring', 'base')
         repo.fetch(tree.branch.repository, revid)
-        self.assertEqual(set([revid]), repo.all_revision_ids())
+        self.assertEqual(set([revid]), set(repo.all_revision_ids()))
 
     def test_all_revision_ids_from_both(self):
         tree = self.make_branch_and_tree('spare')
@@ -50,7 +50,7 @@
         revid2 = base_tree.commit('two')
         repo = self.make_referring('referring', 'base')
         repo.fetch(tree.branch.repository, revid)
-        self.assertEqual(set([revid, revid2]), repo.all_revision_ids())
+        self.assertEqual(set([revid, revid2]), set(repo.all_revision_ids()))
 
     def test_duplicate_ids_do_not_affect_length(self):
         tree = self.make_branch_and_tree('spare')
@@ -59,6 +59,6 @@
         repo = self.make_referring('referring', 'base')
         repo.fetch(tree.branch.repository, revid)
         base.fetch(tree.branch.repository, revid)
-        self.assertEqual(set([revid]), repo.all_revision_ids())
+        self.assertEqual(set([revid]), set(repo.all_revision_ids()))
         self.assertEqual(1, len(repo.all_revision_ids()))
 

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2008-01-29 08:21:19 +0000
+++ b/bzrlib/tests/test_selftest.py	2008-02-22 00:20:55 +0000
@@ -230,35 +230,16 @@
             adapter.scenarios)
 
 
-class TestRepositoryProviderAdapter(TestCase):
+class TestRepositoryParameterisation(TestCase):
     """A group of tests that test the repository implementation test adapter."""
 
-    def test_constructor(self):
-        # check that constructor parameters are passed through to the
-        # scenarios.
-        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
-        server1 = "a"
-        server2 = "b"
-        formats = [("c", "C"), ("d", "D")]
-        adapter = RepositoryTestProviderAdapter(server1, server2, formats)
-        self.assertEqual([
-            ('str',
-             {'bzrdir_format': 'C',
-              'repository_format': 'c',
-              'transport_readonly_server': 'b',
-              'transport_server': 'a'}),
-            ('str',
-             {'bzrdir_format': 'D',
-              'repository_format': 'd',
-              'transport_readonly_server': 'b',
-              'transport_server': 'a'})],
-            adapter.scenarios)
-
     def test_setting_vfs_transport(self):
         """The vfs_transport_factory can be set optionally."""
-        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
-        formats = [("a", "b"), ("c", "d")]
-        adapter = RepositoryTestProviderAdapter(None, None, formats,
+        from bzrlib.tests.repository_implementations import formats_to_scenarios
+        scenarios = formats_to_scenarios(
+            [("a", "b"), ("c", "d")],
+            None,
+            None,
             vfs_transport_factory="vfs")
         self.assertEqual([
             ('str',
@@ -273,17 +254,17 @@
               'transport_readonly_server': None,
               'transport_server': None,
               'vfs_transport_factory': 'vfs'})],
-            adapter.scenarios)
+            scenarios)
 
     def test_formats_to_scenarios(self):
         """The adapter can generate all the scenarios needed."""
-        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
-        no_vfs_adapter = RepositoryTestProviderAdapter("server", "readonly",
-            [], None)
-        vfs_adapter = RepositoryTestProviderAdapter("server", "readonly",
-            [], vfs_transport_factory="vfs")
+        from bzrlib.tests.repository_implementations import formats_to_scenarios
+        formats = [("c", "C"), (1, "D")]
+        no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
+            None)
+        vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
+            vfs_transport_factory="vfs")
         # no_vfs generate scenarios without vfs_transport_factor
-        formats = [("c", "C"), (1, "D")]
         self.assertEqual([
             ('str',
              {'bzrdir_format': 'C',
@@ -295,7 +276,7 @@
               'repository_format': 1,
               'transport_readonly_server': 'readonly',
               'transport_server': 'server'})],
-            no_vfs_adapter.formats_to_scenarios(formats))
+            no_vfs_scenarios)
         self.assertEqual([
             ('str',
              {'bzrdir_format': 'C',
@@ -309,7 +290,7 @@
               'transport_readonly_server': 'readonly',
               'transport_server': 'server',
               'vfs_transport_factory': 'vfs'})],
-            vfs_adapter.formats_to_scenarios(formats))
+            vfs_scenarios)
 
 
 class TestTestScenarioApplier(TestCase):