Use yarnutils's asserts, drop YarnHelper's asserts

3 files changed, 4 insertions, 47 deletions

diff --git a/yarns/900-implements.yarn b/yarns/900-implements.yarn
index 92d027e..e3e4a86 100644
--- a/yarns/900-implements.yarn
+++ b/yarns/900-implements.yarn
@@ -22,20 +22,20 @@ This chapter contains the implementations for all scenario steps.
     print 'exit code', exit
     print 'stdout:', helper.get_variable('stdout')
     print 'stderr:', helper.get_variable('stderr')
-    helper.assertEqual(exit, wanted)
+    assertEqual(exit, wanted)
 
     IMPLEMENTS THEN stdout contains "(.+)" followed by "(.+)"
     first = get_next_match()
     second = get_next_match()
     stdout = helper.get_variable('stdout')
     first_i = stdout.find(first)
-    helper.assertGreaterThan(first_i, 0)
+    assertGreaterThan(first_i, 0)
     rest = stdout[first_i + len(first):]
     second_i = rest.find(second)
-    helper.assertGreaterThan(second_i, -1)
+    assertGreaterThan(second_i, -1)
 
     IMPLEMENTS THEN stdout does NOT contain "(\S+)"
     what = get_next_match()
     stdout = helper.get_variable('stdout')
     i = stdout.find(what)
-    helper.assertEqual(i, -1)
+    assertEqual(i, -1)
diff --git a/yarns/yarnhelper.py b/yarns/yarnhelper.py
index a1f9c8a..c3418cf 100644
--- a/yarns/yarnhelper.py
+++ b/yarns/yarnhelper.py
@@ -77,18 +77,6 @@ class YarnHelper(object):
         resp = s.send(r)
         return resp.status_code, resp.content
 
-    def assertEqual(self, a, b):
-        if a != b:
-            raise Error('assertion {!r} == {!r} failed'.format(a, b))
-
-    def assertNotEqual(self, a, b):
-        if a == b:
-            raise Error('assertion {!r} != {!r} failed'.format(a, b))
-
-    def assertGreaterThan(self, a, b):
-        if a <= b:
-            raise Error('assertion {!r} > {!r} failed'.format(a, b))
-
     def get_password_with_pass(self, pass_home, pass_name):  # pragma: no cover
         p = subprocess.Popen(
             ['env', 'HOME={}'.format(pass_home), 'pass', 'show', pass_name],
diff --git a/yarns/yarnhelper_tests.py b/yarns/yarnhelper_tests.py
index f42a10a..5fe2cbe 100644
--- a/yarns/yarnhelper_tests.py
+++ b/yarns/yarnhelper_tests.py
@@ -56,34 +56,3 @@ class HttpTests(unittest.TestCase):
         r = h.construct_aliased_http_request(server, 'GET', url)
         self.assertEqual(r.url, 'http://new.example.com/path')
         self.assertEqual(r.headers['Host'], 'www.example.com')
-
-
-class AssertionTests(unittest.TestCase):
-
-    def test_assertEqual_asserts_equals_correctly(self):
-        h = yarnhelper.YarnHelper()
-        self.assertEqual(h.assertEqual(0, 0), None)
-
-    def test_assertEqual_raises_error_for_nonequal_values(self):
-        h = yarnhelper.YarnHelper()
-        with self.assertRaises(yarnhelper.Error):
-            h.assertEqual(0, 1)
-
-    def test_assertNotEqual_asserts_nonequal_correct(self):
-        h = yarnhelper.YarnHelper()
-        self.assertEqual(h.assertNotEqual(0, 1), None)
-
-    def test_assertNotEqual_raises_error_for_equal_values(self):
-        h = yarnhelper.YarnHelper()
-        with self.assertRaises(yarnhelper.Error):
-            h.assertNotEqual(0, 0)
-
-    def test_assertGreaterThan_raises_error_for_equal_values(self):
-        h = yarnhelper.YarnHelper()
-        with self.assertRaises(yarnhelper.Error):
-            h.assertGreaterThan(0, 0)
-
-    def test_assertGreaterThan_raises_error_for_unordered_values(self):
-        h = yarnhelper.YarnHelper()
-        with self.assertRaises(yarnhelper.Error):
-            h.assertGreaterThan(0, 1)