[Checkins] SVN: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/ Fix tests to reflect new location of ftest stuff.

[Uli Fouquet]

Log message for revision 87732:
  Fix tests to reflect new location of ftest stuff.

Changed:
  U   z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/functional/functionaldoctestsetup.txt
  U   z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testgetter.txt
  U   z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testrunner.txt

-=-
Modified: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/functional/functionaldoctestsetup.txt
===================================================================
--- z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/functional/functionaldoctestsetup.txt	2008-06-24 23:15:53 UTC (rev 87731)
+++ z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/functional/functionaldoctestsetup.txt	2008-06-24 23:16:43 UTC (rev 87732)
@@ -55,7 +55,7 @@
    >>> from z3c.testsetup import FunctionalDocTestSetup
    >>> setup = FunctionalDocTestSetup('z3c.testsetup.tests.cave')
    >>> setup
-   <z3c.testsetup.doctesting.FunctionalDocTestSetup object at 0x...>
+   <z3c.testsetup....doctesting.FunctionalDocTestSetup object at 0x...>
 
 Apparently the package to handle was passed as a string in 'dotted
 name' notation. We could also pass the package itself, if it was
@@ -64,7 +64,7 @@
    >>> from z3c.testsetup.tests import cave
    >>> setup = FunctionalDocTestSetup(cave)
    >>> setup
-   <z3c.testsetup.doctesting.FunctionalDocTestSetup object at 0x...>   
+   <z3c.testsetup....doctesting.FunctionalDocTestSetup object at 0x...>   
 
 This setup is ready for use::
 
@@ -145,7 +145,7 @@
   
      >>> setup.setUp
      <bound method FunctionalDocTestSetup.setUp of
-      <z3c.testsetup.doctesting.FunctionalDocTestSetup object at 0x...>>
+      <z3c.testsetup....doctesting.FunctionalDocTestSetup object at 0x...>>
 
 * The setup-instance's `globs` attribute is passed as the `globs`
   parameter. By default `globs` is a dictionary of functions, that
@@ -409,7 +409,7 @@
 
        >>> setup = FunctionalDocTestSetup(cave)
        >>> pnorm(setup.layer.config_file)
-       '...z3c/testsetup/ftesting.zcml'
+       '...z3c/testsetup/functional/ftesting.zcml'
 
     Now the fallback `ftesting.zcml` was taken, because the cave got
     no own ftesting.zcml.
@@ -476,7 +476,7 @@
    ...     zcml_config = 'sampleftesting.zcml',
    ...     layer = mylayer)
    >>> pnorm(setup_w_custom_layer.layer.config_file)
-   '.../testsetup/ftesting.zcml'
+   '.../testsetup/functional/ftesting.zcml'
 
 As we can see, the `mylayer` config file is registered and the
 `zcml_config` parameter was skipped.

Modified: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testgetter.txt
===================================================================
--- z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testgetter.txt	2008-06-24 23:15:53 UTC (rev 87731)
+++ z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testgetter.txt	2008-06-24 23:16:43 UTC (rev 87732)
@@ -56,7 +56,7 @@
    >>> from z3c.testsetup import TestCollector
    >>> collector = TestCollector('z3c.testsetup.tests.cave')
    >>> collector
-   <z3c.testsetup.testgetter.TestCollector object at 0x...>
+   <z3c.testsetup.functional.testgetter.TestCollector object at 0x...>
 
 A main difference of TestGetters and TestCollectors to ordinary
 TestSetups is the set of supported/accepted keyword parameters: it
@@ -98,7 +98,7 @@
 TestCollector now registers three TestGetters. This is stored in the
 ``handled_getters`` attribute of TestCollectors::
 
-   >>> from z3c.testsetup.testgetter import TestCollector
+   >>> from z3c.testsetup.functional.testgetter import TestCollector
    >>> getter_classes = TestCollector.handled_getters
    >>> getter_classes
    [<class '....FunctionalDocTestGetter'>,
@@ -210,7 +210,7 @@
 distinguish parameters specifically passed for your wrapper from
 others. Let's create a TestGetter for functional doctest files::
 
-   >>> from z3c.testsetup.doctesting import FunctionalDocTestSetup
+   >>> from z3c.testsetup.functional.doctesting import FunctionalDocTestSetup
    >>> class CustomGetter(BasicTestGetter):
    ...     wrapped_class = FunctionalDocTestSetup
    ...     special_char = 'c'
@@ -427,7 +427,7 @@
    >>> from z3c.testsetup import TestCollector
    >>> collector = TestCollector('z3c.testsetup.tests.cave')
    >>> collector
-   <z3c.testsetup.testgetter.TestCollector object at 0x...>
+   <z3c.testsetup.functional.testgetter.TestCollector object at 0x...>
 
 The package can passed as string in 'dotted name' notation or as real
 package::
@@ -435,7 +435,7 @@
    >>> from z3c.testsetup.tests import cave
    >>> collector = TestCollector(cave)
    >>> collector
-   <z3c.testsetup.testgetter.TestCollector object at 0x...>
+   <z3c.testsetup.functional.testgetter.TestCollector object at 0x...>
 
 If we call that getter, we should get a ``unittest.TestSuite``::
 

Modified: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testrunner.txt
===================================================================
--- z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testrunner.txt	2008-06-24 23:15:53 UTC (rev 87731)
+++ z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/testrunner.txt	2008-06-24 23:16:43 UTC (rev 87732)
@@ -34,11 +34,11 @@
     >>> testrunner.run(defaults)
     Running unit tests:
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     Total: 4 tests, 0 failures, 0 errors in ... seconds.
     False
 
@@ -68,11 +68,11 @@
     >>> testrunner.run(defaults)
     Running unit tests:
       Ran 1 tests with 0 failures and 0 errors in ... seconds.
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     Total: 3 tests, 0 failures, 0 errors in ... seconds.
     False
 
@@ -100,11 +100,11 @@
     >>> testrunner.run(defaults)
     Running unit tests:
       Ran 1 tests with 0 failures and 0 errors in ... seconds.
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     Total: 3 tests, 0 failures, 0 errors in ... seconds.
     False
 
@@ -231,11 +231,11 @@
     ...     ]
     >>> sys.argv = 'test -f '.split()
     >>> testrunner.run(defaults)
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     False
 
 The same setup, but without a modified checker will deliver::
@@ -246,8 +246,8 @@
     ...     ]
     >>> sys.argv = 'test -f '.split()
     >>> testrunner.run(defaults)
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
     <BLANKLINE>
     <BLANKLINE>
     Failure in test ...checkertest.chk
@@ -271,7 +271,7 @@
     <BLANKLINE>
       Ran 2 tests with 1 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     True
 
 Note that checkers are currently only supported for functional
@@ -324,11 +324,11 @@
     ...     ]
     >>> sys.argv = 'test -f '.split()
     >>> testrunner.run(defaults)
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 1 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     False
 
 The testrunner finished without any error. So the ``basename``
@@ -356,7 +356,7 @@
     ...     ]
     >>> sys.argv = 'test -f '.split()
     >>> testrunner.run(defaults)
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
     ...
       Ran 1 tests with 0 failures and 0 errors in ... seconds.
     ...
@@ -434,11 +434,11 @@
     >>> testrunner.run(defaults)
     Running unit tests:
       Ran 1 tests with 0 failures and 0 errors in ... seconds.
-    Running z3c.testsetup.doctesting.FunctionalLayer tests:
-      Set up z3c.testsetup.doctesting.FunctionalLayer in ... seconds.
+    Running z3c.testsetup....doctesting.FunctionalLayer tests:
+      Set up z3c.testsetup....doctesting.FunctionalLayer in ... seconds.
       Ran 2 tests with 0 failures and 0 errors in ... seconds.
     Tearing down left over layers:
-      Tear down z3c.testsetup.doctesting.FunctionalLayer ... not supported
+      Tear down z3c.testsetup....doctesting.FunctionalLayer ... not supported
     Total: 3 tests, 0 failures, 0 errors in ... seconds.
     False