Changeset 3376 in products for quintagroup.analytics/trunk/quintagroup/analytics/tests.py

Timestamp:

Mar 6, 2012 3:21:28 PM (12 years ago)

Author:

kroman0

Message:

Fixed tests for plone 4.1+

File:

• quintagroup.analytics/trunk/quintagroup/analytics/tests.py (modified) (2 diffs)

quintagroup.analytics/trunk/quintagroup/analytics/tests.py

@@ -321 +321 @@
                                  name="type_by_state")
         self.pc = self.portal.portal_catalog
+        portal_migration = self.portal.portal_migration
+        self.plone_version = portal_migration.getInstanceVersion()
 
     def test_getTypes(self):
@@ -382 +384 @@
             '3.0|0.0,0.0,0.0,0.0&chxr=0,0,159&chco=669933,'\
             'cc9966,993300,ff6633,e8e4e3,a9a486,dcb57e,ffcc99,996633,'\
-            '333300,00ff00&chl=Folder|Document|Event|Topic&'\
+            '333300,00ff00&chl=folder|document|event|topic&'\
             'chbh=a,10,0&chs=800x375&cht=bvs&'\
-            'chtt=Content+type+by+state&chdl=private|published|'\
-            'No+workflow&chdlp=b"/>'
-
-        chart_tag = plone4chart_tag
-        if not PLONE40:
+            'chtt=content+type+by+state&chdl=private|published|'\
+            'no+workflow&chdlp=b"/>'
+        plone41chart_tag = \
+            '<imgsrc="http://chart.apis.google.com/chart?chxt=y&amp;'\
+            'chds=0,159&amp;chd=t:156.0,145.0,145.0,0.0|3.0,1.0,0.0,'\
+            '3.0|0.0,0.0,0.0,0.0&amp;chxr=0,0,159&amp;chco=669933,'\
+            'cc9966,993300,ff6633,e8e4e3,a9a486,dcb57e,ffcc99,996633,'\
+            '333300,00ff00&amp;chl=folder|document|event|topic&amp;'\
+            'chbh=a,10,0&amp;chs=800x375&amp;cht=bvs&amp;'\
+            'chtt=content+type+by+state&amp;chdl=private|published|'\
+            'no+workflow&amp;chdlp=b"/>'
+
+        if self.plone_version < "4.0":
             chart_tag = plone33chart_tag
+        elif self.plone_version > "4.1":
+            chart_tag = plone41chart_tag
+        else:
+            chart_tag = plone4chart_tag
 
         self.loginAsPortalOwner()