Merge lp:~salgado/launchpad/expose-blueprint-dependencies into lp:launchpad

[Guilherme Salgado]

[r=abentley][ui=none][bug=682757]

Expose ISpecification.dependencies on the webservice API.

[lp:~salgado/launchpad/expose-blueprint-dependencies]

11999. By Guilherme Salgado on 2010-11-29

merge test refactoring from other branch

12000. By Guilherme Salgado on 2010-11-29

Merge trunk

12001. By Guilherme Salgado on 2010-11-29

Tweak some tests to use assertContentEqual instead of sorting their lists manually

[Aaron Bentley (abentley)]

At 23, the import should be multi-line. Also, you should consider using lp.testing.ws_object rather than getSpecOnWebservice, because it is more general.

review: Approve

[lp:~salgado/launchpad/expose-blueprint-dependencies]

12002. By Guilherme Salgado on 2010-11-29

Use multi-line imports when importing multiple names

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-11-25 13:03:16 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-11-29 19:13:18 +0000
@@ -521,6 +521,9 @@
 # IProductSeries
 patch_reference_property(IProductSeries, 'product', IProduct)
 
+# ISpecification
+patch_collection_property(ISpecification, 'dependencies', ISpecification)
+
 # ISpecificationTarget
 patch_entry_return_type(
     ISpecificationTarget, 'getSpecification', ISpecification)

=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py	2010-11-26 18:04:53 +0000
+++ lib/lp/blueprints/interfaces/specification.py	2010-11-29 19:13:18 +0000
@@ -23,7 +23,11 @@
     exported,
     export_as_webservice_entry,
     )
-from lazr.restful.fields import ReferenceChoice
+from lazr.restful.fields import (
+    CollectionField,
+    Reference,
+    ReferenceChoice,
+    )
 
 from zope.component import getUtility
 from zope.interface import (
@@ -382,7 +386,12 @@
     sprints = Attribute('The sprints at which this spec is discussed.')
     sprint_links = Attribute('The entries that link this spec to sprints.')
     feedbackrequests = Attribute('The set of feedback requests queued.')
-    dependencies = Attribute('Specs on which this spec depends.')
+    dependencies = exported(
+        CollectionField(
+            title=_('Specs on which this one depends.'),
+            value_type=Reference(schema=Interface),  # ISpecification, really.
+            readonly=True),
+        ('devel', dict(exported=True)), exported=False)
     blocked_specs = Attribute('Specs for which this spec is a dependency.')
     all_deps = Attribute(
         "All the dependencies, including dependencies of dependencies.")

=== modified file 'lib/lp/blueprints/tests/test_hasspecifications.py'
--- lib/lp/blueprints/tests/test_hasspecifications.py	2010-11-29 16:16:18 +0000
+++ lib/lp/blueprints/tests/test_hasspecifications.py	2010-11-29 19:13:18 +0000
@@ -19,7 +19,7 @@
 
     def assertNamesOfSpecificationsAre(self, expected_names, specifications):
         names = [s.name for s in specifications]
-        self.assertEqual(sorted(expected_names), sorted(names))
+        self.assertContentEqual(expected_names, names)
 
     def test_product_all_specifications(self):
         product = self.factory.makeProduct()

=== modified file 'lib/lp/blueprints/tests/test_webservice.py'
--- lib/lp/blueprints/tests/test_webservice.py	2010-11-29 16:16:18 +0000
+++ lib/lp/blueprints/tests/test_webservice.py	2010-11-29 19:13:18 +0000
@@ -11,7 +11,9 @@
     SpecificationDefinitionStatus,
     )
 from lp.testing import (
-    launchpadlib_for, TestCaseWithFactory)
+    launchpadlib_for,
+    TestCaseWithFactory,
+    )
 
 
 class SpecificationWebserviceTestCase(TestCaseWithFactory):
@@ -46,10 +48,9 @@
         webservice = webservice_for_person(user)
         response = webservice.get(
             '/%s/+spec/%s' % (spec.product.name, spec.name))
-        expected_keys = sorted(
-            [u'self_link', u'http_etag', u'resource_type_link'])
+        expected_keys = [u'self_link', u'http_etag', u'resource_type_link']
         self.assertEqual(response.status, 200)
-        self.assertEqual(sorted(response.jsonBody().keys()), expected_keys)
+        self.assertContentEqual(expected_keys, response.jsonBody().keys())
 
     def test_representation_contains_name(self):
         spec = self.factory.makeSpecification()
@@ -141,6 +142,14 @@
         spec = self.getSpecOnWebservice(spec_object)
         self.assertEqual("1.0", spec.milestone.name)
 
+    def test_representation_contains_dependencies(self):
+        spec = self.factory.makeSpecification()
+        spec2 = self.factory.makeSpecification()
+        spec.createDependency(spec2)
+        spec_webservice = self.getSpecOnWebservice(spec)
+        self.assertEqual(1, spec_webservice.dependencies.total_size)
+        self.assertEqual(spec2.name, spec_webservice.dependencies[0].name)
+
 
 class SpecificationTargetTests(SpecificationWebserviceTestCase):
     """Tests for accessing specifications via their targets."""
@@ -204,7 +213,7 @@
 
     def assertNamesOfSpecificationsAre(self, expected_names, specifications):
         names = [s.name for s in specifications]
-        self.assertEqual(sorted(expected_names), sorted(names))
+        self.assertContentEqual(expected_names, names)
 
     def test_product_all_specifications(self):
         product = self.factory.makeProduct()