Merge lp:~edwin-grubbs/launchpad/bug-495067-move-windmill-tests into lp:launchpad/db-devel

[Edwin Grubbs]

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

Moved the remaining registry windmill tests from
lib/canonical/launchpad/windmill/tests to lib/lp/registry/windmill/tests.

Implementation details
----------------------

Most of the changes just involve boilerplate to convert the tests
to unittests, indenting functions that became methods, and replacing
client with self.client.

I've included a smaller diff below of the changes that were made to fix
regressions since these tests had not been automatically run. I also
encountered authentication problems with the lpuser module's
ensure_login() method. Some of the tests use helper functions from a
different module that creates a new windmill client each time the
function is called. I assume there is something in the initialization of
the new client that invalidates the cookie from the last client,
therefore, I have to load a page in the new client before calling
ensure_login() so that it can find the "Login" link, otherwise it
assumes it is still logged in just fine.

lib/lp/registry/browser/product.py
    The windmill test was using foo.bar instead of the owner of the
    project, so it seemed better to fix this by allowing anyone with
    launchpad.Edit access to be able to see the programming language
    fields inline editing icon.

lib/lp/registry/templates/milestone-index.pt
lib/lp/registry/windmill/tests/test_add_milestone.py
    Creating a release now takes you to the milestone/release index
    page instead of the series index page. The ids were added to
    simplify the tests.

lib/lp/registry/templates/product-new.pt
    node.attach() was replaced with node.on(), so this functionality
    was actually broken in production.

lib/lp/registry/windmill/tests/test_plusnew_step1.py
lib/lp/registry/windmill/tests/test_plusnew_step2.py
lib/lp/registry/windmill/tests/test_product.py
lib/lp/registry/windmill/tests/test_project_licenses.py

Tests
-----

./bin/test -vv --layer=RegistryWindmillLayer

{{{

=== modified file 'lib/canonical/launchpad/windmill/testing/widgets.py'
--- lib/canonical/launchpad/windmill/testing/widgets.py 2009-10-29 14:23:16 +0000
+++ lib/canonical/launchpad/windmill/testing/widgets.py 2009-12-11 00:22:50 +0000
@@ -60,10 +60,10 @@
         * reloads and verifies that the new value sticked.
         """
         client = WindmillTestClient(self.suite)
+ client.open(url=self.url)

         self.user.ensure_login(client)

- client.open(url=self.url)
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
         widget_base = u"//%s[@id='%s']" % (self.widget_tag, self.widget_id)
         client.waits.forElement(
@@ -298,13 +298,15 @@

     def __call__(self):
         client = WindmillTestClient(self.suite)
- self.user.ensure_login(client)

         # Load page.
         client.open(url=self.url)
- client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
+
+ self.user.ensure_login(client)

         # Click on "Choose" link to show picker for the given field.
+ client.waits.forElement(
+ id=self.choose_link_id, timeout=constants.PAGE_LOAD)
         client.click(id=self.choose_link_id)

         # Search picker.

=== modified file 'lib/lp/regis...

[Curtis Hovey (sinzui)]

This must have been to most boring diff I have ever read.

review: Approve (code)

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-12-02 13:08:18 +0000
+++ database/schema/security.cfg	2009-12-11 20:25:26 +0000
@@ -1216,6 +1216,9 @@
 public.libraryfilecontent               = SELECT, INSERT
 
 # rosetta auto imports
+public.pofile                           = SELECT
+public.potemplate                       = SELECT
+public.translationgroup                 = SELECT
 public.translationimportqueueentry      = SELECT, INSERT, UPDATE
 
 # Closing bugs.
 
=== modified file 'lib/canonical/launchpad/javascript/lp/comment.js'
--- lib/canonical/launchpad/javascript/lp/comment.js	2009-11-26 19:54:52 +0000
+++ lib/canonical/launchpad/javascript/lp/comment.js	2009-12-11 20:25:26 +0000
@@ -361,7 +361,6 @@
     },
     renderUI: function() {
         CodeReviewComment.superclass.renderUI.apply(this);
-        Y.one('#inline-add-comment').setStyle('display', 'block');
     },
     /**
      * Implementation of Widget.bindUI: Bind events to methods.
 
=== modified file 'lib/canonical/launchpad/windmill/testing/widgets.py'
--- lib/canonical/launchpad/windmill/testing/widgets.py	2009-10-29 14:23:16 +0000
+++ lib/canonical/launchpad/windmill/testing/widgets.py	2009-12-11 20:25:26 +0000
@@ -60,10 +60,10 @@
         * reloads and verifies that the new value sticked.
         """
         client = WindmillTestClient(self.suite)
+        client.open(url=self.url)
 
         self.user.ensure_login(client)
 
-        client.open(url=self.url)
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
         widget_base = u"//%s[@id='%s']" % (self.widget_tag, self.widget_id)
         client.waits.forElement(
@@ -298,13 +298,15 @@
 
     def __call__(self):
         client = WindmillTestClient(self.suite)
-        self.user.ensure_login(client)
 
         # Load page.
         client.open(url=self.url)
-        client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
+
+        self.user.ensure_login(client)
 
         # Click on "Choose" link to show picker for the given field.
+        client.waits.forElement(
+            id=self.choose_link_id, timeout=constants.PAGE_LOAD)
         client.click(id=self.choose_link_id)
 
         # Search picker.
 
=== removed directory 'lib/canonical/launchpad/windmill/tests'
=== removed file 'lib/canonical/launchpad/windmill/tests/__init__.py'
=== removed directory 'lib/canonical/launchpad/windmill/tests/test_registry'
=== removed file 'lib/canonical/launchpad/windmill/tests/test_registry/__init__.py'
=== modified file 'lib/lp/code/browser/codereviewcomment.py'
--- lib/lp/code/browser/codereviewcomment.py	2009-10-29 23:51:08 +0000
+++ lib/lp/code/browser/codereviewcomment.py	2009-12-11 20:25:26 +0000
@@ -204,7 +204,7 @@
 
     class MyDropWidget(DropdownWidget):
         "Override the default no-value display name to -Select-."
-        _messageNoValue = '-Select-'
+        _messageNoValue = 'Comment only'
 
     schema = IEditCodeReviewComment
 
@@ -251,10 +251,11 @@
     @action('Save Comment', name='add')
     def add_action(self, action, data):
         """Create the comment..."""
+        vote = data.get('vote')
+        review_type = data.get('review_type')
         comment = self.branch_merge_proposal.createComment(
             self.user, subject=None, content=data['comment'],
-            parent=self.reply_to, vote=data['vote'],
-            review_type=data['review_type'])
+            parent=self.reply_to, vote=vote, review_type=review_type)
 
     @property
     def next_url(self):
 
=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2009-11-26 23:36:50 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2009-12-11 20:25:26 +0000
@@ -21,6 +21,24 @@
     #commit-message, #edit-commit-message {
       margin: 1em 0 0 0;
     }
+    #add-comment-form {
+      max-width: 60em;
+      padding-bottom: 3em;
+    }
+    #add-comment-form textarea{
+      width: 100%;
+      max-width: inherit;
+    }
+    #add-comment-form .actions {
+      float: right;
+      margin: 0 -0.5em;
+    }
+    #add-comment-review-fields {
+      margin-top: 1em;
+    }
+    #add-comment-review-fields div {
+      display: inline;
+    }
     /* A page-specific fix for inline text are editing to line up box. */
     #edit-commit-message .yui-ieditor-input { top: 0; }
   </style>
@@ -92,6 +110,12 @@
   </div>
 
   <div class="yui-g">
+    <tal:not-logged-in condition="not: view/user">
+      <div align="center" id="add-comment-login-first">
+        To post a comment you must <a href="+login">log in</a>.
+      </div>
+    </tal:not-logged-in>
+
     <div tal:define="link menu/add_comment"
          tal:condition="link/enabled"
          tal:content="structure link/render">
@@ -101,20 +125,27 @@
     <div id="conversation"
          tal:content="structure view/conversation/@@+render"/>
   </div>
-  <!-- Hide inline commenting if YUI isn't used. -->
-  <div id="inline-add-comment" style="display: none">
-  <tal:comment replace="structure context/@@+comment/++form++" />
-      <div class="actions" id="launchpad-form-actions">
-        <input type="submit" id="field.actions.add" name="field.actions.add" value="Save Comment" class="button" />
-      </div>
-  </div>
-
-  <script type="text/javascript">
-    LPS.use('lp.comment', function(Y) {
-    var comment = new Y.lp.CodeReviewComment();
-    comment.render();
-    })
-  </script>
+
+  <tal:logged-in condition="view/user">
+    <div tal:define="comment_form nocall:context/@@+comment;
+                     dummy comment_form/initialize">
+      <h2 id="add-comment">Add comment</h2>
+      <form action="+comment"
+            method="post"
+            enctype="multipart/form-data"
+            accept-charset="UTF-8"
+            id="add-comment-form">
+        <tal:comment-input replace="structure comment_form/widgets/comment"/>
+        <div id="add-comment-review-fields">
+            Review: <tal:review replace="structure comment_form/widgets/vote"/>
+            Review type: <tal:review replace="structure comment_form/widgets/review_type"/>
+            <div class="actions"
+                 tal:content="structure comment_form/actions/field.actions.add/render" />
+        </div>
+      </form>
+    </div>
+  </tal:logged-in>
+
   <div class="yui-g">
     <div class="yui-u first">
       <div id="source-revisions"
@@ -159,21 +190,25 @@
   string:&lt;script id='codereview-script' type='text/javascript'&gt;" />
   conf = <tal:status-config replace="view/status_config" />
   <!--
-  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal',
+  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal', 'lp.comment',
             function(Y) {
 
-
-  if(Y.UA.ie) {
-      return;
-  }
-
-  Y.on('domready', function() {
-      Y.code.codereview.connect_links();
-      Y.code.branchmergeproposal.connect_status(conf);
-  });
-
-  (new Y.codereview.NumberToggle()).render();
-
+    Y.on('load', function() {
+        var logged_in = LP.client.links['me'] !== undefined;
+
+        if (logged_in) {
+            var comment = new Y.lp.CodeReviewComment();
+            comment.render();
+
+            if(Y.UA.ie) {
+                return;
+            }
+
+            Y.code.codereview.connect_links();
+            Y.code.branchmergeproposal.connect_status(conf);
+        }
+        (new Y.codereview.NumberToggle()).render();
+      }, window);
   });
   -->
 <tal:script replace="structure string:&lt;/script&gt;" />
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/browser/product.py	2009-12-11 20:25:26 +0000
@@ -778,7 +778,7 @@
             **additional_arguments)
         self.show_programming_languages = bool(
             self.context.programminglang or
-            self.user == self.context.owner)
+            check_permission('launchpad.Edit', self.context))
 
     @property
     def show_license_status(self):
 
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2009-12-01 22:09:05 +0000
+++ lib/lp/registry/browser/team.py	2009-12-11 20:25:26 +0000
@@ -901,7 +901,6 @@
         return None
 
 
-
 class ProposedTeamMembersEditView(LaunchpadFormView):
     schema = Interface
     label = 'Proposed team members'
@@ -915,7 +914,10 @@
                 status = TeamMembershipStatus.APPROVED
             elif action == "decline":
                 status = TeamMembershipStatus.DECLINED
-            elif action == "hold":
+            else:
+                # The action is "hold" or no action was specified for this
+                # person, which could happen if the set of proposed members
+                # changed while the form was being processed.
                 continue
 
             self.context.setMembershipData(
 
=== modified file 'lib/lp/registry/templates/milestone-index.pt'
--- lib/lp/registry/templates/milestone-index.pt	2009-11-15 19:37:56 +0000
+++ lib/lp/registry/templates/milestone-index.pt	2009-12-11 20:25:26 +0000
@@ -53,12 +53,12 @@
                   tal:condition="view/milestone/series_target" /></dd>
               </dl>
 
-              <dl>
+              <dl id="version">
                 <dt>Version:</dt>
                 <dd><tal:version replace="context/name" /></dd>
               </dl>
 
-              <dl>
+              <dl id="code-name">
                 <dt>Code name:</dt>
                 <dd>
                   <tal:code-name replace="view/milestone/code_name" />
 
=== modified file 'lib/lp/registry/templates/product-new.pt'
--- lib/lp/registry/templates/product-new.pt	2009-12-03 18:33:22 +0000
+++ lib/lp/registry/templates/product-new.pt	2009-12-11 20:25:26 +0000
@@ -100,7 +100,7 @@
             url_field.on('keyup', function(e) {
                 if (url_field.get('value') == '') {
                     /* The user cleared the URL field; turn on autofill. */
-                    name_field.attach('keyup', autofill);
+                    name_field.on('keyup', autofill);
                 }
                 else {
                     /* Honor the user's URL; turn off autofill. */
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_add_milestone.py' => 'lib/lp/registry/windmill/tests/test_add_milestone.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_add_milestone.py	2009-06-25 05:30:52 +0000
+++ lib/lp/registry/windmill/tests/test_add_milestone.py	2009-12-11 20:25:26 +0000
@@ -7,95 +7,94 @@
 __all__ = []
 
 import time
+import unittest
 
 from canonical.launchpad.windmill.testing import lpuser
 
 from windmill.authoring import WindmillTestClient
 
-
-class InlineAddMilestoneForReleaseTest:
-    """Test adding a milestone inline."""
-
-    def __init__(self, name=None,
-                 url='http://launchpad.dev:8085/bzr/trunk/+addrelease',
-                 suite='milestone', user=lpuser.FOO_BAR):
-        """Create a new InlineAddMilestoneForReleaseTest.
-
-        :param name: Name of the test.
-        :param url: Starting url.
-        :param suite: The suite in which this test is part of.
-        :param user: The user who should be logged in.
-        """
-        self.url = url
-        if name is None:
-            self.__name__ = 'test_%s_add_milestone' % suite
-        else:
-            self.__name__ = name
-        self.suite = suite
-        self.user = user
-        self.client = None
-
-    def __call__(self):
-        """Tests creating new milestone for a release."""
-        # Ensure that the milestone name doesn't conflict with previous
-        # test runs, and test that it correctly lowercases the name.
-        milestone_name = u'FOObar%x' % int(time.time())
-        code_name = u'code-%s' % milestone_name
-
-        self.client = WindmillTestClient(self.suite)
-
-        self.user.ensure_login(self.client)
-        self.client.open(url=self.url)
-        self.client.waits.forPageLoad(timeout=u'20000')
-
-        self.client.waits.forElement(id=u'field.milestone_for_release',
-                                     timeout=u'8000')
-
-        # Click the "Create milestone" link.
-        self.client.click(id=u'create-milestone-link')
-
-        # Submit milestone form.
-        self.client.waits.forElement(id=u'field.name', timeout=u'8000')
-        self.client.type(id='field.name', text=milestone_name)
-        self.client.type(id='field.code_name', text=code_name)
-        self.client.type(id='field.dateexpected', text=u"2004-01-05")
-        self.client.type(id='field.summary', text=u"foo bar")
-        self.client.click(id=u'formoverlay-add-milestone')
-
-        # Verify that the milestone was added to the SELECT input,
-        # and that it is now selected.
-        self.client.waits.sleep(milliseconds='1000')
-        self.client.asserts.assertSelected(id="field.milestone_for_release",
-                                           validator=milestone_name.lower())
-
-        # Verify error message when trying to create a milestone with a
-        # conflicting name.
-        self.client.click(id=u'create-milestone-link')
-        self.client.waits.forElement(id=u'field.name', timeout=u'8000')
-        self.client.type(id='field.name', text=milestone_name)
-        self.client.click(id=u'formoverlay-add-milestone')
-        self.client.asserts.assertText(
-            id='milestone-error',
-            validator='The name %s is already used' % milestone_name.lower())
-        self.client.click(classname='close-button')
-
-        # Submit product release form.
-        self.client.select(id='field.milestone_for_release',
-                           val=milestone_name.lower())
-        self.client.type(id='field.datereleased', text=u"2004-02-22")
-        self.client.click(id=u'field.actions.create')
-        self.client.waits.forPageLoad(timeout=u'20000')
-
-        # Verify that the release was created.
-        milestone_xpath = (
-            "//table[@id='series_trunk']//a[@href='/bzr/+milestone/%s']"
-            % milestone_name.lower())
-        self.client.waits.forElement(xpath=milestone_xpath, timeout=u'8000')
-        self.client.asserts.assertText(
-            xpath=milestone_xpath, validator=milestone_name.lower())
-        self.client.asserts.assertText(
-            xpath=milestone_xpath, validator=code_name)
-
-
-test_inline_add_milestone_for_release = InlineAddMilestoneForReleaseTest(
-    name='test_inline_add_milestone_for_release')
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+
+def test_inline_add_milestone(client, url, name=None, suite='milestone',
+                              user=lpuser.FOO_BAR):
+    """Test the form overlay for adding a milestone.
+
+    :param name: Name of the test.
+    :param url: Starting url.
+    :param suite: The suite in which this test is part of.
+    :param user: The user who should be logged in.
+    """
+    # Ensure that the milestone name doesn't conflict with previous
+    # test runs, and test that it correctly lowercases the name.
+    milestone_name = u'FOObar%x' % int(time.time())
+    code_name = u'code-%s' % milestone_name
+
+    user.ensure_login(client)
+    client.open(url=url)
+    client.waits.forPageLoad(timeout=u'20000')
+
+    client.waits.forElement(
+        id=u'field.milestone_for_release', timeout=u'8000')
+
+    # Click the "Create milestone" link.
+    client.click(id=u'create-milestone-link')
+
+    # Submit milestone form.
+    client.waits.forElement(id=u'field.name', timeout=u'8000')
+    client.type(id='field.name', text=milestone_name)
+    client.type(id='field.code_name', text=code_name)
+    client.type(id='field.dateexpected', text=u"2004-01-05")
+    client.type(id='field.summary', text=u"foo bar")
+    client.click(id=u'formoverlay-add-milestone')
+
+    # Verify that the milestone was added to the SELECT input,
+    # and that it is now selected.
+    client.waits.sleep(milliseconds='1000')
+    client.asserts.assertSelected(id="field.milestone_for_release",
+                                  validator=milestone_name.lower())
+
+    # Verify error message when trying to create a milestone with a
+    # conflicting name.
+    client.click(id=u'create-milestone-link')
+    client.waits.forElement(id=u'field.name', timeout=u'8000')
+    client.type(id='field.name', text=milestone_name)
+    client.click(id=u'formoverlay-add-milestone')
+    client.asserts.assertTextIn(
+        classname='yui-lazr-formoverlay-errors',
+        validator='The name %s is already used' % milestone_name.lower())
+    client.click(classname='close-button')
+
+    # Submit product release form.
+    client.select(id='field.milestone_for_release',
+                  val=milestone_name.lower())
+    client.type(id='field.datereleased', text=u"2004-02-22")
+    client.click(id=u'field.actions.create')
+    client.waits.forPageLoad(timeout=u'20000')
+
+    # Verify that the release was created.
+    client.waits.forElement(id="version")
+    client.asserts.assertText(
+        xpath="//*[@id='version']/dd", validator=milestone_name.lower())
+    client.asserts.assertText(
+        xpath="//*[@id='code-name']/dd", validator=code_name)
+
+
+class TestAddMilestone(TestCaseWithFactory):
+    """Test form overlay widget for adding a milestone."""
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('AddMilestone')
+
+    def test_adding_milestone_on_addrelease_page(self):
+        test_inline_add_milestone(
+            self.client,
+            url='http://launchpad.dev:8085/bzr/trunk/+addrelease',
+            name='test_inline_add_milestone_for_release')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_datetime_picker.py' => 'lib/lp/registry/windmill/tests/test_datetime_picker.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_datetime_picker.py	2009-06-25 05:30:52 +0000
+++ lib/lp/registry/windmill/tests/test_datetime_picker.py	2009-12-11 20:25:26 +0000
@@ -6,57 +6,75 @@
 __metaclass__ = type
 __all__ = []
 
+import unittest
+
+from windmill.authoring import WindmillTestClient
+
 from canonical.launchpad.windmill.testing import lpuser
 
-from windmill.authoring import WindmillTestClient
-
-def test_datetime_calendar_widget():
-    """Test the calendar widget's general functionality.
-
-    This test ensures that, with Javascript enabled, an input field
-    with the 'yui-calendar' class will get an extra 'choose...' link
-    which opens up a calendar widget. The extra class 'withtime' is
-    used to optionally include time fields.
-    """
-    client = WindmillTestClient("Datetime calendar widget test")
-    lpuser.SAMPLE_PERSON.ensure_login(client)
-
-    # Open a new sprint page and wait for it to finish loading.
-    client.open(url=u'http://blueprints.launchpad.dev:8085/sprints/+new')
-    client.waits.forPageLoad(timeout=u'20000')
-    client.waits.forElement(link=u'Choose...', timeout=u'8000')
-
-    # Enter a date directly in the field first (which will ensure
-    # the calendar widget opens with this date.)
-    client.click(id=u'field.time_starts')
-    client.type(text=u'2009-05-08 10:04', id=u'field.time_starts')
-
-    # Open the calendar widget
-    client.click(link=u'Choose...')
-
-    # Initially choose the 21st of May 2009 and verify that the input
-    # field's value has changed.
-    client.click(link=u'21')
-    client.asserts.assertValue(validator=u'2009-05-21 10:04',
-                               id=u'field.time_starts')
-
-    # Navigate to the next month, select the 9th, enter a time of 10:30
-    # and click the close/confirm button, then verify the correct value
-    # is in the field.
-    client.click(link=u'Next Month (June 2009)')
-    client.click(link=u'9')
-    client.type(
-        xpath=(u"//div[@id='calendar_container-field.time_starts']"
-               u"/div[2]/input"),
-        text=u'10')
-
-    client.type(
-        xpath=(u"//div[@id='calendar_container-field.time_starts']"
-               u"/div[2]/input[2]"),
-        text=u'30')
-
-    client.click(xpath=(u"//div[@id='calendar_container-field.time_starts']"
-                        u"/div[2]/button"))
-    client.asserts.assertValue(validator=u'2009-06-09 10:30',
-                               id=u'field.time_starts')
-
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+
+class TestDateTimeCalendarWidget(TestCaseWithFactory):
+    """Test datetime calendar widget."""
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('DateTimeCalendarWidget')
+
+    def test_datetime_calendar_widget(self):
+        """Test the calendar widget's general functionality.
+
+        This test ensures that, with Javascript enabled, an input field
+        with the 'yui-calendar' class will get an extra 'choose...' link
+        which opens up a calendar widget. The extra class 'withtime' is
+        used to optionally include time fields.
+        """
+        lpuser.SAMPLE_PERSON.ensure_login(self.client)
+
+        # Open a new sprint page and wait for it to finish loading.
+        self.client.open(
+            url=u'http://blueprints.launchpad.dev:8085/sprints/+new')
+        self.client.waits.forPageLoad(timeout=u'20000')
+        self.client.waits.forElement(link=u'Choose...', timeout=u'8000')
+
+        # Enter a date directly in the field first (which will ensure
+        # the calendar widget opens with this date.)
+        self.client.click(id=u'field.time_starts')
+        self.client.type(text=u'2009-05-08 10:04', id=u'field.time_starts')
+
+        # Open the calendar widget
+        self.client.click(link=u'Choose...')
+
+        # Initially choose the 21st of May 2009 and verify that the input
+        # field's value has changed.
+        self.client.click(link=u'21')
+        self.client.asserts.assertValue(
+            validator=u'2009-05-21 10:04', id=u'field.time_starts')
+
+        # Navigate to the next month, select the 9th, enter a time of 10:30
+        # and click the close/confirm button, then verify the correct value
+        # is in the field.
+        self.client.click(link=u'Next Month (June 2009)')
+        self.client.click(link=u'9')
+        self.client.type(
+            xpath=(u"//div[@id='calendar_container-field.time_starts']"
+                   u"/div[2]/input"),
+            text=u'10')
+
+        self.client.type(
+            xpath=(u"//div[@id='calendar_container-field.time_starts']"
+                   u"/div[2]/input[2]"),
+            text=u'30')
+
+        self.client.click(
+            xpath=(u"//div[@id='calendar_container-field.time_starts']"
+                   u"/div[2]/button"))
+        self.client.asserts.assertValue(
+            validator=u'2009-06-09 10:30', id=u'field.time_starts')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step1.py' => 'lib/lp/registry/windmill/tests/test_plusnew_step1.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step1.py	2009-06-25 05:30:52 +0000
+++ lib/lp/registry/windmill/tests/test_plusnew_step1.py	2009-12-11 20:25:26 +0000
@@ -1,48 +1,72 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Test form for creating a new project."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
 from windmill.authoring import WindmillTestClient
 
 from canonical.launchpad.windmill.testing import lpuser
 
-
-def test_projects_plusnew_text_fields():
-    """Test the text fields on step 1 of projects/+new page.
-
-    On step 1 of the wizard, the URL field gets autofilled from the Name
-    field.  Also, the URL field will not accept invalid characters.
-    """
-    client = WindmillTestClient('projects/+new step one dynamism')
-    lpuser.SAMPLE_PERSON.ensure_login(client)
-
-    # Perform step 1 of the project registration, using information that will
-    # yield search results.
-    client.open(url=u'http://launchpad.dev:8085/projects/+new')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    client.type(text=u'dolphin', id='field.displayname')
-    # The field is forced to lower case by a CSS text-transform, but that's
-    # presentation and not testable.  However, the field /is/ autofilled from
-    # the displayname field, and this we can test.
-    client.asserts.assertValue(
-        id=u'field.name',
-        validator=u'dolphin')
-    # If we type into the Name field something that contains some trailing
-    # invalid characters, they don't end up in the URL field.
-    client.type(text=u'dol@phin', id='field.displayname')
-    client.asserts.assertValue(
-        id=u'field.name',
-        validator=u'dol')
-    # Typing directly into the URL field prevents the autofilling.
-    client.type(text=u'mongoose', id='field.name')
-    client.type(text=u'dingo', id='field.displayname')
-    client.asserts.assertValue(
-        id=u'field.name',
-        validator=u'mongoose')
-    # But once we clear the URL field, autofilling is re-enabled.  Type a
-    # backspace character to trigger this.
-    client.type(text=u'\x08', id='field.name')
-    client.type(text='hyena', id='field.displayname')
-    client.asserts.assertValue(
-        id=u'field.name',
-        validator=u'hyena')
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+BACKSPACE = u'\x08'
+
+
+class TestNewProjectStep1(TestCaseWithFactory):
+    """Test form for creating a new project."""
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('TestNewProjectStep1')
+
+    def test_projects_plusnew_text_fields(self):
+        """Test the text fields on step 1 of projects/+new page.
+
+        On step 1 of the wizard, the URL field gets autofilled from the Name
+        field.  Also, the URL field will not accept invalid characters.
+        """
+        # Perform step 1 of the project registration, using information
+        # that will yield search results.
+        self.client.open(url=u'http://launchpad.dev:8085/projects/+new')
+
+        lpuser.SAMPLE_PERSON.ensure_login(self.client)
+
+        self.client.waits.forElement(id='field.displayname')
+        self.client.type(text=u'dolphin', id='field.displayname')
+
+        # The field is forced to lower case by a CSS text-transform, but
+        # that's presentation and not testable.  However, the field /is/
+        # autofilled from the displayname field, and this we can test.
+        self.client.asserts.assertValue(
+            id=u'field.name',
+            validator=u'dolphin')
+        # If we type into the Name field something that contains some trailing
+        # invalid characters, they don't end up in the URL field.
+        self.client.type(text=u'dol@phin', id='field.displayname')
+        self.client.asserts.assertValue(
+            id=u'field.name',
+            validator=u'dol')
+        # Typing directly into the URL field prevents the autofilling.
+        self.client.type(text=u'mongoose', id='field.name')
+        self.client.type(text=u'dingo', id='field.displayname')
+        self.client.asserts.assertValue(
+            id=u'field.name',
+            validator=u'mongoose')
+        # But once we clear the URL field, autofilling is re-enabled.  Type a
+        # backspace character to trigger this.
+        self.client.type(text=BACKSPACE, id='field.name')
+        self.client.type(text='hyena', id='field.displayname')
+        self.client.asserts.assertValue(
+            id=u'field.name',
+            validator=u'hyena')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step2.py' => 'lib/lp/registry/windmill/tests/test_plusnew_step2.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_plusnew_step2.py	2009-07-21 17:14:29 +0000
+++ lib/lp/registry/windmill/tests/test_plusnew_step2.py	2009-12-11 20:25:26 +0000
@@ -1,68 +1,97 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Test for form for creating a project."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
 from windmill.authoring import WindmillTestClient
 
 from canonical.launchpad.windmill.testing import lpuser
 
-
-def test_projects_plusnew_step_two():
-    """Test the dynamic aspects of step 2 of projects/+new page.
-
-    When the project being registered matches existing projects, the step two
-    page has some extra javascript-y goodness.  At the start, there's a 'No'
-    button that hides the search results and reveals the rest of the project
-    registration form.  After that, there's a href that toggles between
-    revealing the search results and hiding them.
-    """
-    client = WindmillTestClient('projects/+new step two dynamism')
-    lpuser.SAMPLE_PERSON.ensure_login(client)
-
-    # Perform step 1 of the project registration, using information that will
-    # yield search results.
-    client.open(url=u'http://launchpad.dev:8085/projects/+new')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    client.type(text=u'Badgers', id='field.displayname')
-    client.type(text=u'badgers', id='field.name')
-    client.type(text=u"There's the Badger", id='field.title')
-    client.type(text=u'Badgers ate my firefox', id='field.summary')
-    client.click(id=u'field.actions.continue')
-    client.waits.forPageLoad(timeout=u'20000')
-    # The h2 heading indicates that a search was performed.
-    client.asserts.assertText(
-        id=u'step-title',
-        validator=u'Check for duplicate projects')
-    # Clicking on the "No" button hides the button and search results, reveals
-    # the form widgets, and reveals an href link for toggling the search
-    # results.  It also changes the h2 title to something more appropriate.
-    client.click(id=u'registration-details-buttons')
-    client.asserts.assertText(
-        id=u'step-title',
-        validator=u'Registration details')
-    # The className for hidden elements is lazr-closed  because it's set by
-    # the slide-in effect.  For slide-out elements, it's lazr-opened.
-    client.asserts.assertProperty(
-        id='search-results', validator='className|lazr-closed')
-    client.asserts.assertProperty(
-        id=u'launchpad-form-widgets',
-        validator='className|lazr-opened')
-    client.asserts.assertNotProperty(
-        id=u'search-results-expander',
-        validator='className|unseen')
-    # Clicking on the href expands the search results.
-    client.click(id='search-results-expander')
-    client.waits.forElement(
-        xpath='//*[@id="search-results" and contains(@class, "lazr-opened")]',
-        milliseconds=u'1000')
-    client.asserts.assertProperty(
-        id=u'search-results',
-        validator='className|lazr-opened')
-    # Clicking it again hides the results.
-    client.click(id='search-results-expander')
-    client.waits.forElement(
-        xpath='//*[@id="search-results" and contains(@class, "lazr-closed")]',
-        milliseconds=u'1000')
-    client.asserts.assertProperty(
-        id=u'search-results',
-        validator='className|lazr-closed')
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+
+class TestNewProjectStep2(TestCaseWithFactory):
+    """Test form for creating a new project."""
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('TestNewProjectStep2')
+
+    def test_projects_plusnew_step_two(self):
+        """Test the dynamic aspects of step 2 of projects/+new page.
+
+        When the project being registered matches existing projects, the
+        step two page has some extra javascript-y goodness.  At the
+        start, there's a 'No' button that hides the search results and
+        reveals the rest of the project registration form.  After that,
+        there's a href that toggles between revealing the search results
+        and hiding them.
+        """
+
+        # Perform step 1 of the project registration, using information
+        # that will yield search results.
+        self.client.open(url=u'http://launchpad.dev:8085/projects/+new')
+
+        lpuser.SAMPLE_PERSON.ensure_login(self.client)
+
+        self.client.waits.forElement(id='field.displayname', timeout=u'20000')
+        self.client.type(text=u'Badgers', id='field.displayname')
+        self.client.type(text=u'badgers', id='field.name')
+        self.client.type(text=u"There's the Badger", id='field.title')
+        self.client.type(text=u'Badgers ate my firefox', id='field.summary')
+        self.client.click(id=u'field.actions.continue')
+        self.client.waits.forPageLoad(timeout=u'20000')
+        # The h2 heading indicates that a search was performed.
+        self.client.asserts.assertTextIn(
+            id=u'step-title',
+            validator=u'Check for duplicate projects')
+
+        # Clicking on the "No" button hides the button and search
+        # results, reveals the form widgets, and reveals an href link
+        # for toggling the search results.  It also changes the h2 title
+        # to something more appropriate.
+        self.client.click(id=u'registration-details-buttons')
+        self.client.asserts.assertTextIn(
+            id=u'step-title',
+            validator=u'Registration details')
+
+        # The className for hidden elements is lazr-closed  because it's
+        # set by the slide-in effect.  For slide-out elements, it's
+        # lazr-opened.
+        self.client.asserts.assertProperty(
+            id='search-results', validator='className|lazr-closed')
+        self.client.asserts.assertProperty(
+            id=u'launchpad-form-widgets',
+            validator='className|lazr-opened')
+        self.client.asserts.assertNotProperty(
+            id=u'search-results-expander',
+            validator='className|unseen')
+        # Clicking on the href expands the search results.
+        self.client.click(id='search-results-expander')
+        self.client.waits.forElement(
+            xpath='//*[@id="search-results" '
+                  'and contains(@class, "lazr-opened")]',
+            milliseconds=u'1000')
+        self.client.asserts.assertProperty(
+            id=u'search-results',
+            validator='className|lazr-opened')
+        # Clicking it again hides the results.
+        self.client.click(id='search-results-expander')
+        self.client.waits.forElement(
+            xpath='//*[@id="search-results" '
+                  'and contains(@class, "lazr-closed")]',
+            milliseconds=u'1000')
+        self.client.asserts.assertProperty(
+            id=u'search-results',
+            validator='className|lazr-closed')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_product.py' => 'lib/lp/registry/windmill/tests/test_product.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_product.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/windmill/tests/test_product.py	2009-12-11 20:25:26 +0000
@@ -1,24 +1,46 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from canonical.launchpad.windmill.testing import lpuser
-from canonical.launchpad.windmill.testing import widgets
-
-test_title_inline_edit = widgets.InlineEditorWidgetTest(
-    url='http://launchpad.dev:8085/firefox',
-    widget_id='product-title',
-    expected_value='Mozilla Firefox',
-    new_value='The awesome Mozilla Firefox',
-    name='test_title_inline_edit',
-    suite=__name__,
-    user=lpuser.SAMPLE_PERSON)
-
-test_programming_languages_edit = widgets.InlineEditorWidgetTest(
-    url='http://launchpad.dev:8085/firefox',
-    widget_id='programminglang',
-    widget_tag='span',
-    expected_value='Not yet specified',
-    new_value='C++',
-    name='test_proglang_inline_edit',
-    suite=__name__,
-    user=lpuser.SAMPLE_PERSON)
+"""Test product index page."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
+from canonical.launchpad.windmill.testing import lpuser, widgets
+
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+class TestProductIndexPage(TestCaseWithFactory):
+    """Test product index page."""
+
+    layer = RegistryWindmillLayer
+
+    def test_title_inline_edit(self):
+        test = widgets.InlineEditorWidgetTest(
+            url='http://launchpad.dev:8085/firefox',
+            widget_id='product-title',
+            expected_value='Mozilla Firefox',
+            new_value='The awesome Mozilla Firefox',
+            name='test_title_inline_edit',
+            suite=__name__,
+            user=lpuser.SAMPLE_PERSON)
+        test()
+
+    def test_programming_languages_edit(self):
+        test = widgets.InlineEditorWidgetTest(
+            url='http://launchpad.dev:8085/firefox',
+            widget_id='programminglang',
+            widget_tag='span',
+            expected_value='Not yet specified',
+            new_value='C++',
+            name='test_proglang_inline_edit',
+            suite=__name__,
+            user=lpuser.SAMPLE_PERSON)
+        test()
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_product_edit_people.py' => 'lib/lp/registry/windmill/tests/test_product_edit_people.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_product_edit_people.py	2009-07-17 00:26:05 +0000
+++ lib/lp/registry/windmill/tests/test_product_edit_people.py	2009-12-11 20:25:26 +0000
@@ -1,23 +1,44 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Test picker on +edit-people page."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
 from canonical.launchpad.windmill.testing.widgets import (
     FormPickerWidgetTest)
 
-
-test_product_edit_people_driver = FormPickerWidgetTest(
-    name='test_product_edit_people_driver',
-    url='http://launchpad.dev:8085/firefox/+edit-people',
-    short_field_name='driver',
-    search_text='Perell\xc3\xb3',
-    result_index=1,
-    new_value='carlos')
-
-test_product_edit_people_owner = FormPickerWidgetTest(
-    name='test_product_edit_people_owner',
-    url='http://launchpad.dev:8085/firefox/+edit-people',
-    short_field_name='owner',
-    search_text='guadamen',
-    result_index=1,
-    new_value='guadamen')
-
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+class TestProductEditPeople(TestCaseWithFactory):
+    """Test picker +edit-people page."""
+
+    layer = RegistryWindmillLayer
+
+    def test_product_edit_people_driver(self):
+        test = FormPickerWidgetTest(
+            name='test_product_edit_people_driver',
+            url='http://launchpad.dev:8085/firefox/+edit-people',
+            short_field_name='driver',
+            search_text='Perell\xc3\xb3',
+            result_index=1,
+            new_value='carlos')
+        test()
+
+    def test_product_edit_people_owner(self):
+        test = FormPickerWidgetTest(
+            name='test_product_edit_people_owner',
+            url='http://launchpad.dev:8085/firefox/+edit-people',
+            short_field_name='owner',
+            search_text='guadamen',
+            result_index=1,
+            new_value='guadamen')
+        test()
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== renamed file 'lib/canonical/launchpad/windmill/tests/test_registry/test_project_licenses.py' => 'lib/lp/registry/windmill/tests/test_project_licenses.py'
--- lib/canonical/launchpad/windmill/tests/test_registry/test_project_licenses.py	2009-07-17 02:25:09 +0000
+++ lib/lp/registry/windmill/tests/test_project_licenses.py	2009-12-11 20:25:26 +0000
@@ -1,131 +1,151 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Test project licenses picker."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
 from windmill.authoring import WindmillTestClient
 
 from canonical.launchpad.windmill.testing import lpuser
 
-
-def test_project_licenses():
-    """Test the dynamic aspects of the project license picker."""
-    client = WindmillTestClient('firefox/+edit license picking')
-    lpuser.SAMPLE_PERSON.ensure_login(client)
-
-    # The firefox project is as good as any.
-    client.open(url=u'http://launchpad.dev:8085/firefox/+edit')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    # The Recommended table is visible.
-    client.asserts.assertProperty(
-        id=u'recommended',
-        validator='className|lazr-opened')
-    # But the More table is not.
-    client.asserts.assertProperty(
-        id=u'more',
-        validator='className|lazr-closed')
-    # Neither is the Other choices.
-    client.asserts.assertProperty(
-        id=u'special',
-        validator='className|lazr-closed')
-
-    # Clicking on the link exposes the More section though.
-    client.click(id='more-expand')
-    client.waits.sleep(milliseconds=u'1000')
-    client.asserts.assertProperty(
-        id=u'more',
-        validator='className|lazr-opened')
-
-    # As does clicking on the Other choices section.
-    client.click(id='special-expand')
-    client.waits.sleep(milliseconds=u'1000')
-    client.asserts.assertProperty(
-        id=u'special',
-        validator='className|lazr-opened')
-
-    # Clicking on any opened link closes the section.
-    client.click(id='recommended-expand')
-    client.asserts.assertProperty(
-        id=u'recommended',
-        validator='className|lazr-closed')
-
-    # The license details box starts out hidden.
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-closed')
-
-    # But clicking on one of the Other/* licenses exposes it.
-    client.click(id='field.licenses.26')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-opened')
-
-    # Clicking on Other/Proprietary exposes the additional commercial
-    # licensing details.
-    client.asserts.assertProperty(
-        id=u'proprietary',
-        validator='className|lazr-closed')
-
-    client.click(id='field.licenses.25')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-opened')
-    client.asserts.assertProperty(
-        id=u'proprietary',
-        validator='className|lazr-opened')
-
-    # Only when all Other/* items are unchecked does the details box get
-    # hidden.
-    client.click(id='field.licenses.26')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-opened')
-
-    client.click(id='field.licenses.25')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-closed')
-    client.asserts.assertProperty(
-        id=u'proprietary',
-        validator='className|lazr-closed')
-
-    # Clicking on "I haven't specified..." unchecks everything and closes the
-    # details box, but leaves the sections opened.
-    client.click(id='field.licenses.25')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-opened')
-
-    client.asserts.assertChecked(
-        id=u'field.licenses.25')
-
-    client.click(id='license_pending')
-    client.asserts.assertNotChecked(
-        id=u'field.licenses.25')
-    
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-closed')
-
-    # Submitting the form with items checked ensures that the next time the
-    # page is visited, those sections will be open.  The Recommended section
-    # is always open.
-
-    client.click(id='field.licenses.25')
-    client.type(id='field.license_info', text='Foo bar')
-    client.click(id='field.licenses.3')
-    client.click(id='field.actions.change')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    client.open(url=u'http://launchpad.dev:8085/firefox/+edit')
-    client.waits.forPageLoad(timeout=u'20000')
-
-    client.asserts.assertProperty(
-        id=u'more',
-        validator='className|lazr-opened')
-    # Neither is the Other choices.
-    client.asserts.assertProperty(
-        id=u'special',
-        validator='className|lazr-opened')
-    client.asserts.assertProperty(
-        id=u'license-details',
-        validator='className|lazr-opened')
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import TestCaseWithFactory
+
+
+class TestProjectLicenses(TestCaseWithFactory):
+    """Test project licenses picker."""
+
+    layer = RegistryWindmillLayer
+
+    def setUp(self):
+        self.client = WindmillTestClient('TestProjectLicenses')
+
+    def test_project_licenses(self):
+        """Test the dynamic aspects of the project license picker."""
+        # The firefox project is as good as any.
+        self.client.open(url=u'http://launchpad.dev:8085/firefox/+edit')
+        self.client.waits.forPageLoad(timeout=u'20000')
+
+        lpuser.SAMPLE_PERSON.ensure_login(self.client)
+
+        # The Recommended table is visible.
+        self.client.waits.forElementProperty(
+            id=u'recommended',
+            option='className|lazr-opened')
+        # But the More table is not.
+        self.client.asserts.assertProperty(
+            id=u'more',
+            validator='className|lazr-closed')
+        # Neither is the Other choices.
+        self.client.asserts.assertProperty(
+            id=u'special',
+            validator='className|lazr-closed')
+
+        # Clicking on the link exposes the More section though.
+        self.client.click(id='more-expand')
+        self.client.waits.forElementProperty(
+            id=u'more',
+            option='className|lazr-opened')
+
+        # As does clicking on the Other choices section.
+        self.client.click(id='special-expand')
+        self.client.waits.forElementProperty(
+            id=u'special',
+            option='className|lazr-opened')
+
+        # Clicking on any opened link closes the section.
+        self.client.click(id='recommended-expand')
+        self.client.waits.forElementProperty(
+            id=u'recommended',
+            option='className|lazr-closed')
+
+        # The license details box starts out hidden.
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-closed')
+
+        # But clicking on one of the Other/* licenses exposes it.
+        self.client.click(id='field.licenses.26')
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-opened')
+
+        # Clicking on Other/Proprietary exposes the additional commercial
+        # licensing details.
+        self.client.asserts.assertProperty(
+            id=u'proprietary',
+            validator='className|lazr-closed')
+
+        self.client.click(id='field.licenses.25')
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-opened')
+        self.client.asserts.assertProperty(
+            id=u'proprietary',
+            validator='className|lazr-opened')
+
+        # Only when all Other/* items are unchecked does the details box get
+        # hidden.
+        self.client.click(id='field.licenses.26')
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-opened')
+
+        self.client.click(id='field.licenses.25')
+        self.client.waits.forElementProperty(
+            id=u'license-details',
+            option='className|lazr-closed')
+        self.client.asserts.assertProperty(
+            id=u'proprietary',
+            validator='className|lazr-closed')
+
+        # Clicking on "I haven't specified..." unchecks everything and
+        # closes the details box, but leaves the sections opened.
+
+        self.client.click(id='field.licenses.25')
+        self.client.waits.forElementProperty(
+            id=u'license-details',
+            option='className|lazr-opened')
+
+        self.client.asserts.assertChecked(
+            id=u'field.licenses.25')
+
+        self.client.click(id='license_pending')
+        self.client.asserts.assertNotChecked(
+            id=u'field.licenses.25')
+
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-closed')
+
+        # Submitting the form with items checked ensures that the next
+        # time the page is visited, those sections will be open.  The
+        # Recommended section is always open.
+
+        self.client.click(id='field.licenses.25')
+        self.client.type(id='field.license_info', text='Foo bar')
+        self.client.click(id='field.licenses.3')
+        self.client.click(id='field.actions.change')
+        self.client.waits.forPageLoad(timeout=u'20000')
+
+        self.client.open(url=u'http://launchpad.dev:8085/firefox/+edit')
+        self.client.waits.forPageLoad(timeout=u'20000')
+
+        self.client.asserts.assertProperty(
+            id=u'more',
+            validator='className|lazr-opened')
+        # Neither is the Other choices.
+        self.client.asserts.assertProperty(
+            id=u'special',
+            validator='className|lazr-opened')
+        self.client.asserts.assertProperty(
+            id=u'license-details',
+            validator='className|lazr-opened')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/registry/windmill/tests/test_timeline_graph.py'
--- lib/lp/registry/windmill/tests/test_timeline_graph.py	2009-10-29 13:40:37 +0000
+++ lib/lp/registry/windmill/tests/test_timeline_graph.py	2009-12-11 20:25:26 +0000
@@ -1,6 +1,11 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Test for timeline graph widget."""
+
+__metaclass__ = type
+__all__ = []
+
 import unittest
 
 from windmill.authoring import WindmillTestClient
@@ -9,6 +14,7 @@
 from lp.testing import TestCaseWithFactory
 
 class TestTimelineGraph(TestCaseWithFactory):
+    """Test timeline graph widget."""
 
     layer = RegistryWindmillLayer
 
 
=== modified file 'lib/lp/translations/tests/test_translationimportqueue.py'
--- lib/lp/translations/tests/test_translationimportqueue.py	2009-11-19 11:24:43 +0000
+++ lib/lp/translations/tests/test_translationimportqueue.py	2009-12-11 20:25:26 +0000
@@ -5,6 +5,7 @@
 
 __metaclass__ = type
 
+import transaction
 import unittest
 
 from zope.component import getUtility
@@ -17,25 +18,27 @@
 from canonical.testing import LaunchpadZopelessLayer
 
 
-class TestTranslationImportQueueEntryStatus(TestCaseWithFactory):
-    """Test handling of the status of a queue entry."""
+class TestCanSetStatusBase(TestCaseWithFactory):
+    """Base for tests that check that canSetStatus works ."""
 
     layer = LaunchpadZopelessLayer
+    dbuser = None
+    entry = None
 
     def setUp(self):
         """Set up context to test in."""
-        super(TestTranslationImportQueueEntryStatus, self).setUp()
+        super(TestCanSetStatusBase, self).setUp()
 
         self.queue = getUtility(ITranslationImportQueue)
         self.rosetta_experts = (
             getUtility(ILaunchpadCelebrities).rosetta_experts)
         self.productseries = self.factory.makeProductSeries()
         self.uploaderperson = self.factory.makePerson()
-        self.potemplate = self.factory.makePOTemplate(
-            productseries=self.productseries)
-        self.entry = self.queue.addOrUpdateEntry(
-            'demo.pot', '#demo', False, self.uploaderperson,
-            productseries=self.productseries, potemplate=self.potemplate)
+
+    def _switch_dbuser(self):
+        if self.dbuser != None:
+            transaction.commit()
+            self.layer.switchDbUser(self.dbuser)
 
     def _assertCanSetStatus(self, user, entry, expected_list):
         # Helper to check for all statuses.
@@ -49,6 +52,7 @@
             RosettaImportStatus.IMPORTED,
             RosettaImportStatus.NEEDS_REVIEW,
         ]
+        self._switch_dbuser()
         # Do *not* use assertContentEqual here, as the order matters.
         self.assertEqual(expected_list,
             [entry.canSetStatus(status, user)
@@ -71,6 +75,7 @@
         # If the entry has no import target set, even Rosetta experts
         # cannot set it to approved.
         self.entry.potemplate = None
+        self.entry.pofile = None
         self._assertCanSetStatus(self.rosetta_experts, self.entry,
             #  A      B     D     F     I    NR
             [False, True, True, True, True, True])
@@ -115,5 +120,66 @@
             [False, False, False, False, False, False])
 
 
+class TestCanSetStatusPOTemplate(TestCanSetStatusBase):
+    """Test canStatus applied to an entry with a POTemplate."""
+
+    def setUp(self):
+        """Create the entry to test on."""
+        super(TestCanSetStatusPOTemplate, self).setUp()
+
+        self.potemplate = self.factory.makePOTemplate(
+            productseries=self.productseries)
+        self.entry = self.queue.addOrUpdateEntry(
+            'demo.pot', '#demo', False, self.uploaderperson,
+            productseries=self.productseries, potemplate=self.potemplate)
+
+
+class TestCanSetStatusPOFile(TestCanSetStatusBase):
+    """Test canStatus applied to an entry with a POFile."""
+
+    def setUp(self):
+        """Create the entry to test on."""
+        super(TestCanSetStatusPOFile, self).setUp()
+
+        self.potemplate = self.factory.makePOTemplate(
+            productseries=self.productseries)
+        self.pofile = self.factory.makePOFile('eo', potemplate=self.potemplate)
+        self.entry = self.queue.addOrUpdateEntry(
+            'demo.po', '#demo', False, self.uploaderperson,
+            productseries=self.productseries, pofile=self.pofile)
+
+
+class TestCanSetStatusPOTemplateWithQueuedUser(TestCanSetStatusPOTemplate):
+    """Test handling of the status of a queue entry with 'queued' db user.
+
+    The archive uploader needs to set (and therefore check) the status of a
+    queue entry. It connects as a different database user and therefore we
+    need to make sure that setStatus stays within this user's permissions.
+    This is the version for POTemplate entries.
+    """
+
+    dbuser = 'queued'
+
+
+class TestCanSetStatusPOFileWithQueuedUser(TestCanSetStatusPOFile):
+    """Test handling of the status of a queue entry with 'queued' db user.
+
+    The archive uploader needs to set (and therefore check) the status of a
+    queue entry. It connects as a different database user and therefore we
+    need to make sure that setStatus stays within this user's permissions.
+    This is the version for POFile entries.
+    """
+
+    dbuser = 'queued'
+
+
 def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)
+    """Add only specific test cases and leave out the base case."""
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestCanSetStatusPOTemplate))
+    suite.addTest(unittest.makeSuite(TestCanSetStatusPOFile))
+    suite.addTest(
+        unittest.makeSuite(TestCanSetStatusPOTemplateWithQueuedUser))
+    suite.addTest(unittest.makeSuite(TestCanSetStatusPOFileWithQueuedUser))
+    return suite
+