more tests cleanup

Author: eliasdorneles

tests/test_end_to_end.py

@@ -1,10 +1,12 @@
 import json
 import unittest
-import subprocess
+from subprocess import check_output
 import tempfile
+import fixtures
 
 
-class BinSchemaInferer(unittest.TestCase):
+class SkinferScriptTest(unittest.TestCase):
+    script = 'skinfer'
     def test_end_to_end_simple_run(self):
         # given:
         _, filename = tempfile.mkstemp()
@@ -25,6 +27,40 @@ def test_end_to_end_simple_run(self):
         }
 
         # when:
-        output = subprocess.check_output(['schema_inferer', filename])
+        output = check_output([self.script, filename])
         # then:
         self.assertEqual(expected, json.loads(output))
+
+    def test_run_with_json_samples_in_separate_files(self):
+        # given:
+        sample1 = fixtures.get_sample_path('minimal-1.json')
+        sample2 = fixtures.get_sample_path('sample2-yelp.json')
+        # when:
+        output = check_output([self.script, sample1, sample2])
+        # then:
+        data = json.loads(output)
+        self.assertIsNotNone(data)
+        self.assertIn('required', data)
+        self.assertIn('properties', data)
+
+    def test_run_with_jsonlines_samples(self):
+        # given:
+        infile = fixtures.get_sample_path('jsonlines.jsonl')
+        # when:
+        output = check_output([self.script, '--jsonlines', infile])
+        # then:
+        data = json.loads(output)
+        self.assertIsNotNone(data)
+        self.assertIn('required', data)
+        self.assertIn('properties', data)
+
+    def test_run_with_jsonlines_samples_omitting_option(self):
+        # given:
+        infile = fixtures.get_sample_path('jsonlines.jsonl')
+        # when:
+        output = check_output([self.script, infile])
+        # then:
+        data = json.loads(output)
+        self.assertIsNotNone(data)
+        self.assertIn('required', data)
+        self.assertIn('properties', data)

tests/test_schema_inferer.py

@@ -3,10 +3,8 @@
 
 from __future__ import absolute_import, print_function
 import unittest
-import json
 from tests import fixtures
 from skinfer import schema_inferer
-from subprocess import check_output
 
 
 class TestJsonSchemaInferer(unittest.TestCase):
@@ -37,47 +35,3 @@ def test_load_jsonlines_samples(self):
 
         # then:
         self.assertEquals(3, len(samples))
-
-
-class TestCasePython26Shim(unittest.TestCase):
-    def assertIsNotNone(self, value):
-        self.assertFalse(value is None, "%r is not None" % value)
-
-    def assertIn(self, value, seq):
-        self.assertTrue(value in seq, "%r is not in %r" % (value, seq))
-
-
-class TestSchemaInfererScriptTest(TestCasePython26Shim):
-    def test_run_with_json_samples_in_separate_files(self):
-        # given:
-        sample1 = fixtures.get_sample_path('minimal-1.json')
-        sample2 = fixtures.get_sample_path('sample2-yelp.json')
-        # when:
-        output = check_output(['bin/schema_inferer', sample1, sample2])
-        # then:
-        data = json.loads(output)
-        self.assertIsNotNone(data)
-        self.assertIn('required', data)
-        self.assertIn('properties', data)
-
-    def test_run_with_jsonlines_samples(self):
-        # given:
-        infile = fixtures.get_sample_path('jsonlines.jsonl')
-        # when:
-        output = check_output(['bin/schema_inferer', '--jsonlines', infile])
-        # then:
-        data = json.loads(output)
-        self.assertIsNotNone(data)
-        self.assertIn('required', data)
-        self.assertIn('properties', data)
-
-    def test_run_with_jsonlines_samples_omitting_option(self):
-        # given:
-        infile = fixtures.get_sample_path('jsonlines.jsonl')
-        # when:
-        output = check_output(['bin/schema_inferer', infile])
-        # then:
-        data = json.loads(output)
-        self.assertIsNotNone(data)
-        self.assertIn('required', data)
-        self.assertIn('properties', data)