Changeset 2371 in products

Timestamp:

May 21, 2010 11:10:30 AM (14 years ago)

Author:

mylan

Message:

Updated tests with new converter by property functionality, fixed bug in converter

Location:

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath

Files:

• tests.py (modified) (3 diffs)
• upgrades.py (modified) (3 diffs)

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/tests.py

@@ -301 +301 @@
         return "http://nohost/plone"
     def getRelativeContentPath(self, context):
-        return "/plone/" + context.getId()
+        return ("plone", context.getId())
 
 class BaseItem:
@@ -333 +333 @@
         item._setProperty(PROPERTY_PATH, "/www/some/path")
         self.convertor.convertIPathToLink(item)
+        # 1. check canonical link in result object
         result = ICanonicalLink(item).canonical_link
         expect = "http://domain.com/www/some/path"
         self.assertEqual(result, expect, "Got %s canonical link, " \
                          "expect: %s" % (result, expect))
-        
+        # 2. canonical path propery mast be delete from the object
+        self.assertEqual(item.hasProperty(ICanonicalPath(item).prop), False,
+                         "canonical path' property not deleted from the object")
+
+    def test_convertPPathToLink(self):
+        item = GoodItem("item")
+        item._setProperty("custom_property", "/www/some/path")
+        self.convertor.convertPPathToLink(item, prop="custom_property")
+        # 1. check canonical link in result object
+        result = ICanonicalLink(item).canonical_link
+        expect = "http://domain.com/www/some/path"
+        self.assertEqual(result, expect, "Got %s canonical link, " \
+                         "expect: %s" % (result, expect))
+        # 2. custom_property mast be deleted from the object
+        self.assertEqual(item.hasProperty("custom_property"), False,
+                         "custom_property not deleted from the object")
+
     def test_convertBadItems(self):
         bad = NotProperyProviderItem("item")
@@ -383 +400 @@
         self.assertEqual(logs, "", "Log not cleand-up: \"%s\"" % logs)
 
- 
+
 def test_suite():
     return unittest.TestSuite([

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/upgrades.py

@@ -25 +25 @@
         self.portal_url = portal_url
 
+    # General APIs
     def getLogs(self):
         self._inout.flush()
@@ -56 +57 @@
                              self._convertP2L)
 
+    # Service methods
     def _convert(self, obj, src_iface, dst_iface, converter):
         """Convert canonical from source canonical interface
@@ -92 +94 @@
         if type(arg) in StringTypes:
             adapter = DefaultPropertyAdapter(obj)
-            adapater.prop = arg
+            adapter.prop = arg
             return adapter
         else: