[KSS-checkins] r52403 - in kukit/kss.core/branch/kss.core-on-kss.zope: docs src/kss/core src/kss/core/tests

[jvloothuis at codespeak.net]

Author: jvloothuis
Date: Tue Mar 11 23:29:36 2008
New Revision: 52403

Added:
   kukit/kss.core/branch/kss.core-on-kss.zope/docs/
   kukit/kss.core/branch/kss.core-on-kss.zope/docs/HISTORY.txt
Modified:
   kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/base.py
   kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/test_ttwapi.py
   kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/ttwapi.py
Log:

Made the ttw test for kss.core work by changing the test slightly
(documented in HISTORY.txt for people who actually tested their ttw
stuff). Also imported the debug request marker interface from kss.zope
instead of defining our own (makes the output be a string instead of
the rendered XML).


Added: kukit/kss.core/branch/kss.core-on-kss.zope/docs/HISTORY.txt
==============================================================================
--- (empty file)
+++ kukit/kss.core/branch/kss.core-on-kss.zope/docs/HISTORY.txt	Tue Mar 11 23:29:36 2008
@@ -0,0 +1,30 @@
+Changelog for kss.base
+
+    (name of developer listed in brackets)
+
+kss.base - 2.0 Unreleased
+
+    - No longer use a special rendering adapter for tests. You can now
+      get a string representation to do the same thing. This makes it
+      easier to write doctests (just print the commands). For existing
+      unit tests change:
+
+        result = self.app.kss_test() 
+        self.assertEquals(len(result), 2)
+        command = result[0]
+        self.assertEquals(command['selector'], '#test')
+        self.assertEquals(command['name'], 'replaceInnerHTML')
+        command = result[1]
+        self.assertEquals(command['selector'], '#event')
+        self.assertEquals(command['name'], 'replaceInnerHTML')
+
+      To:
+
+        result = self.app.kss_test()
+        self.assertEquals(
+            str(result).split('\n'), 
+            ["replaceInnerHTML('#test', html=htmldata('<p>Done</p>'))", 
+             "replaceInnerHTML('#event', html=htmldata('Event subscriber was here.'))"])
+
+
+

Modified: kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/base.py
==============================================================================
--- kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/base.py	(original)
+++ kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/base.py	Tue Mar 11 23:29:36 2008
@@ -25,6 +25,8 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 #from zope.app.testing import placelesssetup
 
+from kss.zope.tests.interfaces import IDebugRequest
+
 import kss.core
 from kss.core import KSSView
 
@@ -91,12 +93,6 @@
     def testMethod(self):
         'Yes.'
 
-# Debug request
-# This has a modified render.
-
-class IDebugRequest(IBrowserRequest):
-    'The debug request'
-
 class KSSViewTestCaseMixin:
 
     def loadCoreConfig(self, kss_core=True):

Modified: kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/test_ttwapi.py
==============================================================================
--- kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/test_ttwapi.py	(original)
+++ kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/tests/test_ttwapi.py	Tue Mar 11 23:29:36 2008
@@ -49,28 +49,9 @@
 '''
         self.app.kss_test.ZPythonScript_edit('', pythonScriptCode)
         result = self.app.kss_test() 
-        self.assertEquals(len(result), 1)
-        command = result[0]
-        self.assertEquals(command['selector'], '#test')
-        self.assertEquals(command['name'], 'replaceInnerHTML')
-
-    def test_scriptWithEffect(self):
-        pythonScriptCode = '''
-from kss.core.ttwapi import startKSSCommands
-from kss.core.ttwapi import getKSSCommandSet
-from kss.core.ttwapi import renderKSSCommands
-startKSSCommands(context, context.REQUEST)
-commandSet = getKSSCommandSet('effects')
-commandSet.effect('#test', 'fade')
-return renderKSSCommands()
-'''
-        self.app.kss_test.ZPythonScript_edit('', pythonScriptCode)
-        result = self.app.kss_test() 
-        self.assertEquals(len(result), 1)
-        command = result[0]
-        self.assertEquals(command['selector'], '#test')
-        self.assertEquals(command['name'], 'effect')
-        self.assertEquals(command['params']['type'], 'fade')
+        self.assertEquals(
+            str(result),
+            "replaceInnerHTML('#test', html=htmldata('<p>Done</p>'))")
 
     def test_scriptWithEvents(self):
         pythonScriptCode = '''
@@ -86,13 +67,11 @@
 '''
         self.app.kss_test.ZPythonScript_edit('', pythonScriptCode)
         result = self.app.kss_test()
-        self.assertEquals(len(result), 2)
+        self.assertEquals(
+            str(result).split('\n'), 
+            ["replaceInnerHTML('#test', html=htmldata('<p>Done</p>'))", 
+             "replaceInnerHTML('#event', html=htmldata('Event subscriber was here.'))"])
         command = result[0]
-        self.assertEquals(command['selector'], '#test')
-        self.assertEquals(command['name'], 'replaceInnerHTML')
-        command = result[1]
-        self.assertEquals(command['selector'], '#event')
-        self.assertEquals(command['name'], 'replaceInnerHTML')
 
 @component.adapter(None, KSSView, ObjectModifiedEvent)
 def objectModifiedThruKSSView(obj, view, event):

Modified: kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/ttwapi.py
==============================================================================
--- kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/ttwapi.py	(original)
+++ kukit/kss.core/branch/kss.core-on-kss.zope/src/kss/core/ttwapi.py	Tue Mar 11 23:29:36 2008
@@ -7,3 +7,11 @@
 from kss.zope.ttwapi import renderKSSCommands
 from kss.zope.ttwapi import retrieveView
 
+# Pyflakes
+KSSView
+IKSSView
+force_unicode
+startKSSCommands
+getKSSCommandSet
+renderKSSCommands
+retrieveView