224: Reworked IPATypeError class into raise_TypeError function

1 files changed, 27 insertions, 35 deletions

diff --git a/ipalib/tests/test_errors.py b/ipalib/tests/test_errors.py
index 2d5fc613..730502c5 100644
--- a/ipalib/tests/test_errors.py
+++ b/ipalib/tests/test_errors.py
@@ -25,40 +25,32 @@ from tstutil import raises, ClassChecker
 from ipalib import errors
 
 
-class test_IPATypeError(ClassChecker):
+def test_raise_TypeError():
     """
-    Tests the `errors.IPATypeError` exception.
+    Tests the `errors.raise_TypeError` function.
     """
-    _cls = errors.IPATypeError
-
-    def test_class(self):
-        assert self.cls.__bases__ == (TypeError,)
-
-    def test_init(self):
-        """
-        Tests the `errors.IPATypeError.__init__` method.
-        """
-        format = '%s: need a %r; got %r'
-        name = 'message'
-        type_ = unicode
-        value = 'hello world'
-        e = self.cls(name, type_, value)
-        assert e.name is name
-        assert e.type is type_
-        assert e.value is value
-        assert str(e) == format % (name, type_, value)
-
-        # name not an str:
-        fail = 42
-        e = raises(AssertionError, self.cls, fail, type_, value)
-        assert str(e) == format % ('name', str, fail)
-
-        # type_ not a type:
-        fail = unicode()
-        e = raises(AssertionError, self.cls, name, fail, value)
-        assert str(e) == format % ('type_', type, fail)
-
-        # type(value) is type_:
-        fail = u'how are you?'
-        e = raises(AssertionError, self.cls, name, type_, fail)
-        assert str(e) == 'value: %r is a %r' % (fail, type_)
+    f = errors.raise_TypeError
+    format = '%s: need a %r; got %r'
+    name = 'message'
+    type_ = unicode
+    value = 'Hello.'
+    e = raises(TypeError, f, name, type_, value)
+    assert e.name is name
+    assert e.type is type_
+    assert e.value is value
+    assert str(e) == format % (name, type_, value)
+
+    # name not an str:
+    fail = 42
+    e = raises(AssertionError, f, fail, type_, value)
+    assert str(e) == format % ('name', str, fail)
+
+    # type_ not a type:
+    fail = unicode()
+    e = raises(AssertionError, f, name, fail, value)
+    assert str(e) == format % ('type_', type, fail)
+
+    # type(value) is type_:
+    fail = u'How are you?'
+    e = raises(AssertionError, f, name, type_, fail)
+    assert str(e) == 'value: %r is a %r' % (fail, type_)