[Zope3-checkins] SVN: zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/ add layer support tests

[Godefroid Chapelle]

Log message for revision 120941:
  add layer support tests
  
  1 failing test
  

Changed:
  A   zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/layerutils.py
  U   zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/runner.py
  U   zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/tests.py

-=-
Added: zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/layerutils.py
===================================================================
--- zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/layerutils.py	                        (rev 0)
+++ zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/layerutils.py	2011-03-15 14:29:49 UTC (rev 120941)
@@ -0,0 +1,117 @@
+from zope.testing.testrunner.find import name_from_layer
+
+
+def order_by_bases(layers):
+    """Order the layers from least to most specific (bottom to top)
+ 
+    >>> class TestLayer(object):
+    ...    def __init__(self, bases, name):
+    ...        self.__bases__ = bases
+    ...        self.__name__ = name
+    ...    def __repr__(self):
+    ...        return self.__name__
+
+    A layer without any base:
+
+    >>> zero = TestLayer(bases=(), name='zero') 
+
+    A layer with a single base:
+
+    >>> one = TestLayer(bases=(zero, ), name='one')
+
+    Less specific comes first:
+
+    >>> order_by_bases([one, zero])
+    [zero, one]
+    >>> order_by_bases([zero, one])
+    [zero, one]
+
+
+    Another layer with a single base:
+
+    >>> one_bis = TestLayer(bases=(zero, ), name='one_bis')
+
+    Less specific comes first:
+
+    >>> order_by_bases([one, zero, one_bis])
+    [zero, one, one_bis]
+
+    Order of layers of identical specificity does not depend
+    on their order in the input:
+
+    >>> order_by_bases([one_bis, zero, one])
+    [zero, one, one_bis]
+    >>> order_by_bases([one_bis, one, zero])
+    [zero, one, one_bis]
+    >>> order_by_bases([zero, one_bis, one])
+    [zero, one, one_bis]
+
+    Another layer with a single base:
+
+    >>> one_ter = TestLayer(bases=(zero, ), name='one_ter')
+
+    Less specific still comes first:
+
+    >>> order_by_bases([one_bis, one_ter, one, zero])
+    [zero, one, one_bis, one_ter]
+
+    Order of layers of identical specificity does still not depend
+    on their order in the input:
+
+    >>> order_by_bases([one_ter, one_bis, one, zero])
+    [zero, one, one_bis, one_ter]
+    >>> order_by_bases([zero, one_ter, one_bis, one])
+    [zero, one, one_bis, one_ter]
+
+    A layer with two bases of different specificity:
+
+    >>> two = TestLayer(bases=(zero, one), name='two')
+
+    Ordered by inverse specificity:
+
+    >>> order_by_bases([two, one, zero])
+    [zero, one, two]
+    >>> order_by_bases([zero, two, one])
+    [zero, one, two]
+    >>> order_by_bases([two, zero, one])
+    [zero, one, two]
+
+    Another layer with two bases of different specificity:
+
+    >>> two_bis = TestLayer(bases=(zero, one_bis), name='two_bis')
+
+    >>> order_by_bases([two, two_bis, one, zero])
+    [zero, one, two, two_bis]
+    >>> order_by_bases([two_bis, two, one, zero])
+    [zero, one, two, two_bis]
+
+    >>> order_by_bases([one_bis, two_bis, two, one, zero])
+    [zero, one, one_bis, two, two_bis]
+
+    >>> three = TestLayer(bases=(one_bis, two), name='three')
+
+    >>> order_by_bases([one_bis, two_bis, three, two, one, zero])
+    [zero, one, one_bis, two, two_bis, three]
+    """
+    named_layers = [(name_from_layer(layer), layer) for layer in layers]
+    named_layers.sort()
+    named_layers.reverse()
+    gathered = []
+    for name, layer in named_layers:
+        gather_layers(layer, gathered)
+    gathered.reverse()
+    seen = {}
+    result = []
+    for layer in gathered:
+        if layer not in seen:
+            seen[layer] = 1
+            if layer in layers:
+                result.append(layer)
+    return result
+
+
+def gather_layers(layer, result):
+    if layer is not object:
+        result.append(layer)
+    for b in layer.__bases__:
+        gather_layers(b, result)

Modified: zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/runner.py
===================================================================
--- zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/runner.py	2011-03-15 14:25:30 UTC (rev 120940)
+++ zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/runner.py	2011-03-15 14:29:49 UTC (rev 120941)
@@ -29,6 +29,7 @@
 import traceback
 import unittest
 
+from zope.testing.testrunner.layerutils import order_by_bases, gather_layers
 from zope.testing.testrunner.find import import_name
 from zope.testing.testrunner.find import name_from_layer, _layer_name_cache
 from zope.testing.testrunner.refcount import TrackRefs
@@ -777,33 +778,6 @@
                              % (module_name, module_layer_name))
 
 
-def order_by_bases(layers):
-    """Order the layers from least to most specific (bottom to top)
-    """
-    named_layers = [(name_from_layer(layer), layer) for layer in layers]
-    named_layers.sort()
-    named_layers.reverse()
-    gathered = []
-    for name, layer in named_layers:
-        gather_layers(layer, gathered)
-    gathered.reverse()
-    seen = {}
-    result = []
-    for layer in gathered:
-        if layer not in seen:
-            seen[layer] = 1
-            if layer in layers:
-                result.append(layer)
-    return result
-
-
-def gather_layers(layer, result):
-    if layer is not object:
-        result.append(layer)
-    for b in layer.__bases__:
-        gather_layers(b, result)
-
-
 class FakeInputContinueGenerator:
 
     def readline(self):

Modified: zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/tests.py
===================================================================
--- zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/tests.py	2011-03-15 14:25:30 UTC (rev 120940)
+++ zope.testing/branches/gotcha-test-layers/src/zope/testing/testrunner/tests.py	2011-03-15 14:29:49 UTC (rev 120941)
@@ -194,6 +194,7 @@
             optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE),
         doctest.DocTestSuite('zope.testing.testrunner.options'),
         doctest.DocTestSuite('zope.testing.testrunner.find'),
+        doctest.DocTestSuite('zope.testing.testrunner.layerutils'),
         ]
 
     if sys.platform == 'win32':