[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI/tests - __init__.py:1.1.2.2.12.1 sampleInterfaces.py:1.1.2.3.10.1 testAddable.py:1.1.2.4.10.1 testProvideClass.py:1.1.2.5.4.1 testServiceProvideClass.py:1.1.2.5.10.1 testTabsDirective.py:1.1.2.5.10.1 testZMIViewService.py:1.1.2.4.10.1 testZMIViewUtility.py:1.1.2.6.10.1

Gary Poster garyposter@earthlink.net
Tue, 2 Apr 2002 21:13:47 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/ZMI/tests
In directory cvs.zope.org:/tmp/cvs-serv25583/lib/python/Zope/App/ZMI/tests

Modified Files:
      Tag: gary-pre_create_views-branch
	__init__.py sampleInterfaces.py testAddable.py 
	testProvideClass.py testServiceProvideClass.py 
	testTabsDirective.py testZMIViewService.py 
	testZMIViewUtility.py 
Log Message:
last commit bombed; trying again.

merged with Zope-3x branch (on my own branch; don't worry) to take advantage of Stephan's new code.  changed licenses with license utility (and thus five million commits).  Made a couple of presentational improvements.  Need to change job  board example to take advantage of this next.



=== Zope3/lib/python/Zope/App/ZMI/tests/__init__.py 1.1.2.2 => 1.1.2.2.12.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-
+# 
+##############################################################################
 """ ZMI unit tests """


=== Zope3/lib/python/Zope/App/ZMI/tests/sampleInterfaces.py 1.1.2.3 => 1.1.2.3.10.1 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/ZMI/tests/testAddable.py 1.1.2.4 => 1.1.2.4.10.1 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
+# 
 ##############################################################################
 """
 


=== Zope3/lib/python/Zope/App/ZMI/tests/testProvideClass.py 1.1.2.5 => 1.1.2.5.4.1 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
+# 
 ##############################################################################
 """ ZMI unit tests
 


=== Zope3/lib/python/Zope/App/ZMI/tests/testServiceProvideClass.py 1.1.2.5 => 1.1.2.5.10.1 ===
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
+# 
 ##############################################################################
 """ ZMI unit tests
 
@@ -36,24 +38,25 @@
         serviceName = (
             'Zope.App.ZMI.tests.testServiceProvideClass.MyAddableService')
         
-        xmlconfig( StringIO("""
+        xmlconfig( StringIO('''
         <zopeConfigure
-        xmlns='http://namespaces.zope.org/zope'
-        xmlns:service='http://namespaces.zope.org/zmi/service'>
+        xmlns="http://namespaces.zope.org/zope"
+        xmlns:service="http://namespaces.zope.org/zmi/service">
 
         <directives namespace="http://namespaces.zope.org/zmi/service">
-          <directive name="provideClass"
+          <directive name="factoryFromClass"
             attributes="name, permission_id, title, description"
-            handler="Zope.App.ZMI.provideClass.ServiceClassDir" />
+            handler="Zope.App.ZMI.metaConfigure.ServiceClassDir" />
         </directives>
 
-        <service:provideClass name="%s"
+        <service:factoryFromClass name="%s"
+                 class="%s"
                  permission_id="Zope.AddService"
                  title="Stupid Service"
                  description="This is a sample Service" />
       
         </zopeConfigure>        
-        """ % serviceName))
+        ''' %(serviceName, serviceName)))
 
         addables = ServiceAddables.getAddables(None)
         self.assertEqual(addables[0].id(), serviceName)


=== Zope3/lib/python/Zope/App/ZMI/tests/testTabsDirective.py 1.1.2.5 => 1.1.2.5.10.1 ===
+##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/ZMI/tests/testZMIViewService.py 1.1.2.4 => 1.1.2.4.10.1 ===
+##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-
 import unittest, sys
 from Interface import Interface
 


=== Zope3/lib/python/Zope/App/ZMI/tests/testZMIViewUtility.py 1.1.2.6 => 1.1.2.6.10.1 ===
+##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """