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

Timestamp:

May 18, 2012 10:55:47 AM (12 years ago)

Author:

kroman0

Message:

Fixed tests for plone 42 and pyflakes

File:

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

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

@@ -174 +174 @@
                                  name="ownership_by_type")
         self.pc = self.portal.portal_catalog
+        portal_migration = self.portal.portal_migration
+        version = portal_migration.getFileSystemVersion()
+        self.plone_version = version.replace(".", "")
 
     def test_getUsers(self):
@@ -246 +249 @@
             'chtt=Content+ownership+by+type&chdl=Folder|Document|'\
             'Event|Topic&chdlp=b" />'
-        chart_tag = plone4chart_tag
-        if not PLONE40:
+        plone42chart_tag = \
+            '<img src="http://chart.apis.google.com/chart?chxt=y&amp;'\
+            'chds=0,57&amp;chd=t:19.0,18.0,17.0,16.0,15.0,14.0,'\
+            '13.0,12.0,11.0,10.0|19.0,18.0,17.0,16.0,15.0,14.0,13.0,'\
+            '12.0,11.0,10.0|19.0,18.0,17.0,16.0,15.0,14.0,13.0,12.0,'\
+            '11.0,10.0|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0&amp;'\
+            'chxr=0,0,57&amp;chco=669933,cc9966,993300,ff6633,e8e4e3,'\
+            'a9a486,dcb57e,ffcc99,996633,333300,00ff00&amp;chl=user9|'\
+            'user8|user7|user6|user5|user4|user3|user2|user1|user0&amp;'\
+            'chbh=a,10,0&amp;chs=800x375&amp;cht=bvs&amp;'\
+            'chtt=Content+ownership+by+type&amp;chdl=Folder|Document|'\
+            'Event|Collection&amp;chdlp=b"/>'            
+
+        if self.plone_version < "40":
             chart_tag = plone33chart_tag
+        elif self.plone_version > "42":
+            chart_tag = plone42chart_tag
+        else:
+            chart_tag = plone4chart_tag
 
         self.loginAsPortalOwner()
@@ -396 +415 @@
             'vs&amp;chtt=Content+type+by+state&amp;chdl=private|published|N'\
             'o+workflow&amp;chdlp=b"/>'
+        plone42chart_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,2.0|0.0,0.0,0.'\
+            '0,0.0&amp;chxr=0,0,159&amp;chco=669933,cc9966,993300,ff6633,e8'\
+            'e4e3,a9a486,dcb57e,ffcc99,996633,333300,00ff00&amp;chl=Folder|'\
+            'Document|Event|Collection&amp;chbh=a,10,0&amp;chs=800x375&amp;'\
+            'cht=bvs&amp;chtt=Content+type+by+state&amp;chdl=private|publis'\
+            'hed|No+workflow&amp;chdlp=b"/>'
 
         if self.plone_version < "40":
             chart_tag = plone33chart_tag
-        elif self.plone_version > "41":
+        elif self.plone_version > "40" and self.plone_version < "41":
+            chart_tag = plone4chart_tag
+        elif self.plone_version > "41" and self.plone_version < "42":
             chart_tag = plone41chart_tag
-        else:
-            chart_tag = plone4chart_tag
+        elif self.plone_version > "42":
+            chart_tag = plone42chart_tag
 
         self.loginAsPortalOwner()