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

Timestamp:

Nov 18, 2010 3:42:34 PM (13 years ago)

Author:

fenix

Message:

fixed tests for plone.3.3.x

File:

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

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

@@ -9 +9 @@
 
 from Products.PloneTestCase import PloneTestCase as ptc
+from Products.PloneTestCase.version import PLONE33
 from Products.PloneTestCase import setup as ptc_setup
 from Products.PloneTestCase.layer import PloneSite
@@ -209 +210 @@
     def test_getChart(self):
         """ This test verifies creation of chart image tag."""
-        chart_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|Topic&amp;chdlp=b" />"""
+        plone33chart_tag = \
+          """<imgsrc="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|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|Large+Plone+Folder|Topic&amp;chdlp=b"/>"""
+        plone4chart_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|Topic&amp;chdlp=b" />"""
+        chart_tag = PLONE33 and plone33chart_tag or plone4chart_tag
+
         self.loginAsPortalOwner()
         self.assertEqual(*map(lambda s:''.join(s.split()),
@@ -291 +308 @@
     def test_getTypes(self):
         """ Tests method that returns ordered list of types."""
-        self.assert_(False not in map(lambda t1, t2:t1==t2,
-                                      ['Folder', 'Document', 'Event', 'Topic'],
+        index = self.pc._catalog.getIndex('portal_type')
+        data = {}
+        for k in index._index.keys():
+            if not k:
+                continue
+            haslen = hasattr(index._index[k], '__len__')
+            if haslen:
+                data[k] = len(index._index[k])
+            else:
+                data[k] = 1
+        data = data.items()
+        data.sort(lambda a, b: a[1] - b[1])
+        data.reverse()
+        types = [i[0] for i in data]
+        self.assert_(False not in map(lambda t1, t2:t1==t2, types,
                                       self.view.getTypes()))
 
@@ -318 +348 @@
     def test_getChart(self):
         """ This test verifies creation of chart image tag."""
-        chart_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"/>"""
+        plone33chart_tag = \
+          """<imgsrc="http://chart.apis.google.com/chart?chxt=y&amp;chds=0,
+             156&amp;chd=t:156.0,145.0,145.0,0.0,0.0|0.0,1.0,0.0,3.0,3.0|
+             0.0,0.0,0.0,0.0,0.0&amp;chxr=0,0,156&amp;chco=669933,cc9966,
+             993300,ff6633,e8e4e3,a9a486,dcb57e,ffcc99,996633,333300,
+             00ff00&amp;chl=Folder|Document|Event|Large+Plone+Folder|
+             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"/>"""
+        plone4chart_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|Topic&amp;chdlp=b" />"""
+        chart_tag = PLONE33 and plone33chart_tag or plone4chart_tag
 
         self.loginAsPortalOwner()