[Checkins] SVN: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ Working up tests

[Darryl Cousins]

Log message for revision 78073:
  Working up tests

Changed:
  U   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/README.txt
  U   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/ftesting.zcml
  D   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_all.py
  A   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_functional.py
  A   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/tests.py
  A   Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/viewlet.txt

-=-
Modified: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/README.txt
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/README.txt	2007-07-17 13:07:33 UTC (rev 78072)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/README.txt	2007-07-17 13:22:48 UTC (rev 78073)
@@ -106,6 +106,6 @@
 Tests
 -----
 
-See test directory.
+Please see test directory and viewlet.txt.
 
 

Modified: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/ftesting.zcml	2007-07-17 13:07:33 UTC (rev 78072)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/ftesting.zcml	2007-07-17 13:22:48 UTC (rev 78073)
@@ -10,9 +10,7 @@
   <include package="mars.view" file="meta.zcml" />
   <include package="mars.viewlet" file="meta.zcml" />
 
-  <include package="z3c.layer.minimal.tests" file="ftesting.zcml" />
 
-  <include package="zope.contentprovider" />
   <include package="grok" />
 
 </configure>

Deleted: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_all.py
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_all.py	2007-07-17 13:07:33 UTC (rev 78072)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_all.py	2007-07-17 13:22:48 UTC (rev 78073)
@@ -1,22 +0,0 @@
-import unittest
-from pkg_resources import resource_listdir
-
-from grok.ftests.test_grok_functional import FunctionalDocTestSuite
-
-from zope.app.testing import functional
-functional.defineLayer('TestLayer', 'ftesting.zcml')
-
-def test_suite():
-    suite = unittest.TestSuite()
-    dottedname = 'mars.viewlet.tests.%s'
-    for name in ['viewlet']:
-        test = FunctionalDocTestSuite(dottedname % name)
-        test.layer = TestLayer
-        suite.addTest(test)
-
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

Added: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_functional.py	                        (rev 0)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_functional.py	2007-07-17 13:22:48 UTC (rev 78073)
@@ -0,0 +1,34 @@
+import unittest
+from zope.testing import doctest
+
+from zope.app.testing.functional import FunctionalTestSetup, getRootFolder
+from zope.app.testing import functional
+functional.defineLayer('TestLayer', 'ftesting.zcml')
+
+globs = dict(getRootFolder=getRootFolder)
+optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
+
+def setUp(test):
+    FunctionalTestSetup().setUp()
+    # register provider TALES
+    from zope.app.pagetemplate import metaconfigure
+    from zope.contentprovider import tales
+    metaconfigure.registerType('provider', tales.TALESProviderExpression)
+
+
+def tearDown(test):
+    FunctionalTestSetup().tearDown()
+
+def test_suite():
+    suite = unittest.TestSuite()
+    dottedname = 'mars.viewlet.ftests.viewlet'
+    test = doctest.DocTestSuite(
+                dottedname, setUp=setUp, globs=globs,
+                tearDown=tearDown, optionflags=optionflags)
+    test.layer = TestLayer
+    suite.addTest(test)
+    return suite
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+


Property changes on: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/ftests/test_functional.py
___________________________________________________________________
Name: svn:keywords
   + Id

Added: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/tests.py	                        (rev 0)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/tests.py	2007-07-17 13:22:48 UTC (rev 78073)
@@ -0,0 +1,40 @@
+import unittest
+from zope.testing import doctest
+
+import zope.interface
+
+from martian.interfaces import IModuleInfo
+
+class ModuleInfo(object):
+    zope.interface.implements(IModuleInfo)
+    path = ''
+    package_dotted_name = ''
+
+    def getAnnotation(self, name, default):
+        return default
+
+globs = dict(module_info=ModuleInfo())
+
+optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
+
+def setUp(test):
+    # register provider TALES
+    from zope.app.pagetemplate import metaconfigure
+    from zope.contentprovider import tales
+    metaconfigure.registerType('provider', tales.TALESProviderExpression)
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTests([doctest.DocFileSuite('viewlet.txt',
+                             setUp=setUp, globs=globs,
+                             optionflags=optionflags),
+                   ])
+
+    return suite
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+
+
+


Property changes on: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/tests.py
___________________________________________________________________
Name: svn:keywords
   + Id

Added: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/viewlet.txt
===================================================================
--- Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/viewlet.txt	                        (rev 0)
+++ Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/viewlet.txt	2007-07-17 13:22:48 UTC (rev 78073)
@@ -0,0 +1,5 @@
+============
+Mars Viewlet
+============
+
+


Property changes on: Sandbox/darrylcousins/mars.viewlet/src/mars/viewlet/viewlet.txt
___________________________________________________________________
Name: svn:keywords
   + Date Author