Merge lp:~thumper/launchpad/code-import-machine-breadcrumb into lp:launchpad

[Tim Penhey]

Add breadcrumbs for code import machines, and refactor (almost completely) the base breadcrumb test case.

Add breadcrumbs for code import machines.

Also as part of this I wanted to "fix" the BaseBreadcrumbTestCase.

The CustomMachine part of the diff may appear, but that has been landed rs=flacoste into devel.

I moved the BaseBreadcrumbTestCase into lp.testing.breadcrumb.

BugComments were missing the rootsite for their browser:url, causing a breadcrumb failure. The test for this breadcrumb was completely wrong and wasn't testing the comment breadcrumb at all.

The test for the breadcrumbs for a private bug is completely whack as the bug would never be traversed to in order to generate the breadcrumbs, so I deleted it.

Minor tweaks to the translation breadcrumb tests to make them pass.

[Michael Hudson-Doyle (mwhudson)]

Hi Tim,

Hooray for finally battling to success on this :-) Only one mandatory
change: give test_traverse a docstring. Otherwise, it's basically all
good.

> === modified file 'lib/lp/code/browser/codeimportmachine.py'
> --- lib/lp/code/browser/codeimportmachine.py 2009-08-24 20:28:33 +0000
> +++ lib/lp/code/browser/codeimportmachine.py 2010-04-28 05:07:44 +0000
> @@ -6,6 +6,7 @@
> __metaclass__ = type
>
> __all__ = [
> + 'CodeImportMachineBreadcrumb',
> 'CodeImportMachineSetBreadcrumb',
> 'CodeImportMachineSetNavigation',
> 'CodeImportMachineSetView',
> @@ -30,6 +31,14 @@
> from lazr.delegates import delegates
>
>
> +class CodeImportMachineBreadcrumb(Breadcrumb):
> + """An `IBreadcrumb` that uses the machines hostname."""
> +
> + @property
> + def text(self):
> + return self.context.hostname
> +
> +
> class CodeImportMachineSetNavigation(Navigation):
> """Navigation methods for ICodeImportMachineSet."""
> usedfor = ICodeImportMachineSet

> === modified file 'lib/lp/code/browser/configure.zcml'
> --- lib/lp/code/browser/configure.zcml 2010-04-19 03:44:27 +0000
> +++ lib/lp/code/browser/configure.zcml 2010-04-28 05:07:44 +0000
> @@ -1055,6 +1055,19 @@
> for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
> factory="lp.code.browser.branchmergeproposal.BranchMergeProposalBreadcrumb"
> permission="zope.Public"/>
> +
> + <adapter
> + provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
> + for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
> + factory="lp.code.browser.codeimportmachine.CodeImportMachineBreadcrumb"
> + permission="zope.Public"/>
> +
> + <adapter
> + provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
> + for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
> + factory="lp.code.browser.codeimportmachine.CodeImportMachineSetBreadcrumb"
> + permission="zope.Public"/>
> +
> <adapter
> factory="lp.code.browser.branchmergeproposal.PreviewDiffHTMLRepresentation"
> name="lazr.restful.EntryResource"/>

This is all you wanted to add to start with, right? :-)

> === renamed file 'lib/canonical/launchpad/webapp/tests/breadcrumbs.py' => 'lib/lp/testing/breadcrumbs.py'
> --- lib/canonical/launchpad/webapp/tests/breadcrumbs.py 2009-09-17 18:05:29 +0000
> +++ lib/lp/testing/breadcrumbs.py 2010-04-28 05:07:44 +0000
> @@ -8,9 +8,12 @@
>
> from canonical.lazr.testing.menus import make_fake_request
> from canonical.launchpad.layers import setFirstLayer
> -from canonical.launchpad.webapp.publisher import RootObject
> +from canonical.launchpad.webapp.publisher import canonical_url, RootObject
> from canonical.testing import DatabaseFunctionalLayer
> +
> from lp.testing import TestCaseWithFactory
> +from lp.testing.views import create_initialized_view
> +from lp.testing.publication import test_traverse
>
>
> class BaseBreadcrumbTestCase(TestCaseWithFactory):
> @@ -22,9 +25,41 @@
> super(BaseBreadcrumbTestCase, self).setUp()
> self.root = RootObject()
>
> + def assertBreadcrumbs(self, obj, expected):
> + """As...

review: Approve

[Tim Penhey (thumper)]

I've removed or renamed the _getBreadcrumb methods and dealt with the extensive test breakages.

=== modified file 'lib/canonical/launchpad/doc/canonical_url_examples.txt'
--- lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-04-16 15:06:55 +0000
+++ lib/canonical/launchpad/doc/canonical_url_examples.txt	2010-04-28 21:41:35 +0000
@@ -275,7 +275,7 @@
     >>> bug_comment = BugComment(
     ...     1, bug_one.initial_message, bugtask_one, True)
     >>> canonical_url(bug_comment)
-    u'http://launchpad.dev/firefox/+bug/1/comments/1'
+    u'http://bugs.launchpad.dev/firefox/+bug/1/comments/1'
 
 An IBugNomination.
 

=== modified file 'lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py'
--- lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2009-09-21 16:21:50 +0000
+++ lib/canonical/launchpad/webapp/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -13,9 +13,8 @@
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
 from lp.testing import login, TestCase
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class Cookbook:
@@ -52,19 +51,17 @@
         self.product_url = canonical_url(self.product)
 
     def test_default_page(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url])
+        self.assertBreadcrumbUrls([self.product_url], self.product)
 
     def test_non_default_page(self):
+        crumbs = self.getBreadcrumbsForObject(self.product, '+download')
         downloads_url = "%s/+download" % self.product_url
-        urls = self._getBreadcrumbsURLs(
-            downloads_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url, downloads_url])
-        texts = self._getBreadcrumbsTexts(
-            downloads_url, [self.root, self.product])
-        self.assertEquals(texts[-1],
-                          '%s project files' % self.product.displayname)
+        self.assertEquals(
+            [self.product_url, downloads_url],
+            [crumb.url for crumb in crumbs])
+        self.assertEquals(
+            '%s project files' % self.product.displayname,
+            crumbs[-1].text)
 
     def test_zope_i18n_Messages_are_interpolated(self):
         # Views can use zope.i18nmessageid.Message as their title when they
@@ -108,31 +105,25 @@
         self.package_bugtask_url = canonical_url(self.package_bugtask)
 
     def test_root_on_mainsite(self):
-        urls = self._getBreadcrumbsURLs('http://launchpad.dev/', [self.root])
-        self.assertEquals(urls, [])
+        crumbs = self.getBreadcrumbsForUrl('http://launchpad.dev/')
+        self.assertEquals(crumbs, [])
 
     def test_product_on_mainsite(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url])
+        self.assertBreadcrumbUrls([self.product_url], self.product)
 
     def test_root_on_vhost(self):
-        urls = self._getBreadcrumbsURLs(
-            'http://bugs.launchpad.dev/', [self.root])
-        self.assertEquals(urls, [])
+        crumbs = self.getBreadcrumbsForUrl('http://bugs.launchpad.dev/')
+        self.assertEquals(crumbs, [])
 
     def test_product_on_vhost(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_bugs_url, [self.root, self.product])
-        self.assertEquals(urls, [self.product_url, self.product_bugs_url])
+        self.assertBreadcrumbUrls(
+            [self.product_url, self.product_bugs_url],
+            self.product, rootsite='bugs')
 
     def test_product_bugtask(self):
-        urls = self._getBreadcrumbsURLs(
-            self.product_bugtask_url,
-            [self.root, self.product, self.product_bugtask])
-        self.assertEquals(
-            urls, [self.product_url, self.product_bugs_url,
-                   self.product_bugtask_url])
+        self.assertBreadcrumbUrls(
+            [self.product_url, self.product_bugs_url, self.product_bugtask_url],
+            self.product_bugtask)
 
     def test_package_bugtask(self):
         target = self.package_bugtask.target
@@ -140,14 +131,11 @@
         distroseries_url = canonical_url(target.distroseries)
         package_url = canonical_url(target)
         package_bugs_url = canonical_url(target, rootsite='bugs')
-        urls = self._getBreadcrumbsURLs(
-            self.package_bugtask_url,
-            [self.root, target.distribution, target.distroseries, target,
-             self.package_bugtask])
-        self.assertEquals(
-            urls,
+
+        self.assertBreadcrumbUrls(
             [distro_url, distroseries_url, package_url, package_bugs_url,
-             self.package_bugtask_url])
+             self.package_bugtask_url],
+            self.package_bugtask)
 
 
 def test_suite():

=== modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
--- lib/lp/answers/browser/tests/test_breadcrumbs.py	2010-02-17 11:13:06 +0000
+++ lib/lp/answers/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -6,10 +6,9 @@
 import unittest
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
 
 from lp.testing import login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestQuestionTargetProjectAndPersonBreadcrumbOnAnswersVHost(
@@ -36,22 +35,19 @@
             self.project, rootsite='answers')
 
     def test_product(self):
-        crumbs = self._getBreadcrumbs(
-            self.product_questions_url, [self.root, self.product])
+        crumbs = self.getBreadcrumbsForObject(self.product, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.product_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
 
     def test_project(self):
-        crumbs = self._getBreadcrumbs(
-            self.project_questions_url, [self.root, self.project])
+        crumbs = self.getBreadcrumbsForObject(self.project, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.project_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
 
     def test_person(self):
-        crumbs = self._getBreadcrumbs(
-            self.person_questions_url, [self.root, self.person])
+        crumbs = self.getBreadcrumbsForObject(self.person, rootsite='answers')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.person_questions_url)
         self.assertEquals(last_crumb.text, 'Questions')
@@ -69,16 +65,14 @@
         self.question = self.factory.makeQuestion(
             target=self.product, title='Seeds are hard to chew')
         self.question_url = canonical_url(self.question, rootsite='answers')
-        crumbs = self._getBreadcrumbs(
-            self.question_url, [self.root, self.product, self.question])
+        crumbs = self.getBreadcrumbsForObject(self.question)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
 
     def test_faq(self):
         self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
         self.faq_url = canonical_url(self.faq, rootsite='answers')
-        crumbs = self._getBreadcrumbs(
-            self.faq_url, [self.root, self.product, self.faq])
+        crumbs = self.getBreadcrumbsForObject(self.faq)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
 

=== modified file 'lib/lp/blueprints/browser/tests/test_breadcrumbs.py'
--- lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2009-09-22 15:02:41 +0000
+++ lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -6,8 +6,8 @@
 import unittest
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestHasSpecificationsBreadcrumbOnBlueprintsVHost(
@@ -25,15 +25,13 @@
             self.product, rootsite='blueprints')
 
     def test_product(self):
-        crumbs = self._getBreadcrumbs(
-            self.product_specs_url, [self.root, self.product])
+        crumbs = self.getBreadcrumbsForObject(self.product, rootsite='blueprints')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.product_specs_url)
         self.assertEquals(last_crumb.text, 'Blueprints')
 
     def test_person(self):
-        crumbs = self._getBreadcrumbs(
-            self.person_specs_url, [self.root, self.person])
+        crumbs = self.getBreadcrumbsForObject(self.person, rootsite='blueprints')
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.person_specs_url)
         self.assertEquals(last_crumb.text, 'Blueprints')
@@ -52,9 +50,7 @@
             self.specification, rootsite='blueprints')
 
     def test_specification(self):
-        crumbs = self._getBreadcrumbs(
-            self.specification_url,
-            [self.root, self.product, self.specification])
+        crumbs = self.getBreadcrumbsForObject(self.specification)
         last_crumb = crumbs[-1]
         self.assertEquals(last_crumb.url, self.specification_url)
         self.assertEquals(

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2010-03-11 01:39:25 +0000
+++ lib/lp/bugs/browser/configure.zcml	2010-04-28 21:41:35 +0000
@@ -163,7 +163,8 @@
         <browser:url
             for="canonical.launchpad.interfaces.IBugComment"
             path_expression="string:comments/${index}"
-            attribute_to_parent="bugtask"/>
+            attribute_to_parent="bugtask"
+            rootsite="bugs"/>
         <browser:page
             for="canonical.launchpad.interfaces.IBugComment"
             name="+index"

=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2010-03-22 18:39:24 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -8,10 +8,10 @@
 from zope.component import getUtility
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
 from lp.bugs.interfaces.bugtracker import IBugTrackerSet
-from lp.testing import ANONYMOUS, login
+from lp.testing import login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestBugTaskBreadcrumb(BaseBreadcrumbTestCase):
@@ -21,54 +21,35 @@
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
         self.bug = self.factory.makeBug(product=product)
-        self.bugtask_url = canonical_url(
-            self.bug.default_bugtask, rootsite='bugs')
-        self.traversed_objects = [
-            self.root, product, self.bug.default_bugtask]
+        self.bugtask = self.bug.default_bugtask
+        self.bugtask_url = canonical_url(self.bugtask, rootsite='bugs')
 
     def test_bugtask(self):
-        urls = self._getBreadcrumbsURLs(
-            self.bugtask_url, self.traversed_objects)
-        self.assertEquals(urls[-1], self.bugtask_url)
-        texts = self._getBreadcrumbsTexts(
-            self.bugtask_url, self.traversed_objects)
-        self.assertEquals(texts[-1], "Bug #%d" % self.bug.id)
+        crumbs = self.getBreadcrumbsForObject(self.bugtask)
+        last_crumb = crumbs[-1]
+        self.assertEquals(self.bugtask_url, last_crumb.url)
+        self.assertEquals("Bug #%d" % self.bug.id, last_crumb.text)
 
     def test_bugtask_child(self):
-        url = canonical_url(
-            self.bug.default_bugtask, rootsite='bugs', view_name='+activity')
-        urls = self._getBreadcrumbsURLs(url, self.traversed_objects)
-        self.assertEquals(urls[-1], "%s/+activity" % self.bugtask_url)
-        self.assertEquals(urls[-2], self.bugtask_url)
-        texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
-        self.assertEquals(texts[-2], "Bug #%d" % self.bug.id)
+        crumbs = self.getBreadcrumbsForObject(self.bugtask, view_name='+activity')
+        self.assertEquals(crumbs[-1].url, "%s/+activity" % self.bugtask_url)
+        self.assertEquals(crumbs[-2].url, self.bugtask_url)
+        self.assertEquals(crumbs[-2].text, "Bug #%d" % self.bug.id)
 
     def test_bugtask_comment(self):
-        login('[e-mail]')
+        login_person(self.bug.owner)
         comment = self.factory.makeBugComment(
             bug=self.bug, owner=self.bug.owner,
             subject="test comment subject", body="test comment body")
-        url = canonical_url(comment, rootsite='bugs')
-        urls = self._getBreadcrumbsURLs(url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
-        self.assertEquals(url, "%s/comments/1" % self.bugtask_url)
-        self.assertEquals(urls[-1], "%s" % self.bugtask_url)
-        self.assertEquals(texts[-1], "Bug #%d" % self.bug.id)
-
-    def test_bugtask_private_bug(self):
-        # A breadcrumb is not generated for a bug that the user does
-        # not have permission to view.
-        login('[e-mail]')
-        self.bug.setPrivate(True, self.bug.owner)
-        login(ANONYMOUS)
-        url = canonical_url(self.bug.default_bugtask, rootsite='bugs')
-        self.assertEquals(
-            ['http://launchpad.dev/crumb-tester',
-             'http://bugs.launchpad.dev/crumb-tester'],
-            self._getBreadcrumbsURLs(url, self.traversed_objects))
-        self.assertEquals(
-            ["Crumb Tester", "Bugs"],
-            self._getBreadcrumbsTexts(url, self.traversed_objects))
+        expected_breadcrumbs = [
+            ('Crumb Tester', 'http://launchpad.dev/crumb-tester'),
+            ('Bugs', 'http://bugs.launchpad.dev/crumb-tester'),
+            ('Bug #%s' % self.bug.id,
+             'http://bugs.launchpad.dev/crumb-tester/+bug/%s' % self.bug.id),
+            ('Comment #1',
+             'http://bugs.launchpad.dev/crumb-tester/+bug/%s/comments/1' % self.bug.id),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, comment)
 
 
 class TestBugTrackerBreadcrumbs(BaseBreadcrumbTestCase):
@@ -84,28 +65,19 @@
 
     def test_bug_tracker_set(self):
         # Check TestBugTrackerSetBreadcrumb.
-        traversed_objects = [
-            self.root, self.bug_tracker_set]
-        urls = self._getBreadcrumbsURLs(
-            self.bug_tracker_set_url, traversed_objects)
-        self.assertEquals(self.bug_tracker_set_url, urls[-1])
-        texts = self._getBreadcrumbsTexts(
-            self.bug_tracker_set_url, traversed_objects)
-        self.assertEquals("Bug trackers", texts[-1])
+        expected_breadcrumbs = [
+            ('Bug trackers', self.bug_tracker_set_url),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, self.bug_tracker_set)
 
     def test_bug_tracker(self):
         # Check TestBugTrackerBreadcrumb (and
         # TestBugTrackerSetBreadcrumb).
-        traversed_objects = [
-            self.root, self.bug_tracker_set, self.bug_tracker]
-        urls = self._getBreadcrumbsURLs(
-            self.bug_tracker_url, traversed_objects)
-        self.assertEquals(self.bug_tracker_url, urls[-1])
-        self.assertEquals(self.bug_tracker_set_url, urls[-2])
-        texts = self._getBreadcrumbsTexts(
-            self.bug_tracker_url, traversed_objects)
-        self.assertEquals(self.bug_tracker.title, texts[-1])
-        self.assertEquals("Bug trackers", texts[-2])
+        expected_breadcrumbs = [
+            ('Bug trackers', self.bug_tracker_set_url),
+            (self.bug_tracker.title, self.bug_tracker_url),
+            ]
+        self.assertBreadcrumbs(expected_breadcrumbs, self.bug_tracker)
 
 
 def test_suite():

=== modified file 'lib/lp/code/browser/codeimportmachine.py'
--- lib/lp/code/browser/codeimportmachine.py	2009-08-24 20:28:33 +0000
+++ lib/lp/code/browser/codeimportmachine.py	2010-04-28 21:41:35 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'CodeImportMachineBreadcrumb',
     'CodeImportMachineSetBreadcrumb',
     'CodeImportMachineSetNavigation',
     'CodeImportMachineSetView',
@@ -30,6 +31,14 @@
 from lazr.delegates import delegates
 
 
+class CodeImportMachineBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` that uses the machines hostname."""
+
+    @property
+    def text(self):
+        return self.context.hostname
+
+
 class CodeImportMachineSetNavigation(Navigation):
     """Navigation methods for ICodeImportMachineSet."""
     usedfor = ICodeImportMachineSet

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-04-19 03:44:27 +0000
+++ lib/lp/code/browser/configure.zcml	2010-04-28 21:41:35 +0000
@@ -1055,6 +1055,19 @@
         for="lp.code.interfaces.branchmergeproposal.IBranchMergeProposal"
         factory="lp.code.browser.branchmergeproposal.BranchMergeProposalBreadcrumb"
         permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.codeimportmachine.ICodeImportMachine"
+        factory="lp.code.browser.codeimportmachine.CodeImportMachineBreadcrumb"
+        permission="zope.Public"/>
+
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
+        factory="lp.code.browser.codeimportmachine.CodeImportMachineSetBreadcrumb"
+        permission="zope.Public"/>
+
     <adapter
          factory="lp.code.browser.branchmergeproposal.PreviewDiffHTMLRepresentation"
          name="lazr.restful.EntryResource"/>

=== added file 'lib/lp/code/browser/tests/test_breadcrumbs.py'
--- lib/lp/code/browser/tests/test_breadcrumbs.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -0,0 +1,25 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
+
+
+class TestCodeImportMachineBreadcrumb(BaseBreadcrumbTestCase):
+    """Test breadcrumbs for an `ICodeImportMachine`."""
+
+    def test_machine(self):
+        machine = self.factory.makeCodeImportMachine(hostname='apollo')
+        expected = [
+            ('Code Import System', 'http://code.launchpad.dev/+code-imports'),
+            ('Machines', 'http://code.launchpad.dev/+code-imports/+machines'),
+            ('apollo',
+             'http://code.launchpad.dev/+code-imports/+machines/apollo')]
+        self.assertBreadcrumbs(expected, machine)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-23 02:35:47 +0000
+++ lib/lp/code/configure.zcml	2010-04-28 21:41:35 +0000
@@ -64,12 +64,6 @@
          appropriate. -->
   </class>
 
-  <adapter
-      provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
-      for="lp.code.interfaces.codeimportmachine.ICodeImportMachineSet"
-      factory="lp.code.browser.codeimportmachine.CodeImportMachineSetBreadcrumb"
-      permission="zope.Public"/>
-
   <!-- CodeImportMachineSet -->
 
   <securedutility

=== modified file 'lib/lp/registry/browser/tests/test_breadcrumbs.py'
--- lib/lp/registry/browser/tests/test_breadcrumbs.py	2009-11-25 15:08:30 +0000
+++ lib/lp/registry/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -9,8 +9,8 @@
 
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestDistroseriesBreadcrumb(BaseBreadcrumbTestCase):
@@ -25,9 +25,7 @@
         self.distroseries_url = canonical_url(self.distroseries)
 
     def test_distroseries(self):
-        crumbs = self._getBreadcrumbs(
-            self.distroseries_url,
-            [self.root, self.distribution, self.distroseries])
+        crumbs = self.getBreadcrumbsForObject(self.distroseries)
         last_crumb = crumbs[-1]
         self.assertEqual(self.distroseries.named_version, last_crumb.text)
 
@@ -46,9 +44,7 @@
         mirror = self.factory.makeMirror(
             distribution=self.distribution,
             displayname=displayname)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual(displayname, last_crumb.text)
 
@@ -60,9 +56,7 @@
             distribution=self.distribution,
             displayname=None,
             http_url=http_url)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual("Example.com-archive", last_crumb.text)
 
@@ -74,9 +68,7 @@
             distribution=self.distribution,
             displayname=None,
             ftp_url=ftp_url)
-        crumbs = self._getBreadcrumbs(
-            canonical_url(mirror),
-            [self.root, self.distribution, mirror])
+        crumbs = self.getBreadcrumbsForObject(mirror)
         last_crumb = crumbs[-1]
         self.assertEqual("Example.com-archive", last_crumb.text)
 
@@ -93,15 +85,13 @@
         self.milestone_url = canonical_url(self.milestone)
 
     def test_milestone_without_code_name(self):
-        crumbs = self._getBreadcrumbs(
-            self.milestone_url, [self.root, self.project, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(self.milestone)
         last_crumb = crumbs[-1]
         self.assertEqual(self.milestone.name, last_crumb.text)
 
     def test_milestone_with_code_name(self):
         self.milestone.code_name = "duck"
-        crumbs = self._getBreadcrumbs(
-            self.milestone_url, [self.root, self.project, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(self.milestone)
         last_crumb = crumbs[-1]
         expected_text = '%s "%s"' % (
             self.milestone.name, self.milestone.code_name)
@@ -109,10 +99,7 @@
 
     def test_productrelease(self):
         release = self.factory.makeProductRelease(milestone=self.milestone)
-        self.release_url = canonical_url(release)
-        crumbs = self._getBreadcrumbs(
-            self.release_url,
-            [self.root, self.project, self.series, self.milestone])
+        crumbs = self.getBreadcrumbsForObject(release)
         last_crumb = crumbs[-1]
         self.assertEqual(self.milestone.name, last_crumb.text)
 
@@ -131,12 +118,9 @@
             name=name,
             title=title,
             proposition=proposition)
-        self.poll_url = canonical_url(self.poll)
 
     def test_poll(self):
-        crumbs = self._getBreadcrumbs(
-            self.poll_url,
-            [self.root, self.team, self.poll])
+        crumbs = self.getBreadcrumbsForObject(self.poll)
         last_crumb = crumbs[-1]
         self.assertEqual(self.poll.title, last_crumb.text)
 

=== modified file 'lib/lp/soyuz/browser/tests/test_breadcrumbs.py'
--- lib/lp/soyuz/browser/tests/test_breadcrumbs.py	2009-09-29 07:21:40 +0000
+++ lib/lp/soyuz/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -8,11 +8,11 @@
 from zope.component import getUtility
 
 from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
+
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.soyuz.browser.archivesubscription import PersonalArchiveSubscription
 from lp.testing import login, login_person
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 
 
 class TestDistroArchSeriesBreadcrumb(BaseBreadcrumbTestCase):
@@ -22,39 +22,27 @@
         self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         self.hoary = self.ubuntu.getSeries('hoary')
         self.hoary_i386 = self.hoary['i386']
-        self.traversed_objects = [
-            self.root, self.ubuntu, self.hoary, self.hoary_i386]
 
     def test_distroarchseries(self):
         das_url = canonical_url(self.hoary_i386)
-        urls = self._getBreadcrumbsURLs(das_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(das_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], das_url)
-        self.assertEquals(texts[-1], "i386")
+        crumbs = self.getBreadcrumbsForObject(self.hoary_i386)
+        self.assertEquals(crumbs[-1].url, das_url)
+        self.assertEquals(crumbs[-1].text, "i386")
 
     def test_distroarchseriesbinarypackage(self):
         pmount_hoary_i386 = self.hoary_i386.getBinaryPackage("pmount")
-        self.traversed_objects.append(pmount_hoary_i386)
         pmount_url = canonical_url(pmount_hoary_i386)
-        urls = self._getBreadcrumbsURLs(pmount_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(pmount_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], pmount_url)
-        self.assertEquals(texts[-1], "pmount")
+        crumbs = self.getBreadcrumbsForObject(pmount_hoary_i386)
+        self.assertEquals(crumbs[-1].url, pmount_url)
+        self.assertEquals(crumbs[-1].text, "pmount")
 
     def test_distroarchseriesbinarypackagerelease(self):
         pmount_hoary_i386 = self.hoary_i386.getBinaryPackage("pmount")
         pmount_release = pmount_hoary_i386['0.1-1']
-        self.traversed_objects.extend([pmount_hoary_i386, pmount_release])
         pmount_release_url = canonical_url(pmount_release)
-        urls = self._getBreadcrumbsURLs(
-            pmount_release_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(
-            pmount_release_url, self.traversed_objects)
-
-        self.assertEquals(urls[-1], pmount_release_url)
-        self.assertEquals(texts[-1], "0.1-1")
+        crumbs = self.getBreadcrumbsForObject(pmount_release)
+        self.assertEquals(crumbs[-1].url, pmount_release_url)
+        self.assertEquals(crumbs[-1].text, "0.1-1")
 
 
 class TestArchiveSubscriptionBreadcrumb(BaseBreadcrumbTestCase):
@@ -76,18 +64,10 @@
             owner, self.ppa)
 
     def test_personal_archive_subscription(self):
-        self.traversed_objects = [
-            self.root, self.ppa.owner, self.personal_archive_subscription]
         subscription_url = canonical_url(self.personal_archive_subscription)
-
-        urls = self._getBreadcrumbsURLs(
-            subscription_url, self.traversed_objects)
-        texts = self._getBreadcrumbsTexts(
-            subscription_url, self.traversed_objects)
-
-        self.assertEquals(subscription_url, urls[-1])
-        self.assertEquals(
-            "Access to %s" % self.ppa.displayname, texts[-1])
+        crumbs = self.getBreadcrumbsForObject(self.personal_archive_subscription)
+        self.assertEquals(subscription_url, crumbs[-1].url)
+        self.assertEquals("Access to %s" % self.ppa.displayname, crumbs[-1].text)
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== renamed file 'lib/canonical/launchpad/webapp/tests/breadcrumbs.py' => 'lib/lp/testing/breadcrumbs.py'
--- lib/canonical/launchpad/webapp/tests/breadcrumbs.py	2009-09-17 18:05:29 +0000
+++ lib/lp/testing/breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -3,67 +3,51 @@
 
 __metaclass__ = type
 
-from zope.app import zapi
-from zope.component import ComponentLookupError, getMultiAdapter
-
-from canonical.lazr.testing.menus import make_fake_request
-from canonical.launchpad.layers import setFirstLayer
-from canonical.launchpad.webapp.publisher import RootObject
+from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.testing import DatabaseFunctionalLayer
+
 from lp.testing import TestCaseWithFactory
+from lp.testing.views import create_initialized_view
+from lp.testing.publication import test_traverse
 
 
 class BaseBreadcrumbTestCase(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
-    request_layer = None
-
-    def setUp(self):
-        super(BaseBreadcrumbTestCase, self).setUp()
-        self.root = RootObject()
-
-    def _getHierarchyView(self, url, traversed_objects):
-        request = self._make_request(url, traversed_objects)
-        return getMultiAdapter((self.root, request), name='+hierarchy')
-
-    def _getBreadcrumbs(self, url, traversed_objects):
-        view = self._getHierarchyView(url, traversed_objects)
+
+    def assertBreadcrumbs(self, expected, obj, view_name=None, rootsite=None):
+        """Assert that the breadcrumbs for obj match the expected values.
+
+        :param expected: A list of tuples containing (text, url) pairs.
+        """
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(
+            expected,
+            [(crumb.text, crumb.url) for crumb in crumbs])
+
+    def assertBreadcrumbTexts(self, expected, obj, view_name=None,
+                              rootsite=None):
+        """The text of the breadcrumbs for obj match the expected values."""
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(expected, [crumb.text for crumb in crumbs])
+
+    def assertBreadcrumbUrls(self, expected, obj, view_name=None,
+                             rootsite=None):
+        """The urls of the breadcrumbs for obj match the expected values."""
+        crumbs = self.getBreadcrumbsForObject(obj, view_name, rootsite)
+        self.assertEqual(expected, [crumb.url for crumb in crumbs])
+
+    def getBreadcrumbsForObject(self, obj, view_name=None, rootsite=None):
+        """Get the breadcrumbs for the specified object.
+
+        Traverse to the canonical_url of the object, and use the request from
+        that to feed into the initialized hierarchy view so we get the
+        traversed objects.
+        """
+        url = canonical_url(obj, view_name=view_name, rootsite=rootsite)
+        return self.getBreadcrumbsForUrl(url)
+
+    def getBreadcrumbsForUrl(self, url):
+        obj, view, request = test_traverse(url)
+        view = create_initialized_view(obj, '+hierarchy', request=request)
         return view.items
-
-    def _getBreadcrumbsTexts(self, url, traversed_objects):
-        crumbs = self._getBreadcrumbs(url, traversed_objects)
-        return [crumb.text for crumb in crumbs]
-
-    def _getBreadcrumbsURLs(self, url, traversed_objects):
-        crumbs = self._getBreadcrumbs(url, traversed_objects)
-        return [crumb.url for crumb in crumbs]
-
-    def _make_request(self, url, traversed_objects):
-        """Create and return a LaunchpadTestRequest.
-
-        Set the given list of traversed objects as request.traversed_objects,
-        also appending the view that the given URL points to, to mimic how
-        request.traversed_objects behave in a real request.
-
-        XXX: salgado, bug=432025, 2009-09-17: Instead of setting
-        request.traversed_objects manually, we should duplicate parts of
-        zope.publisher.publish.publish here (or in make_fake_request()) so
-        that tests don't have to specify the list of traversed objects for us
-        to set here.
-        """
-        request = make_fake_request(url, traversed_objects=traversed_objects)
-        if self.request_layer is not None:
-            setFirstLayer(request, self.request_layer)
-        last_segment = request._traversed_names[-1]
-        if traversed_objects:
-            obj = traversed_objects[-1]
-            # Assume the last_segment is the name of the view on the last
-            # traversed object, and if we fail to find a view with that name,
-            # use the default view.
-            try:
-                view = getMultiAdapter((obj, request), name=last_segment)
-            except ComponentLookupError:
-                default_view_name = zapi.getDefaultViewName(obj, request)
-                view = getMultiAdapter((obj, request), name=default_view_name)
-            request.traversed_objects.append(view)
-        return request

=== modified file 'lib/lp/testing/publication.py'
--- lib/lp/testing/publication.py	2009-07-17 02:25:09 +0000
+++ lib/lp/testing/publication.py	2010-04-28 21:41:35 +0000
@@ -7,14 +7,24 @@
 __all__ = [
     'get_request_and_publication',
     'print_request_and_publication',
+    'test_traverse',
     ]
 
 from cStringIO import StringIO
 
 # Z3 doesn't make this available as a utility.
+from zope.app import zapi
 from zope.app.publication.requestpublicationregistry import factoryRegistry
+from zope.component import getUtility
+from zope.interface import providedBy
+from zope.publisher.interfaces.browser import IDefaultSkin
+
+from canonical.launchpad.interfaces.launchpad import IOpenLaunchBag
+import canonical.launchpad.layers as layers
+from canonical.launchpad.webapp import urlsplit
 from canonical.launchpad.webapp.servers import ProtocolErrorPublication
 
+
 # Defines an helper function that returns the appropriate
 # IRequest and IPublication.
 def get_request_and_publication(host='localhost', port=None,
@@ -39,6 +49,7 @@
     publication = publication_factory(None)
     return request, publication
 
+
 def print_request_and_publication(host='localhost', port=None,
                                   method='GET',
                                   mime_type='text/html',
@@ -56,3 +67,49 @@
             print "  %s: %s" % (name, value)
     else:
         print publication_classname
+
+
+def test_traverse(url):
+    """Traverse the url in the same way normal publishing occurs.
+
+    Returns a tuple of (object, view, request) where:
+      object is the last model object in the traversal chain
+      view is the defined view for the object at the specified url (if
+        the url didn't directly specify a view, then the view is the
+        default view for the object.
+      request is the request object resulting from the traversal.  This
+        contains a populated traversed_objects list just as a browser
+        request would from a normal call into the app servers.
+
+    This call uses the currently logged in user, and does not start a new
+    transaction.
+    """
+    url_parts = urlsplit(url)
+    server_url = '://'.join(url_parts[0:2])
+    path_info = url_parts[2]
+    request, publication = get_request_and_publication(
+        host=url_parts[1], extra_environment={
+            'SERVER_URL': server_url,
+            'PATH_INFO': path_info})
+
+    request.setPublication(publication)
+    # We avoid calling publication.beforePublication because this starts a new
+    # transaction, which causes an abort of the existing transaction, and the
+    # removal of any created and uncommitted objects.
+
+    # Set the default layer.
+    adapters = zapi.getGlobalSiteManager().adapters
+    layer = adapters.lookup((providedBy(request),), IDefaultSkin, '')
+    if layer is not None:
+        layers.setAdditionalLayer(request, layer)
+
+    principal = publication.getPrincipal(request)
+    request.setPrincipal(principal)
+
+    getUtility(IOpenLaunchBag).clear()
+    app = publication.getApplication(request)
+    view = request.traverse(app)
+    # Since the last traversed object is the view, the second last should be
+    # the object that the view is on.
+    obj = request.traversed_objects[-2]
+    return obj, view, request

=== modified file 'lib/lp/translations/browser/tests/test_breadcrumbs.py'
--- lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-11-07 01:45:32 +0000
+++ lib/lp/translations/browser/tests/test_breadcrumbs.py	2010-04-28 21:41:35 +0000
@@ -7,12 +7,8 @@
 
 from canonical.lazr.utils import smartquote
 
-from canonical.launchpad.layers import TranslationsLayer
-from canonical.launchpad.webapp.publisher import canonical_url
-from canonical.launchpad.webapp.tests.breadcrumbs import (
-    BaseBreadcrumbTestCase)
-
 from lp.services.worlddata.interfaces.language import ILanguageSet
+from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
 from lp.translations.interfaces.distroserieslanguage import (
     IDistroSeriesLanguageSet)
 from lp.translations.interfaces.productserieslanguage import (
@@ -20,111 +16,82 @@
 from lp.translations.interfaces.translationgroup import ITranslationGroupSet
 
 
-class BaseTranslationsBreadcrumbTestCase(BaseBreadcrumbTestCase):
-    request_layer = TranslationsLayer
-
-    def setUp(self):
-        super(BaseTranslationsBreadcrumbTestCase, self).setUp()
-        self.traversed_objects = [self.root]
-
-    def _testContextBreadcrumbs(self, traversal_list, links, texts, url=None):
-        self.traversed_objects.extend(traversal_list)
-        if url is None:
-            url = canonical_url(traversal_list[-1], rootsite='translations')
-
-        self.assertEquals(
-            links,
-            self._getBreadcrumbsURLs(url, self.traversed_objects))
-        self.assertEquals(
-            texts,
-            self._getBreadcrumbsTexts(url, self.traversed_objects))
-
-
-class TestTranslationsVHostBreadcrumb(BaseTranslationsBreadcrumbTestCase):
+class TestTranslationsVHostBreadcrumb(BaseBreadcrumbTestCase):
 
     def test_product(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [product],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            product, rootsite='translations')
 
     def test_productseries(self):
         product = self.factory.makeProduct(
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeProductSeries(name="test", product=product)
-        self._testContextBreadcrumbs(
-            [product, series],
-            ['http://launchpad.dev/crumb-tester',
-             'http://launchpad.dev/crumb-tester/test',
-             'http://translations.launchpad.dev/crumb-tester/test'],
-            ["Crumb Tester", "Series test", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Series test", 'http://launchpad.dev/crumb-tester/test'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester/test')],
+            series, rootsite='translations')
 
     def test_distribution(self):
         distribution = self.factory.makeDistribution(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [distribution],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            distribution, rootsite='translations')
 
     def test_distroseries(self):
         distribution = self.factory.makeDistribution(
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeDistroRelease(
             name="test", version="1.0", distribution=distribution)
-        self._testContextBreadcrumbs(
-            [distribution, series],
-            ['http://launchpad.dev/crumb-tester',
-             'http://launchpad.dev/crumb-tester/test',
-             'http://translations.launchpad.dev/crumb-tester/test'],
-            ["Crumb Tester", "Test (1.0)", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Test (1.0)", 'http://launchpad.dev/crumb-tester/test'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester/test')],
+            series, rootsite='translations')
 
     def test_project(self):
         project = self.factory.makeProject(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [project],
-            ['http://launchpad.dev/crumb-tester',
-             'http://translations.launchpad.dev/crumb-tester'],
-            ["Crumb Tester", "Translations"])
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/crumb-tester')],
+            project, rootsite='translations')
 
     def test_person(self):
         person = self.factory.makePerson(
             name='crumb-tester', displayname="Crumb Tester")
-        self._testContextBreadcrumbs(
-            [person],
-            ['http://launchpad.dev/~crumb-tester',
-             'http://translations.launchpad.dev/~crumb-tester'],
-            ["Crumb Tester", "Translations"])
-
-
-class TestTranslationGroupsBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        self.assertBreadcrumbs(
+            [("Crumb Tester", 'http://launchpad.dev/~crumb-tester'),
+             ("Translations", 'http://translations.launchpad.dev/~crumb-tester')],
+            person, rootsite='translations')
+
+
+class TestTranslationGroupsBreadcrumbs(BaseBreadcrumbTestCase):
 
     def test_translationgroupset(self):
         group_set = getUtility(ITranslationGroupSet)
-        url = canonical_url(group_set, rootsite='translations')
-        self._testContextBreadcrumbs(
-            [group_set],
-            ['http://translations.launchpad.dev/+groups'],
-            ['Translation groups'],
-            url=url)
+        self.assertBreadcrumbs(
+            [("Translation groups", 'http://translations.launchpad.dev/+groups')],
+            group_set, rootsite='translations')
 
     def test_translationgroup(self):
-        group_set = getUtility(ITranslationGroupSet)
         group = self.factory.makeTranslationGroup(
             name='test-translators', title='Test translators')
-        self._testContextBreadcrumbs(
-            [group_set, group],
-            ["http://translations.launchpad.dev/+groups",
-             "http://translations.launchpad.dev/+groups/test-translators"],
-            ["Translation groups", "Test translators"])
-
-
-class TestSeriesLanguageBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        self.assertBreadcrumbs(
+            [("Translation groups", 'http://translations.launchpad.dev/+groups'),
+             ("Test translators",
+              'http://translations.launchpad.dev/+groups/test-translators')],
+            group, rootsite='translations')
+
+
+class TestSeriesLanguageBreadcrumbs(BaseBreadcrumbTestCase):
+
     def setUp(self):
         super(TestSeriesLanguageBreadcrumbs, self).setUp()
         self.language = getUtility(ILanguageSet)['sr']
@@ -134,15 +101,18 @@
             name='crumb-tester', displayname="Crumb Tester")
         series = self.factory.makeDistroRelease(
             name="test", version="1.0", distribution=distribution)
+        series.hide_all_translations = False
         serieslanguage = getUtility(IDistroSeriesLanguageSet).getDummy(
             series, self.language)
-        self._testContextBreadcrumbs(
-            [distribution, series, serieslanguage],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test/+lang/sr"],
-            ["Crumb Tester", "Test (1.0)", "Translations", "Serbian (sr)"])
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Test (1.0)", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             ("Serbian (sr)",
+              "http://translations.launchpad.dev/crumb-tester/test/+lang/sr")],
+            serieslanguage)
 
     def test_productserieslanguage(self):
         product = self.factory.makeProduct(
@@ -151,57 +121,58 @@
             name="test", product=product)
         serieslanguage = getUtility(IProductSeriesLanguageSet).getDummy(
             series, self.language)
-        self._testContextBreadcrumbs(
-            [product, series, serieslanguage],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test/+lang/sr"],
-            ["Crumb Tester", "Series test", "Translations", "Serbian (sr)"])
-
-
-class TestPOTemplateBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             ("Serbian (sr)",
+              "http://translations.launchpad.dev/crumb-tester/test/+lang/sr")],
+            serieslanguage)
+
+
+class TestPOTemplateBreadcrumbs(BaseBreadcrumbTestCase):
     def test_potemplate(self):
         product = self.factory.makeProduct(
-            name='crumb-tester', displayname="Crumb Tester")
+            name='crumb-tester', displayname="Crumb Tester",
+            official_rosetta=True)
         series = self.factory.makeProductSeries(
             name="test", product=product)
-        potemplate = self.factory.makePOTemplate(name="template",
-                                                 productseries=series)
-        self._testContextBreadcrumbs(
-            [product, series, potemplate],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test"
-             "/+pots/template"],
-            ["Crumb Tester", "Series test", "Translations",
-             smartquote('Template "template"')])
-
-
-class TestPOFileBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+        potemplate = self.factory.makePOTemplate(
+            name="template", productseries=series)
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             (smartquote('Template "template"'),
+              "http://translations.launchpad.dev/crumb-tester/test/+pots/template")],
+            potemplate)
+
+
+class TestPOFileBreadcrumbs(BaseBreadcrumbTestCase):
 
     def setUp(self):
         super(TestPOFileBreadcrumbs, self).setUp()
-        self.language = getUtility(ILanguageSet)['eo']
-        self.product = self.factory.makeProduct(
-            name='crumb-tester', displayname="Crumb Tester")
-        self.series = self.factory.makeProductSeries(
-            name="test", product=self.product)
-        self.potemplate = self.factory.makePOTemplate(self.series,
-            name="test-template")
-        self.pofile = self.factory.makePOFile('eo', self.potemplate)
 
     def test_pofiletranslate(self):
-        self._testContextBreadcrumbs(
-            [self.product, self.series, self.potemplate, self.pofile],
-            ["http://launchpad.dev/crumb-tester",
-             "http://launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test",
-             "http://translations.launchpad.dev/crumb-tester/test"
-               "/+pots/test-template",
-             "http://translations.launchpad.dev/crumb-tester/test"
-               "/+pots/test-template/eo",
-             ],
-            ["Crumb Tester", "Series test", "Translations",
-             smartquote('Template "test-template"'), "Esperanto (eo)"])
+        product = self.factory.makeProduct(
+            name='crumb-tester', displayname="Crumb Tester",
+            official_rosetta=True)
+        series = self.factory.makeProductSeries(name="test", product=product)
+        potemplate = self.factory.makePOTemplate(series, name="test-template")
+        pofile = self.factory.makePOFile('eo', potemplate)
+
+        self.assertBreadcrumbs(
+            [("Crumb Tester", "http://launchpad.dev/crumb-tester"),
+             ("Series test", "http://launchpad.dev/crumb-tester/test"),
+             ("Translations",
+              "http://translations.launchpad.dev/crumb-tester/test"),
+             (smartquote('Template "test-template"'),
+              "http://translations.launchpad.dev/crumb-tester/test"
+              "/+pots/test-template"),
+             ("Esperanto (eo)",
+              "http://translations.launchpad.dev/crumb-tester/test"
+              "/+pots/test-template/eo")],
+            pofile)