[KSS-checkins] r35657 - kukit/kss.demo/trunk/tests

[reebalazs at codespeak.net]

Author: reebalazs
Date: Tue Dec 12 21:44:50 2006
New Revision: 35657

Modified:
   kukit/kss.demo/trunk/tests/test_azaxview.py
Log:
Fix tests

Modified: kukit/kss.demo/trunk/tests/test_azaxview.py
==============================================================================
--- kukit/kss.demo/trunk/tests/test_azaxview.py	(original)
+++ kukit/kss.demo/trunk/tests/test_azaxview.py	Tue Dec 12 21:44:50 2006
@@ -21,29 +21,27 @@
 import unittest, os
 from zope.testing import doctest
 from Testing.ZopeTestCase import ZopeTestCase
-from kss.core.tests.base import AzaxViewTestCase, FakeContent, \
-                           TestRequest, DebugTestRequest
+from kss.core.tests.base import AzaxViewTestCase
 from kss.demo.azaxview import AzaxView
 from Products.Five.zcml import load_string, load_config
 import kss.demo
 
+try:
+    import Products.Five
+except AttributeError:
+    from kss.demo.simplecontent_z3 import SimpleContent
+else:
+    from kss.demo.simplecontent import SimpleContent
+
 class AzaxDemoTestCase(AzaxViewTestCase):
     
     def afterSetUp(self):
         AzaxViewTestCase.afterSetUp(self)
         load_config('meta.zcml', package=kss.demo)
         load_config('configure.zcml', package=kss.demo)
-        # fake content
-        # XXX This is a holy mess. Go go macro adapters!
-        fakecontent = FakeContent()
-        self.folder._delObject('ob')
-        self.folder._setObject('ob', fakecontent)
-        fakecontent = fakecontent.__of__(self.folder)
-        # Set up a fake view (with no content)
-        # XXX commands will be rendered as data structures,
-        # because we use DebugTestRequest instead of TestRequest.
-        fakedebugrequest = DebugTestRequest()
-        self.view = AzaxView(fakecontent, fakedebugrequest)
+        self.setDebugRequest()
+        self.folder._setObject('demo', SimpleContent('Demo', 'Demo'))
+        self.view = self.folder.demo.restrictedTraverse('getDivContent')
 
     def test_instantiation(self):
         view = self.view