Reduce spelling of assert* functions which call assertThat.

1 files changed, 10 insertions, 10 deletions

diff --git a/testtools/testcase.py b/testtools/testcase.py
index 819791b..a37e380 100644
--- a/testtools/testcase.py
+++ b/testtools/testcase.py
@@ -305,8 +305,8 @@ class TestCase(unittest.TestCase):
         :param observed: The observed value.
         :param message: An optional message to include in the error.
         """
-        matcher = Annotate.if_message(message, Equals(expected))
-        self.assertThat(observed, matcher)
+        matcher = Equals(expected)
+        self.assertThat(observed, matcher, message)
 
     failUnlessEqual = assertEquals = assertEqual
 
@@ -320,8 +320,8 @@ class TestCase(unittest.TestCase):
         :param observed: The observed value.
         :param message: An optional message describing the error.
         """
-        matcher = Annotate.if_message(message, Is(None))
-        self.assertThat(observed, matcher)
+        matcher = Is(None)
+        self.assertThat(observed, matcher, message)
 
     def assertIsNotNone(self, observed, message=''):
         """Assert that 'observed' is not equal to None.
@@ -329,8 +329,8 @@ class TestCase(unittest.TestCase):
         :param observed: The observed value.
         :param message: An optional message describing the error.
         """
-        matcher = Annotate.if_message(message, Not(Is(None)))
-        self.assertThat(observed, matcher)
+        matcher = Not(Is(None))
+        self.assertThat(observed, matcher, message)
 
     def assertIs(self, expected, observed, message=''):
         """Assert that 'expected' is 'observed'.
@@ -339,13 +339,13 @@ class TestCase(unittest.TestCase):
         :param observed: The observed value.
         :param message: An optional message describing the error.
         """
-        matcher = Annotate.if_message(message, Is(expected))
-        self.assertThat(observed, matcher)
+        matcher = Is(expected)
+        self.assertThat(observed, matcher, message)
 
     def assertIsNot(self, expected, observed, message=''):
         """Assert that 'expected' is not 'observed'."""
-        matcher = Annotate.if_message(message, Not(Is(expected)))
-        self.assertThat(observed, matcher)
+        matcher = Not(Is(expected))
+        self.assertThat(observed, matcher, message)
 
     def assertNotIn(self, needle, haystack):
         """Assert that needle is not in haystack."""