All tests succeeding!!!

1 files changed, 49 insertions, 6 deletions

diff --git a/test/__init__.py b/test/__init__.py
index b66ce57..1ebe41b 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,20 +1,25 @@
 # -*- coding: utf-8 -*-  IGNORE:C0111
 from __future__ import absolute_import, print_function, unicode_literals
 import logging
-from test import test_reader, test_input
 import yamlish
-import unittest
+import unittest2 as unittest
 import yaml
+import tempfile
+import textwrap
+from textwrap import dedent
 logging.basicConfig(level=logging.INFO)
 
+INPUT = 1
+OUTPUT = 2
+
 def _generate_test_name(source):
     """
     Clean up human-friendly test name into a method name.
     """
-    out = source.replace(' ', '_').replace(':', '').lower()
+    out = source.replace(' ', '_').replace(':', '').replace(',', '').lower()
     return "test_%s" % out
 
-def _create_test(test_src, tested_function):
+def _create_input_test(test_src, tested_function):
     """
     Decorate tested function to be used as a method for TestCase.
     """
@@ -22,6 +27,7 @@ def _create_test(test_src, tested_function):
         """
         Execute a test by calling a tested_function on test_src data.
         """
+        self.maxDiff = None
         if ('skip' in test_src) and test_src['skip']:
             logging.info("test_src skipped!")
             return
@@ -43,7 +49,41 @@ def _create_test(test_src, tested_function):
     return do_test_expected
 
 
-def generate_testsuite(test_data, test_case_shell, test_fce):
+def _create_output_test(test_src, tested_function):
+    """
+    Decorate tested function to be used as a method for TestCase.
+    """
+    def do_test_expected(self):
+        """
+        Execute a test by calling a tested_function on test_src data.
+        """
+        self.maxDiff = None
+        if ('skip' in test_src) and test_src['skip']:
+            logging.info("test_src skipped!")
+            return
+
+
+        # We currently don't throw any exceptions in Writer, so this
+        # this is always false
+        if 'error' in test_src:
+            self.assertRaises(test_src['error'], yamlish.dumps, test_src['in'])
+        else:
+            logging.debug("out:\n%s", textwrap.dedent(test_src['out']))
+            want = yaml.load(textwrap.dedent(test_src['out']))
+            logging.debug("want:\n%s", want)
+            with tempfile.NamedTemporaryFile(delete=False) as test_file:
+                tested_function(test_src['in'], test_file)
+                test_file.seek(0)
+                got_str = test_file.read()
+                logging.debug("got_str = %s", got_str)
+                got = yaml.load(got_str)
+                self.assertEqual(got, want, "Result matches")
+
+    return do_test_expected
+
+
+
+def generate_testsuite(test_data, test_case_shell, test_fce, direction=INPUT):
     """
     Generate tests from the test data, class to build upon and function to use for testing.
     """
@@ -52,6 +92,9 @@ def generate_testsuite(test_data, test_case_shell, test_fce):
             logging.info("test %s skipped!", in_test['name'])
             continue
         name = _generate_test_name(in_test['name'])
-        test_method = _create_test (in_test, test_fce)
+        if direction == INPUT:
+            test_method = _create_input_test (in_test, test_fce)
+        elif direction == OUTPUT:
+            test_method = _create_output_test(in_test, test_fce)
         test_method.__name__ = str('test_%s' % name)  # IGNORE:W0622
         setattr (test_case_shell, test_method.__name__, test_method)