[Checkins] SVN: z3c.rotterdam/trunk/ - Updated tests to run with ZTK 1.0.

[Michael Howitz]

Log message for revision 117311:
  - Updated tests to run with ZTK 1.0.
  
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  - Using ``z3c.layer.pagelet`` instead of deprecated ``z3c.layer``.
  

Changed:
  _U  z3c.rotterdam/trunk/
  U   z3c.rotterdam/trunk/buildout.cfg
  U   z3c.rotterdam/trunk/docs/HISTORY.txt
  U   z3c.rotterdam/trunk/setup.py
  U   z3c.rotterdam/trunk/z3c/rotterdam/dependencies.zcml
  U   z3c.rotterdam/trunk/z3c/rotterdam/ftesting.zcml
  U   z3c.rotterdam/trunk/z3c/rotterdam/tests.py

-=-

Property changes on: z3c.rotterdam/trunk
___________________________________________________________________
Added: svn:ignore
   + .installed.cfg
bin
develop-eggs
parts


Modified: z3c.rotterdam/trunk/buildout.cfg
===================================================================
--- z3c.rotterdam/trunk/buildout.cfg	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/buildout.cfg	2010-10-07 06:38:32 UTC (rev 117311)
@@ -1,7 +1,6 @@
 [buildout]
 develop = .
-parts = test 
-index = http://download.zope.org/zope3.4
+parts = test
 
 [test]
 recipe = zc.recipe.testrunner

Modified: z3c.rotterdam/trunk/docs/HISTORY.txt
===================================================================
--- z3c.rotterdam/trunk/docs/HISTORY.txt	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/docs/HISTORY.txt	2010-10-07 06:38:32 UTC (rev 117311)
@@ -1,8 +1,26 @@
 Changelog
 =========
 
-1.0.1dev - Unreleased
----------------------
+1.0.3 (unreleased)
+------------------
 
+- Updated tests to run with ZTK 1.0.
+
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+- Using ``z3c.layer.pagelet`` instead of deprecated ``z3c.layer``.
+
+
+
+1.0.2 (2008-10-21)
+------------------
+
+* Changes not recorded.
+
+
+1.0.1 (2008-10-21)
+------------------
+
 * Initial release
 

Modified: z3c.rotterdam/trunk/setup.py
===================================================================
--- z3c.rotterdam/trunk/setup.py	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/setup.py	2010-10-07 06:38:32 UTC (rev 117311)
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.0.2'
+version = '1.0.3dev'
 
 setup(name='z3c.rotterdam',
       version=version,
@@ -31,29 +31,27 @@
       install_requires=[
           'setuptools',
           # -*- Extra requirements: -*-
-          'zope.app.rotterdam',
-          'z3c.pagelet',
-          'z3c.formui',
-          'z3c.layer',
+          'jquery.javascript',
           'jquery.layer',
-          'z3c.template',
-          'zope.viewlet',
-          'z3c.viewlet',
           'z3c.form',
           'z3c.formjs',
+          'z3c.formui',
+          'z3c.layer.pagelet',
+          'z3c.pagelet',
+          'z3c.template',
+          'z3c.viewlet',
           'z3c.zrtresource',
-          'jquery.javascript',
-          'jquery.layer',
-
+          'zope.app.rotterdam',
+          'zope.viewlet',
       ],
       extras_require = dict(
             test = [
-                'zope.app.testing',
-                'zope.testbrowser',
                 'zope.app.dtmlpage',
                 'zope.app.onlinehelp',
                 'zope.app.securitypolicy',
-                'zope.app.zcmlfiles'
+                'zope.app.testing',
+                'zope.app.zcmlfiles',
+                'zope.testbrowser',
           ]
       ),
       entry_points="""

Modified: z3c.rotterdam/trunk/z3c/rotterdam/dependencies.zcml
===================================================================
--- z3c.rotterdam/trunk/z3c/rotterdam/dependencies.zcml	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/z3c/rotterdam/dependencies.zcml	2010-10-07 06:38:32 UTC (rev 117311)
@@ -10,6 +10,7 @@
     xmlns:meta="http://namespaces.zope.org/meta"
     >
 
+
   <!-- Include the Rotterdam Skin and its dependencies -->
   <include package="zope.app.rotterdam" />
 
@@ -23,6 +24,7 @@
 
   <include package="zope.contentprovider"/>
   <include package="z3c.pagelet" />
+  <include package="z3c.macro" />
   <include package="z3c.formui" />
   <include package="z3c.form" />
   <include package="jquery.layer" />

Modified: z3c.rotterdam/trunk/z3c/rotterdam/ftesting.zcml
===================================================================
--- z3c.rotterdam/trunk/z3c/rotterdam/ftesting.zcml	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/z3c/rotterdam/ftesting.zcml	2010-10-07 06:38:32 UTC (rev 117311)
@@ -10,7 +10,7 @@
   <!-- used for functional testing setup -->
 
   <include package="zope.app.onlinehelp" file="meta.zcml"/>
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="zope.viewlet" file="meta.zcml" />
 
   <include package="zope.app.zcmlfiles" />
@@ -18,10 +18,12 @@
   <include package="zope.app.authentication" />
   <include package="zope.contentprovider" />
   <include package="zope.app.dtmlpage" />
+  <include package="zope.login" />
 
+
   <include package="z3c.rotterdam" />
 
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
 
   <z3c:pagelet
       name="demo.html"
@@ -77,8 +79,6 @@
 
   <grantAll role="zope.Manager" />
 
-  <include package="zope.app.securitypolicy.tests" file="functional.zcml" />
-
   <!-- Principal that tests generally run as -->
   <principal
       id="zope.mgr"
@@ -86,13 +86,6 @@
       login="mgr"
       password="mgrpw" />
 
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
-  <grant role="zope.Manager" principal="zope.globalmgr" />
-
 </configure>

Modified: z3c.rotterdam/trunk/z3c/rotterdam/tests.py
===================================================================
--- z3c.rotterdam/trunk/z3c/rotterdam/tests.py	2010-10-07 06:07:56 UTC (rev 117310)
+++ z3c.rotterdam/trunk/z3c/rotterdam/tests.py	2010-10-07 06:38:32 UTC (rev 117311)
@@ -15,11 +15,11 @@
 
 $Id$
 """
+from z3c.rotterdam.testing import RotterdamLayer
+from zope.app.testing.functional import FunctionalDocFileSuite
+import doctest
 import unittest
 
-from zope.testing import doctest
-from zope.app.testing.functional import FunctionalDocFileSuite
-from z3c.rotterdam.testing import RotterdamLayer
 
 def test_suite():
     rotterdam_doctest = FunctionalDocFileSuite(
@@ -29,6 +29,3 @@
     return unittest.TestSuite((
         rotterdam_doctest,
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')