Merge lp:~replaceafill/cando/fix_701786 into lp:cando

[Douglas Cerna]

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2010-12-15 13:08:18 +0000
+++ CHANGES.txt	2011-01-12 07:07:00 +0000
@@ -5,7 +5,7 @@
 2010.12.1 (unreleased)
 ----------------------
 
-- Nothing changed yet.
+- Fixed CanDo's IExternalActivities implementation (https://bugs.launchpad.net/cando/+bug/701786)
 
 
 2010.12 (2010-12-15)

=== modified file 'Makefile'
--- Makefile	2010-12-13 22:39:25 +0000
+++ Makefile	2011-01-12 07:07:00 +0000
@@ -74,11 +74,11 @@
 coverage: build
 	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . || true
 	rm -rf coverage
-	bin/test -u --coverage=coverage
+	bin/test --at-level 2 -u --coverage=coverage
 	mv parts/test/coverage .
 
 .PHONY: coverage-reports-html
-coverage-reports-html coverage/reports: build
+coverage-reports-html coverage/reports: coverage
 	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . || true
 	rm -rf coverage/reports
 	mkdir coverage/reports
@@ -98,11 +98,11 @@
 ftest-coverage: build
 	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . || true
 	rm -rf ftest-coverage
-	bin/test -f --coverage=ftest-coverage
+	bin/test --at-level 2 -f --coverage=ftest-coverage
 	mv parts/test/ftest-coverage .
 
 .PHONY: ftest-coverage-reports-html
-ftest-coverage-reports-html ftest-coverage/reports: build
+ftest-coverage-reports-html ftest-coverage/reports: ftest-coverage
 	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . || true
 	rm -rf ftest-coverage/reports
 	mkdir ftest-coverage/reports

=== modified file 'src/cando/skilldriver/README.txt'
--- src/cando/skilldriver/README.txt	2010-06-03 17:31:44 +0000
+++ src/cando/skilldriver/README.txt	2011-01-12 07:07:00 +0000
@@ -406,14 +406,40 @@
     >>> adapter.getExternalActivities()
     [<cando.skilldriver.skilldriver.CanDoExternalActivity ...>]
 
-An external activity can be retrieved using an external activity id::
+Let's check the external activity provides the right interface:
 
     >>> external_activity = adapter.getExternalActivities()[0]
     >>> verifyObject(IExternalActivity, external_activity)
     True
+
+And has the right attributes:
+
+    >>> external_activity.source
+    'cando.external_activities'
     >>> external_activity.external_activity_id
     '0'
 
+An external activity can be retrieved using an external activity id::
+
+    >>> same_activity = adapter.getExternalActivity('0')
+    >>> same_activity.source
+    'cando.external_activities'
+    >>> same_activity.external_activity_id
+    '0'
+
+If the id doesn't exist, None is returned:
+
+    >>> adapter.getExternalActivity('foobar') is None
+    True
+
+External activities can be compared for equality even if they're not
+the same object:
+
+    >>> external_activity is same_activity
+    False
+    >>> external_activity == same_activity
+    True
+
 An external activity provides a title, which is the same in the skill
 driver::
 

=== modified file 'src/cando/skilldriver/skilldriver.py'
--- src/cando/skilldriver/skilldriver.py	2010-06-03 16:20:16 +0000
+++ src/cando/skilldriver/skilldriver.py	2011-01-12 07:07:00 +0000
@@ -253,7 +253,7 @@
         return None
 
     def __eq__(self, other):
-        return other is not None and \
+        return IExternalActivity.providedBy(other) and \
                self.source == other.source and \
                self.external_activity_id == other.external_activity_id
 
@@ -289,4 +289,7 @@
             return None
         skilldriver = intids.queryObject(external_activity_id)
         if skilldriver is not None:
-            return IExternalActivity(skilldriver)
+            activity = IExternalActivity(skilldriver)
+            activity.source = self.source
+            activity.external_activity_id = str(external_activity_id)
+            return activity

=== modified file 'src/cando/skilldriver/tests.py'
--- src/cando/skilldriver/tests.py	2010-06-03 16:20:16 +0000
+++ src/cando/skilldriver/tests.py	2011-01-12 07:07:00 +0000
@@ -60,6 +60,10 @@
             if v == ob:
                 return k
 
+    def queryObject(self, id):
+        return self.getObject(id)
+
+
 def setUp(test):
     setup.placefulSetUp()
     setup.setUpAnnotations()