[Zope3-checkins] CVS: zopeproducts/zwiki/tests - test_wiki.py:1.2 test_wikipage.py:1.2 test_wikipagehierarchy.py:1.2

[Stephan Richter]

Update of /cvs-repository/zopeproducts/zwiki/tests
In directory cvs.zope.org:/tmp/cvs-serv27459/tests

Modified Files:
	test_wiki.py test_wikipage.py test_wikipagehierarchy.py 
Log Message:
I did it again...checked in pyc files.

Also fixed some tests, except the last one, which is very odd, since it 
should work. It seems that annotations are not daved correctly.


=== zopeproducts/zwiki/tests/test_wiki.py 1.1 => 1.2 ===
--- zopeproducts/zwiki/tests/test_wiki.py:1.1	Sat Apr  5 15:50:04 2003
+++ zopeproducts/zwiki/tests/test_wiki.py	Sat Apr  5 16:38:11 2003
@@ -15,18 +15,30 @@
 
 $Id$
 """
-from zope.app.container.tests.test_icontainer import BaseTestIContainer
-from zopeproducts.zwiki.zwiki import ZWiki
+import unittest
 
+from zope.app.container.tests.test_icontainer import \
+     BaseTestIContainer, DefaultTestData
+from zopeproducts.zwiki.zwiki import Wiki
+from zopeproducts.zwiki.interfaces import IWiki
 
-class Test(BaseTestIContainer):
+
+class Test(BaseTestIContainer, unittest.TestCase):
 
     def makeTestObject(self):
-        return ZWiki()
+        return Wiki()
+
+    def makeTestData(self):
+        return DefaultTestData()
 
+    def test_interface(self):
+        self.assert_(IWiki.isImplementedBy(self.makeTestObject()))
 
 def test_suite():
-    return TestSuite((
-        makeSuite(Test),
+    return unittest.TestSuite((
+        unittest.makeSuite(Test),
         ))
 
+
+if __name__ == '__main__':
+    unittest.main()


=== zopeproducts/zwiki/tests/test_wikipage.py 1.1 => 1.2 ===
--- zopeproducts/zwiki/tests/test_wikipage.py:1.1	Sat Apr  5 15:50:04 2003
+++ zopeproducts/zwiki/tests/test_wikipage.py	Sat Apr  5 16:38:11 2003
@@ -15,13 +15,16 @@
 
 $Id$
 """
-from zopeproducts.zwiki.zwiki import ZWikiPage
+import unittest
 
+from zopeproducts.zwiki.zwiki import WikiPage
+from zopeproducts.zwiki.interfaces import IWikiPage
 
-class Test(BaseTestIContainer):
+
+class Test(unittest.TestCase):
 
     def makeTestObject(self):
-        return ZWikiPage()
+        return WikiPage()
 
     def test_Interface(self):
         page = self.makeTestObject()
@@ -59,3 +62,5 @@
         makeSuite(Test),
         ))
 
+if __name__ == '__main__':
+    unittest.main()


=== zopeproducts/zwiki/tests/test_wikipagehierarchy.py 1.1 => 1.2 ===
--- zopeproducts/zwiki/tests/test_wikipagehierarchy.py:1.1	Sat Apr  5 15:50:04 2003
+++ zopeproducts/zwiki/tests/test_wikipagehierarchy.py	Sat Apr  5 16:38:11 2003
@@ -15,13 +15,33 @@
 
 $Id$
 """
-from zopeproducts.zwiki.zwiki import ZWikiPage, ZWikiPageHierarchy
+import unittest
 
+from zopeproducts.zwiki.interfaces import IWikiPage, IWikiPageHierarchy
+from zopeproducts.zwiki.zwiki import WikiPage, WikiPageHierarchyAdapter
+from zope.component.tests.placelesssetup import PlacelessSetup
+from zope.component.adapter import provideAdapter
 
-class Test(BaseTestIContainer):
+from zope.app.interfaces.annotation import IAnnotations, IAttributeAnnotatable
+from zope.app.attributeannotations import AttributeAnnotations
+
+
+class TestAnnotations(dict):
+    __implements__ = IAnnotations
+
+
+class Test(PlacelessSetup, unittest.TestCase):
+
+    def setUp(self):
+        PlacelessSetup.setUp(self)
+        WikiPage.__implements__ = (WikiPage.__implements__,
+                                   IAttributeAnnotatable) 
+        provideAdapter(IAttributeAnnotatable, IAnnotations,
+                       AttributeAnnotations)
+        self.page = WikiPage()
 
     def makeTestObject(self):
-        return ZWikiPageHierarchy(ZWikiPage())
+        return WikiPageHierarchyAdapter(self.page)
 
     def test_Interface(self):
         hier = self.makeTestObject()
@@ -32,6 +52,9 @@
         self.assertEqual([], hier.parents)
         hier.parents = ['foo']
         self.assertEqual(['foo'], hier.parents)
+        # Test whether the annotations stay.
+        hier = self.makeTestObject()
+        self.assertEqual(['foo'], hier.parents)
 
     def test_reparent(self):
         hier = self.makeTestObject()
@@ -42,7 +65,9 @@
 
 
 def test_suite():
-    return TestSuite((
-        makeSuite(Test),
+    return unittest.TestSuite((
+        unittest.makeSuite(Test),
         ))
 
+if __name__ == '__main__':
+    unittest.main()