Remove usage of trial from most test cases.

Author: MostAwesomeDude

ometa/test/helpers.py

@@ -0,0 +1,11 @@
+import unittest
+
+
+class TestCase(unittest.TestCase):
+    def assertRaises(self, ex, f, *args, **kwargs):
+        try:
+            f(*args, **kwargs)
+        except ex as e:
+            return e
+        else:
+            assert False, "%r didn't raise %r" % (f, ex)

ometa/test/test_pymeta.py

@@ -3,13 +3,15 @@
 import operator
 import sys
 from textwrap import dedent
-from twisted.trial import unittest
+import unittest
+
 from ometa.grammar import OMeta, TermOMeta, TreeTransformerGrammar
 from ometa.compat import OMeta1
 from ometa.runtime import (ParseError, OMetaBase, OMetaGrammarBase, EOFError,
                            expected, TreeTransformerBase)
 from ometa.interp import GrammarInterpreter, TrampolinedGrammarInterpreter
 from terml.parser import parseTerm as term
+from ometa.test.helpers import TestCase
 
 try:
     basestring
@@ -53,7 +55,7 @@ def doIt(s):
 
 
 
-class OMeta1TestCase(unittest.TestCase):
+class OMeta1TestCase(TestCase):
     """
     Tests of OMeta grammar compilation, with v1 syntax.
     """
@@ -418,7 +420,7 @@ def test_accidental_bareword(self):
 
 
 
-class OMetaTestCase(unittest.TestCase):
+class OMetaTestCase(TestCase):
     """
     Tests of OMeta grammar compilation.
     """
@@ -1076,7 +1078,7 @@ def test_args(self):
 
 
 
-class PyExtractorTest(unittest.TestCase):
+class PyExtractorTest(TestCase):
     """
     Tests for finding Python expressions in OMeta grammars.
     """
@@ -1111,7 +1113,7 @@ def test_expressions(self):
         self.assertRaises(ParseError, o.pythonExpr)
 
 
-class MakeGrammarTest(unittest.TestCase):
+class MakeGrammarTest(TestCase):
     """
     Test the definition of grammars via the 'makeGrammar' method.
     """
@@ -1325,7 +1327,7 @@ def interp(result, error):
 
 
 
-class TreeTransformerTestCase(unittest.TestCase):
+class TreeTransformerTestCase(TestCase):
 
     def compile(self, grammar, namespace=None):
         """
@@ -1439,7 +1441,7 @@ def test_foreign(self):
 
 
 
-class ErrorReportingTests(unittest.TestCase):
+class ErrorReportingTests(TestCase):
 
 
     def compile(self, grammar):

ometa/test/test_runtime.py

@@ -1,7 +1,7 @@
-from twisted.trial import unittest
 from ometa.runtime import OMetaBase, ParseError, expected, eof
+from ometa.test.helpers import TestCase
 
-class RuntimeTests(unittest.TestCase):
+class RuntimeTests(TestCase):
     """
     Tests for L{pymeta.runtime}.
     """

ometa/test/test_tube.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from twisted.trial import unittest
+import unittest
 from twisted.python.compat import iterbytes
 
 
@@ -22,7 +22,7 @@ def receive(self, data):
         self.received.append(data)
 
 
-class TrampolinedParserTestCase(unittest.SynchronousTestCase):
+class TrampolinedParserTestCase(unittest.TestCase):
     """
     Tests for L{ometa.tube.TrampolinedParser}
     """

terml/test/test_terml.py

@@ -1,17 +1,27 @@
-from twisted.trial import unittest
+import unittest
 from ometa.runtime import ParseError
 from terml.nodes import Tag, Term, coerceToTerm, TermMaker, termMaker
 from terml.parser import TermLParser, character, parseTerm
 
 
-class TermMakerTests(unittest.TestCase):
+class TestCase(unittest.TestCase):
+    def assertRaises(self, ex, f, *args, **kwargs):
+        try:
+            f(*args, **kwargs)
+        except ex as e:
+            return e
+        else:
+            assert False, "%r didn't raise %r" % (f, ex)
+
+
+class TermMakerTests(TestCase):
     def test_make(self):
         m = TermMaker()
         t1 = m.Foo(1, 'a', m.Baz())
         self.assertEqual(t1, parseTerm('Foo(1, "a", Baz)'))
 
 
-class ParserTest(unittest.TestCase):
+class ParserTest(TestCase):
     """
     Test TermL parser rules.
     """