[Checkins] SVN: grokcore.viewlet/trunk/ Corrected tests. In the tests, the viewlets used to return simple string.

Souheil CHELFOUH souheil at chelfouh.com
Sun Feb 28 14:17:59 EST 2010


Log message for revision 109510:
  Corrected tests. In the tests, the viewlets used to return simple string.
  However, the viewletmanager implementation specificaly tests the return value.
  Viewlets are supposed to return unicode strings, to permit a non-problematic string join.
  

Changed:
  U   grokcore.viewlet/trunk/buildout.cfg
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/order.py
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_manager_association.py
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_directive.py

-=-
Modified: grokcore.viewlet/trunk/buildout.cfg
===================================================================
--- grokcore.viewlet/trunk/buildout.cfg	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/buildout.cfg	2010-02-28 19:17:59 UTC (rev 109510)
@@ -15,6 +15,5 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = grokcore.viewlet
-       grokcore.viewlet[test]
+eggs = grokcore.viewlet [test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/order.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/order.py	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/order.py	2010-02-28 19:17:59 UTC (rev 109510)
@@ -59,42 +59,42 @@
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Cave"
+        return u"Cave"
 
 class BarneyViewlet(grok.Viewlet):
     grok.order(60)
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Barney"
+        return u"Barney"
 
 class BoneViewlet(grok.Viewlet):
     grok.order(10)
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Bone"
+        return u"Bone"
 
 class WilmaViewlet(grok.Viewlet):
     grok.order(50)
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Wilma"
+        return u"Wilma"
 
 class GoldViewlet(grok.Viewlet):
     grok.order(1)
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Gold"
+        return u"Gold"
 
 class FredViewlet(grok.Viewlet):
     grok.order(20)
     grok.viewletmanager(CaveManager)
 
     def render(self):
-        return "Fred"
+        return u"Fred"
 
 class OrderView2(grok.View):
     grok.template('orderview')
@@ -112,11 +112,11 @@
     grok.viewletmanager(CaveManager2)
 
     def render(self):
-        return "Cave"
+        return u"Cave"
 
 class NoExplicitOrderBarneyViewlet(grok.Viewlet):
     grok.name('barney')
     grok.viewletmanager(CaveManager2)
 
     def render(self):
-        return "Barney"
+        return u"Barney"

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py	2010-02-28 19:17:59 UTC (rev 109510)
@@ -35,7 +35,7 @@
     grok.viewletmanager(ICavemenViewletManager)
 
     def render(self):
-        return 'Me Fred'
+        return u'Me Fred'
 
 class Cave(grok.Context):
     pass

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_manager_association.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_manager_association.py	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_manager_association.py	2010-02-28 19:17:59 UTC (rev 109510)
@@ -24,7 +24,7 @@
 
 class FredViewlet(grok.Viewlet):
     def render(self):
-        return "Me say HI"
+        return u"Me say HI"
 
 class Cave(grok.Context):
     pass

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py	2010-02-28 19:17:59 UTC (rev 109510)
@@ -129,14 +129,14 @@
     grok.viewletmanager(Pot)
 
     def render(self):
-        return "T-Rex Bone"
+        return u"T-Rex Bone"
 
 class BrackerBone(grok.Viewlet):
     grok.context(Interface)
     grok.viewletmanager(Pot)
 
     def render(self):
-        return "Brack Bone"
+        return u"Brack Bone"
 
 class GoldBone(grok.Viewlet):
     grok.context(Interface)
@@ -162,7 +162,7 @@
     grok.context(CaveMan)
 
     def render(self):
-        return "Man Bone"
+        return u"Man Bone"
 
 class LadyViewlet(grok.Viewlet):
     grok.context(Interface)
@@ -182,5 +182,4 @@
     grok.viewletmanager(NamedViewletManager)
 
     def render(self):
-        return "NamedViewlet"
-
+        return u"NamedViewlet"

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_directive.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_directive.py	2010-02-28 18:58:14 UTC (rev 109509)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_directive.py	2010-02-28 19:17:59 UTC (rev 109510)
@@ -39,4 +39,4 @@
 
 class FredViewlet(grok.Viewlet):
     def render(self):
-        return 'Fred viewlet'
+        return u"Fred viewlet"



More information about the checkins mailing list