Merge lp:~rockstar/launchpad/clean-code-windmill-tests into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch just cleans up the code windmill tests. They were starting to
get out of hand. Deryck and I talked about ways to organize windmill tests
while in Dallas, and this is what I've come up with based on what we talked
about. I figured I'd do this now, since it was trivial, so that the code
windmill tests didn't get out of hand and dis-organized (like pagetests often
do). There were no real code changes, just renames and consolidations of
files, and updating docstrings.

  As well, I noticed some import violations which I took the liberty of fixing.
Nothing major, just some import changes.

Cheers,
Paul

[Tim Penhey (thumper)]

Fine.

review: Approve

=== modified file 'lib/lp/bugs/feed/bug.py'
--- lib/lp/bugs/feed/bug.py	2010-01-12 21:12:12 +0000
+++ lib/lp/bugs/feed/bug.py	2010-01-15 03:36:20 +0000
@@ -24,11 +24,11 @@
     BugsBugTaskSearchListingView, BugTargetView)
 from lp.registry.browser.person import (
     PersonRelatedBugTaskSearchListingView)
-from lp.registry.interfaces.person import IPerson
 from lp.bugs.interfaces.bug import IBug, IBugSet
 from lp.bugs.interfaces.bugtarget import IHasBugs
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from lp.bugs.interfaces.malone import IMaloneApplication
+from lp.registry.interfaces.person import IPerson
 from canonical.lazr.feed import (
     FeedBase, FeedEntry, FeedPerson, FeedTypedData, MINUTES)
 

=== modified file 'lib/lp/code/browser/summary.py'
--- lib/lp/code/browser/summary.py	2010-01-12 20:56:18 +0000
+++ lib/lp/code/browser/summary.py	2010-01-15 03:36:20 +0000
@@ -13,10 +13,10 @@
 from canonical.launchpad import _
 from canonical.launchpad.webapp.publisher import LaunchpadView
 
-from lp.services.browser_helpers import get_plural_text
 from lp.code.interfaces.branch import DEFAULT_BRANCH_STATUS_IN_LISTING
 from lp.code.interfaces.branchcollection import IBranchCollection
 from lp.code.interfaces.revisioncache import IRevisionCache
+from lp.services.browser_helpers import get_plural_text
 
 
 class BranchCountSummaryView(LaunchpadView):

=== renamed file 'lib/lp/code/windmill/tests/test_branch_links.py' => 'lib/lp/code/windmill/tests/test_branch_bugspeclinks.py'
--- lib/lp/code/windmill/tests/test_branch_links.py	2010-01-13 02:26:05 +0000
+++ lib/lp/code/windmill/tests/test_branch_bugspeclinks.py	2010-01-15 03:36:20 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Test for branch links."""
+"""Test for links between branches and bugs or specs."""
 
 __metaclass__ = type
 __all__ = []
@@ -16,7 +16,8 @@
 from lp.testing import TestCaseWithFactory
 
 
-class TestBranchLinks(TestCaseWithFactory):
+class TestBranchBugLinks(TestCaseWithFactory):
+    """Test the links between branches and bugs."""
 
     layer = CodeWindmillLayer
 
@@ -36,7 +37,7 @@
         client.asserts.assertNotNode(id=u'buglink-' + bug)
 
     def test_inline_branch_bug_link_unlink(self):
-        """Test branch bug links."""
+        """Link a bug from the branch page."""
         client = WindmillTestClient("Branch bug links")
 
         lpuser.FOO_BAR.ensure_login(client)

=== renamed file 'lib/lp/code/windmill/tests/test_popup_diff.py' => 'lib/lp/code/windmill/tests/test_branch_popupdiff.py'
=== renamed file 'lib/lp/code/windmill/tests/test_branch_index.py' => 'lib/lp/code/windmill/tests/test_branch_status.py'
--- lib/lp/code/windmill/tests/test_branch_index.py	2010-01-12 23:42:50 +0000
+++ lib/lp/code/windmill/tests/test_branch_status.py	2010-01-15 03:36:20 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Test for the main branch page."""
+"""Tests for branch statuses."""
 
 __metaclass__ = type
 __all__ = []
@@ -20,11 +20,12 @@
 
 
 class TestBranchStatus(TestCaseWithFactory):
+    """Test setting branch status."""
 
     layer = CodeWindmillLayer
 
     def test_inline_branch_status_setting(self):
-        """Test branch bug links."""
+        """Set the status of a branch."""
         eric = self.factory.makePerson(
             name="eric", displayname="Eric the Viking", password="test",
             email="[e-mail]")

=== modified file 'lib/lp/code/windmill/tests/test_branch_subscriptions.py'
--- lib/lp/code/windmill/tests/test_branch_subscriptions.py	2010-01-12 23:42:50 +0000
+++ lib/lp/code/windmill/tests/test_branch_subscriptions.py	2010-01-15 03:36:20 +0000
@@ -23,8 +23,7 @@
     layer = CodeWindmillLayer
 
     def test_branch_subscription_ajax_load(self):
-        """Test branch subscriptions loaded via ajax.
-        """
+        """Subscribe to a branch from the branch page."""
 
         client = WindmillTestClient("Branch Subscription Ajax Load Test")
 
@@ -60,8 +59,7 @@
             validator=u'No subscribers.')
 
     def test_team_edit_subscription_ajax_load(self):
-        """Test that team subscriptions are editable through the ajax portlet.
-        """
+        """Unsubscribe a team from the branch."""
 
         client = WindmillTestClient("Branch Subscription Ajax Load Test")
 

=== renamed file 'lib/lp/code/windmill/tests/test_branch_merge_proposal.py' => 'lib/lp/code/windmill/tests/test_branchmergeproposal_commitmessage.py'
=== renamed file 'lib/lp/code/windmill/tests/test_code_review.py' => 'lib/lp/code/windmill/tests/test_branchmergeproposal_review.py'
--- lib/lp/code/windmill/tests/test_code_review.py	2010-01-13 01:55:29 +0000
+++ lib/lp/code/windmill/tests/test_branchmergeproposal_review.py	2010-01-15 03:36:20 +0000
@@ -7,23 +7,32 @@
 
 import unittest
 
+import transaction
 import windmill
 from windmill.authoring import WindmillTestClient
 
+from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.windmill.testing import lpuser
 from canonical.launchpad.windmill.testing.widgets import (
     search_and_select_picker_widget)
+from canonical.uuid import generate_uuid
 from lp.code.windmill.testing import CodeWindmillLayer
-from lp.testing import TestCaseWithFactory
-
-
-class TestCodeReview(TestCaseWithFactory):
+from lp.testing import login_person, TestCaseWithFactory
+
+WAIT_PAGELOAD = u'30000'
+WAIT_ELEMENT_COMPLETE = u'30000'
+WAIT_CHECK_CHANGE = u'1000'
+ADD_COMMENT_BUTTON = (
+    u'//input[@id="field.actions.add" and @class="button js-action"]')
+
+
+class TestRequestReview(TestCaseWithFactory):
     """Test the javascript functions of code review."""
 
     layer = CodeWindmillLayer
 
     def test_inline_request_a_reviewer(self):
-        """Test inline request a reviewer."""
+        """Request a review."""
 
         client = WindmillTestClient("Code review")
 
@@ -48,5 +57,55 @@
         client.waits.forElement(id=u'review-mark', timeout=u'10000')
 
 
+class TestReviewCommenting(TestCaseWithFactory):
+    """Test commenting and reviewing on a merge proposal."""
+
+    layer = CodeWindmillLayer
+
+    def open_proposal_page(self, client, proposal):
+        transaction.commit()
+        client.open(url=canonical_url(proposal))
+        client.waits.forPageLoad(timeout=WAIT_PAGELOAD)
+
+    def test_merge_proposal_commenting(self):
+        """Comment on a merge proposal."""
+        client = WindmillTestClient('Code review commenting')
+        lpuser.NO_PRIV.ensure_login(client)
+
+        proposal = self.factory.makeBranchMergeProposal()
+        self.open_proposal_page(client, proposal)
+        client.waits.forElement(xpath=ADD_COMMENT_BUTTON)
+        # Generate a unique piece of text, so we can run the test multiple
+        # times, without resetting the db.
+        new_comment_text = generate_uuid()
+        client.type(text=new_comment_text, id="field.comment")
+        client.click(xpath=ADD_COMMENT_BUTTON)
+        # A PRE inside a boardCommentBody, itself somewhere in the
+        # #conversation
+        client.waits.forElement(
+            xpath='//div[@id="conversation"]//div[@class="boardCommentBody"]'
+            '/pre[contains(., "%s")]' % new_comment_text)
+
+    def test_merge_proposal_replying(self):
+        """Reply to a review comment."""
+        client = WindmillTestClient('Code review commenting')
+        lpuser.NO_PRIV.ensure_login(client)
+        proposal = self.factory.makeBranchMergeProposal()
+        login_person(proposal.registrant)
+        proposal.createComment(proposal.registrant, 'hello', 'content')
+        self.open_proposal_page(client, proposal)
+        REPLY_LINK_XPATH = '//a[contains(., "Reply")]'
+        client.waits.forElement(xpath=REPLY_LINK_XPATH)
+        client.click(xpath=REPLY_LINK_XPATH)
+        client.waits.sleep(milliseconds=10)
+        client.asserts.assertValue(id="field.comment", validator="> content")
+        new_comment_text = "My reply"
+        client.type(text=new_comment_text, id="field.comment")
+        client.click(xpath=ADD_COMMENT_BUTTON)
+        client.waits.forElement(
+            xpath='//div[@id="conversation"]//div[@class="boardCommentBody"]'
+            '/pre[contains(., "%s")]' % new_comment_text)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== removed file 'lib/lp/code/windmill/tests/test_merge_proposal_commenting.py'
--- lib/lp/code/windmill/tests/test_merge_proposal_commenting.py	2010-01-13 22:59:12 +0000
+++ lib/lp/code/windmill/tests/test_merge_proposal_commenting.py	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test for the inline commenting UI."""
-
-__metaclass__ = type
-__all__ = []
-
-import unittest
-
-import transaction
-from windmill.authoring import WindmillTestClient
-
-from canonical.launchpad.webapp import canonical_url
-from canonical.launchpad.windmill.testing import lpuser
-from canonical.uuid import generate_uuid
-from lp.code.windmill.testing import CodeWindmillLayer
-from lp.testing import login_person, TestCaseWithFactory
-
-WAIT_PAGELOAD = u'30000'
-WAIT_ELEMENT_COMPLETE = u'30000'
-WAIT_CHECK_CHANGE = u'1000'
-ADD_COMMENT_BUTTON = (
-    u'//input[@id="field.actions.add" and @class="button js-action"]')
-
-
-class TestMergeProposalCommenting(TestCaseWithFactory):
-
-    layer = CodeWindmillLayer
-
-
-    def open_proposal_page(self, client, proposal):
-        transaction.commit()
-        client.open(url=canonical_url(proposal))
-        client.waits.forPageLoad(timeout=WAIT_PAGELOAD)
-
-    def test_merge_proposal_commenting(self):
-        """Test commenting on merge proposals."""
-        client = WindmillTestClient('Code review commenting')
-        lpuser.NO_PRIV.ensure_login(client)
-
-        proposal = self.factory.makeBranchMergeProposal()
-        self.open_proposal_page(client, proposal)
-        client.waits.forElement(xpath=ADD_COMMENT_BUTTON)
-        # Generate a unique piece of text, so we can run the test multiple
-        # times, without resetting the db.
-        new_comment_text = generate_uuid()
-        client.type(text=new_comment_text, id="field.comment")
-        client.click(xpath=ADD_COMMENT_BUTTON)
-        # A PRE inside a boardCommentBody, itself somewhere in the
-        # #conversation
-        client.waits.forElement(
-            xpath='//div[@id="conversation"]//div[@class="boardCommentBody"]'
-            '/pre[contains(., "%s")]' % new_comment_text)
-
-    def test_merge_proposal_replying(self):
-        """Replying to code review comments works."""
-        client = WindmillTestClient('Code review commenting')
-        lpuser.NO_PRIV.ensure_login(client)
-        proposal = self.factory.makeBranchMergeProposal()
-        login_person(proposal.registrant)
-        proposal.createComment(proposal.registrant, 'hello', 'content')
-        self.open_proposal_page(client, proposal)
-        REPLY_LINK_XPATH = '//a[contains(., "Reply")]'
-        client.waits.forElement(xpath=REPLY_LINK_XPATH)
-        client.click(xpath=REPLY_LINK_XPATH)
-        client.waits.sleep(milliseconds=10)
-        client.asserts.assertValue(id="field.comment", validator="> content")
-        new_comment_text = "My reply"
-        client.type(text=new_comment_text, id="field.comment")
-        client.click(xpath=ADD_COMMENT_BUTTON)
-        client.waits.forElement(
-            xpath='//div[@id="conversation"]//div[@class="boardCommentBody"]'
-            '/pre[contains(., "%s")]' % new_comment_text)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)