reorder tests

1 files changed, 36 insertions, 35 deletions

diff --git a/pyramid/tests/test_traversal.py b/pyramid/tests/test_traversal.py
index 8261ad7d9..8e0bb2494 100644
--- a/pyramid/tests/test_traversal.py
+++ b/pyramid/tests/test_traversal.py
@@ -878,6 +878,7 @@ class ResourceURLTests(unittest.TestCase):
         reg.registerAdapter(traverser, (Interface,), ITraverser)
 
     def test_class_conforms_to_IContextURL(self):
+        # bw compat
         from zope.interface.verify import verifyClass
         verifyClass(IContextURL, self._getTargetClass())
 
@@ -975,39 +976,7 @@ class ResourceURLTests(unittest.TestCase):
         result = context_url()
         self.assertEqual(result, 'http://example.com:5432/one/two/')
 
-    def test_virtual_root_no_virtual_root_path(self):
-        root = DummyContext()
-        root.__name__ = None
-        root.__parent__ = None
-        one = DummyContext()
-        one.__name__ = 'one'
-        one.__parent__ = root
-        request = DummyRequest()
-        context_url = self._makeOne(one, request)
-        self.assertEqual(context_url.virtual_root(), root)
-
-    def test_virtual_root_no_virtual_root_path_with_root_on_request(self):
-        context = DummyContext()
-        context.__parent__ = None
-        request = DummyRequest()
-        request.root = DummyContext()
-        context_url = self._makeOne(context, request)
-        self.assertEqual(context_url.virtual_root(), request.root)
-
-    def test_virtual_root_with_virtual_root_path(self):
-        from pyramid.interfaces import VH_ROOT_KEY
-        context = DummyContext()
-        context.__parent__ = None
-        traversed_to = DummyContext()
-        environ = {VH_ROOT_KEY:'/one'}
-        request = DummyRequest(environ)
-        traverser = make_traverser({'context':traversed_to, 'view_name':''})
-        self._registerTraverser(traverser)
-        context_url = self._makeOne(context, request)
-        self.assertEqual(context_url.virtual_root(), traversed_to)
-        self.assertEqual(context.request.environ['PATH_INFO'], '/one')
-
-    def test_empty_names_not_ignored(self):
+    def test_call_empty_names_not_ignored(self):
         bar = DummyContext()
         empty = DummyContext(bar)
         root = DummyContext(empty)
@@ -1022,7 +991,7 @@ class ResourceURLTests(unittest.TestCase):
         result = context_url()
         self.assertEqual(result, 'http://example.com:5432//bar/')
 
-    def test_local_url_returns_None(self):
+    def test_call_local_url_returns_None(self):
         resource = DummyContext()
         def resource_url(request, info):
             self.assertEqual(info['virtual_path'], '/')
@@ -1034,7 +1003,7 @@ class ResourceURLTests(unittest.TestCase):
         result = context_url()
         self.assertEqual(result, 'http://example.com:5432/')
         
-    def test_local_url_returns_url(self):
+    def test_call_local_url_returns_url(self):
         resource = DummyContext()
         def resource_url(request, info):
             self.assertEqual(info['virtual_path'], '/')
@@ -1046,6 +1015,38 @@ class ResourceURLTests(unittest.TestCase):
         result = context_url()
         self.assertEqual(result, 'abc')
 
+    def test_virtual_root_no_virtual_root_path(self):
+        root = DummyContext()
+        root.__name__ = None
+        root.__parent__ = None
+        one = DummyContext()
+        one.__name__ = 'one'
+        one.__parent__ = root
+        request = DummyRequest()
+        context_url = self._makeOne(one, request)
+        self.assertEqual(context_url.virtual_root(), root)
+
+    def test_virtual_root_no_virtual_root_path_with_root_on_request(self):
+        context = DummyContext()
+        context.__parent__ = None
+        request = DummyRequest()
+        request.root = DummyContext()
+        context_url = self._makeOne(context, request)
+        self.assertEqual(context_url.virtual_root(), request.root)
+
+    def test_virtual_root_with_virtual_root_path(self):
+        from pyramid.interfaces import VH_ROOT_KEY
+        context = DummyContext()
+        context.__parent__ = None
+        traversed_to = DummyContext()
+        environ = {VH_ROOT_KEY:'/one'}
+        request = DummyRequest(environ)
+        traverser = make_traverser({'context':traversed_to, 'view_name':''})
+        self._registerTraverser(traverser)
+        context_url = self._makeOne(context, request)
+        self.assertEqual(context_url.virtual_root(), traversed_to)
+        self.assertEqual(context.request.environ['PATH_INFO'], '/one')
+
     def test_IResourceURL_attributes_with_vroot(self):
         from pyramid.interfaces import VH_ROOT_KEY
         root = DummyContext()