Simplified unit tests

Justintime50 · Justintime50 · commit cf9ea17ffa56 · 2020-08-26T21:09:23.000-06:00
diff --git a/.coveragerc b/.coveragerc
@@ -2,3 +2,4 @@
 exclude_lines =
     if __name__ == '__main__':
     main()
+    DiffCLI()
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.3.1 (2020-08-26)
+
+* Simplified unit tests
+
 ## v1.3.0 (2020-08-20)
 
 * Overhauled testing suite (less exclusions, more robust tests)
diff --git a/Makefile b/Makefile
@@ -21,6 +21,10 @@ clean:
 	rm -rf build
 	rm -rf *.egg-info
 
+## run - Run the project
+run:
+	venv/bin/python diff/diff_files.py
+
 ## lint - Lint the project
 lint:
 	venv/bin/flake8 diff/*.py
diff --git a/diff/diff_files.py b/diff/diff_files.py
@@ -12,18 +12,21 @@ def __init__(self):
         parser.add_argument(
             '-f1',
             '--file1',
+            type=argparse.FileType('r'),
             required=True,
             help='The output to the base file to compare a second file to.'
         )
         parser.add_argument(
             '-f2',
             '--file2',
+            type=argparse.FileType('r'),
             required=True,
             help='The output to the second file compared to the base file.'
         )
         parser.add_argument(
             '-o',
             '--output',
+            type=argparse.FileType('w'),
             required=False,
             default='diff.html',
             help='The output to the output file including filename.'
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='diff-tool',
-    version='1.3.0',
+    version='1.3.1',
     description='Display a diff between two files in HTML.',
     long_description=long_description,
     long_description_content_type="text/markdown",
diff --git a/test/unit/test_diff.py b/test/unit/test_diff.py
@@ -1,32 +1,13 @@
 import mock
-import pytest
-import argparse
 from diff import diff_files
 
 
-@mock.patch('argparse.ArgumentParser.parse_args',
-            return_value=argparse.Namespace(
-                file1='file1.txt',
-                file2='file2.txt',
-                output='output.html',
-                )
-            )
-def test_cli(mock_args):
-    diff_files.DiffCLI()
-
-
-@pytest.mark.skip('Skipping this test until we can mock "self" in argparse.')
-def test_cli_run():
-    raise Exception('TODO: finish this test')
-
-
 def test_diff_run():
-    diff_file = 'test/files/diff.html'
     with mock.patch('builtins.open', mock.mock_open()):
         result = diff_files.Diff.run(
-            'test/files/file1.txt',
-            'test/files/file2.txt',
-            diff_file,
+            'file1.txt',
+            'file2.txt',
+            'output.html'
         )
     assert '<!DOCTYPE html' in result
 
