More test refactoring.

Author: Nurdok

src/tests/__init__.py

@@ -1 +0,0 @@
-__author__ = 'rachum'

src/tests/test_cases/__init__.py

@@ -1 +0,0 @@
-__author__ = 'rachum'

src/tests/test_cases/expected.py

@@ -0,0 +1,15 @@
+class Expectation(object):
+    """Hold expectation for pep257 violations in tests."""
+
+    def __init__(self):
+        self.expected = set([])
+
+    def expect(self, *args):
+        """Decorator that expects a certain PEP 257 violation."""
+        def none(_):
+            return None
+
+        if len(args) == 1:
+            return lambda f: (self.expected.add((f.__name__, args[0])) or
+                              none(f()) or f)
+        self.expected.add(args)

src/tests/test_cases/test.py

@@ -1,21 +1,11 @@
 # encoding: utf-8
 # No docstring, so we can test D100
 import sys
-import os
+from expected import Expectation
 
 
-expected = set([])
-
-
-def expect(*args):
-    """Decorator that expects a certain PEP 257 violation."""
-    def none(a):
-        return None
-
-    if len(args) == 1:
-        return lambda f: expected.add((f.__name__, args[0])) or none(f()) or f
-    expected.add(args)
-
+expectation = Expectation()
+expect = expectation.expect
 
 expect('class_', 'D101: Missing docstring in public class')
 

src/tests/test_cases/unicode_literals.py

@@ -2,7 +2,12 @@
 """This is a module."""
 
 from __future__ import unicode_literals
+from expected import Expectation
+
+
+expectation = Expectation()
+expect = expectation.expect
 
 
 def with_unicode_docstring_without_u():
-    """Check unicode: \u2611."""
+    r"""Check unicode: \u2611."""

src/tests/test_definitions.py

@@ -127,10 +127,17 @@ def test_token_stream():
 
 def test_pep257():
     """Run domain-specific tests from test.py file."""
-    from .test_cases import test
-    results = list(check([os.path.join(os.path.dirname(__file__),
-                                       'test_cases', 'test.py')]))
-    for error in results:
-        assert isinstance(error, Error)
-    results = set([(e.definition.name, e.message) for e in results])
-    assert test.expected == results
+    test_cases = ('test', 'unicode_literals')
+    for test_case in test_cases:
+        case_module = __import__('test_cases.{0}'.format(test_case),
+                                 globals=globals(),
+                                 locals=locals(),
+                                 fromlist=['expected'],
+                                 level=1)
+        # from .test_cases import test
+        results = list(check([os.path.join(os.path.dirname(__file__),
+                                           'test_cases', test_case + '.py')]))
+        for error in results:
+            assert isinstance(error, Error)
+        results = set([(e.definition.name, e.message) for e in results])
+        assert case_module.expectation.expected == results