[Zope3-checkins] CVS: Zope3/src/zope/configuration/tests - test_xmlconfig.py:1.4

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/configuration/tests
In directory cvs.zope.org:/tmp/cvs-serv11079/src/zope/configuration/tests

Modified Files:
	test_xmlconfig.py 
Log Message:
Combined the registration of the configure directive and the includes
directives.


=== Zope3/src/zope/configuration/tests/test_xmlconfig.py 1.3 => 1.4 ===
--- Zope3/src/zope/configuration/tests/test_xmlconfig.py:1.3	Wed Jul 30 11:06:50 2003
+++ Zope3/src/zope/configuration/tests/test_xmlconfig.py	Thu Jul 31 10:57:01 2003
@@ -153,7 +153,7 @@
 
     >>> file = open(path("samplepackage", "configure.zcml"))
     >>> context = config.ConfigurationMachine()
-    >>> xmlconfig._registerIncludes(context)
+    >>> xmlconfig.registerCommonDirectives(context)
     >>> xmlconfig.processxmlfile(file, context)
 
     >>> foo.data
@@ -203,7 +203,7 @@
 def test_include_by_package():
     """
     >>> context = config.ConfigurationMachine()
-    >>> xmlconfig._registerIncludes(context)
+    >>> xmlconfig.registerCommonDirectives(context)
     >>> import zope.configuration.tests.samplepackage as package
     >>> xmlconfig.include(context, 'configure.zcml', package)
     >>> context.execute_actions()
@@ -234,7 +234,7 @@
 def test_include_by_file():
     """
     >>> context = config.ConfigurationMachine()
-    >>> xmlconfig._registerIncludes(context)
+    >>> xmlconfig.registerCommonDirectives(context)
     >>> here = os.path.split(__file__)[0]
     >>> path = os.path.join(here, "samplepackage", "foo.zcml")
     >>> xmlconfig.include(context, path)
@@ -302,7 +302,7 @@
     Let's see what happens when we try to process bar.zcml.
 
     >>> context = config.ConfigurationMachine()
-    >>> xmlconfig._registerIncludes(context)
+    >>> xmlconfig.registerCommonDirectives(context)
     
     >>> here = os.path.split(__file__)[0]
     >>> path = os.path.join(here, "samplepackage", "bar.zcml")
@@ -368,7 +368,7 @@
     baro.zcml which includes bar2.zcml as overrides.
 
     >>> context = config.ConfigurationMachine()
-    >>> xmlconfig._registerIncludes(context)
+    >>> xmlconfig.registerCommonDirectives(context)
     >>> path = os.path.join(here, "samplepackage", "baro.zcml")
     >>> xmlconfig.include(context, path)