Rev 2388: Split get_revision_graph tests out of repository_implementations.test_repository. in file:///home/robertc/source/baz/netsim/

[Robert Collins]

At file:///home/robertc/source/baz/netsim/

------------------------------------------------------------
revno: 2388
revision-id: robertc at robertcollins.net-20070330072513-ceezi5kd8ep6rbz0
parent: pqm at pqm.ubuntu.com-20070329191009-2b533e883212576c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: netsim
timestamp: Fri 2007-03-30 17:25:13 +1000
message:
  Split get_revision_graph tests out of repository_implementations.test_repository.
modified:
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
=== modified file 'bzrlib/tests/repository_implementations/__init__.py'
--- a/bzrlib/tests/repository_implementations/__init__.py	2007-02-21 05:34:56 +0000
+++ b/bzrlib/tests/repository_implementations/__init__.py	2007-03-30 07:25:13 +0000
@@ -51,6 +51,7 @@
         'bzrlib.tests.repository_implementations.test_reconcile',
         'bzrlib.tests.repository_implementations.test_repository',
         'bzrlib.tests.repository_implementations.test_revision',
+        'bzrlib.tests.repository_implementations.test_revision_graph',
         'bzrlib.tests.repository_implementations.test_statistics',
         ]
     registry = repository.format_registry

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-03-29 06:24:19 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-03-30 07:25:13 +0000
@@ -479,6 +479,9 @@
         tree_a.add_parent_tree_id('ghost2')
         tree_a.commit('rev4', rev_id='rev4', allow_pointless=True)
 
+
+class TestRevisionTrees(TestCaseWithComplexRepository):
+
     def test_revision_trees(self):
         revision_ids = ['rev1', 'rev2', 'rev3', 'rev4']
         repository = self.bzrdir.open_repository()
@@ -497,6 +500,9 @@
                    revisions]
         assert deltas1 == deltas2
 
+
+class TestAllRevisionIds(TestCaseWithComplexRepository):
+
     def test_all_revision_ids(self):
         # all_revision_ids -> all revisions
         self.assertEqual(['rev1', 'rev2', 'rev3', 'rev4'],
@@ -508,58 +514,6 @@
         self.assertRaises(errors.NoSuchRevision,
                           self.bzrdir.open_repository().get_ancestry, 'orphan')
 
-    def test_get_revision_graph(self):
-        # we can get a mapping of id->parents for the entire revision graph or bits thereof.
-        self.assertEqual({'rev1':[],
-                          'rev2':['rev1'],
-                          'rev3':['rev2'],
-                          'rev4':['rev3'],
-                          },
-                         self.bzrdir.open_repository().get_revision_graph(None))
-        self.assertEqual({'rev1':[]},
-                         self.bzrdir.open_repository().get_revision_graph('rev1'))
-        self.assertEqual({'rev1':[],
-                          'rev2':['rev1']},
-                         self.bzrdir.open_repository().get_revision_graph('rev2'))
-        self.assertRaises(NoSuchRevision,
-                          self.bzrdir.open_repository().get_revision_graph,
-                          'orphan')
-        # and ghosts are not mentioned
-        self.assertEqual({'rev1':[],
-                          'rev2':['rev1'],
-                          'rev3':['rev2'],
-                          },
-                         self.bzrdir.open_repository().get_revision_graph('rev3'))
-        # and we can ask for the NULLREVISION graph
-        self.assertEqual({},
-            self.bzrdir.open_repository().get_revision_graph(NULL_REVISION))
-
-    def test_get_revision_graph_with_ghosts(self):
-        # we can get a graph object with roots, ghosts, ancestors and
-        # descendants.
-        repo = self.bzrdir.open_repository()
-        graph = repo.get_revision_graph_with_ghosts([])
-        self.assertEqual(set(['rev1']), graph.roots)
-        self.assertEqual(set(['ghost1', 'ghost2']), graph.ghosts)
-        self.assertEqual({'rev1':[],
-                          'rev2':['rev1'],
-                          'rev3':['rev2', 'ghost1'],
-                          'rev4':['rev3', 'ghost1', 'ghost2'],
-                          },
-                          graph.get_ancestors())
-        self.assertEqual({'ghost1':{'rev3':1, 'rev4':1},
-                          'ghost2':{'rev4':1},
-                          'rev1':{'rev2':1},
-                          'rev2':{'rev3':1},
-                          'rev3':{'rev4':1},
-                          'rev4':{},
-                          },
-                          graph.get_descendants())
-        # and we can ask for the NULLREVISION graph
-        graph = repo.get_revision_graph_with_ghosts([NULL_REVISION])
-        self.assertEqual({}, graph.get_ancestors())
-        self.assertEqual({}, graph.get_descendants())
-
     def test_reserved_id(self):
         repo = self.make_repository('repository')
         self.assertRaises(errors.ReservedId, repo.add_inventory, 'reserved:',