Added a few unit tests

Author: Kirill V. Lyadvinsky

Makefile

@@ -1,7 +1,7 @@
 .PHONY: init test clean coverage lint
 
 test:
-	python3 -m unittest discover -v
+	python3 -m unittest discover -v -b
 
 clean:
 	rm -rf test/*.pyc

test/test_hobeta.py

@@ -12,6 +12,27 @@
 
 
 class TestHobeta(unittest.TestCase):
+    def test_args_parser(self):
+        with self.assertRaises(SystemExit):
+            args = hobeta.parse_args(("-h", "-v"))
+
+        temp_in_file = tempfile.mkstemp()[1]
+        input_file = open(temp_in_file, "w")
+        input_file.close()
+        temp_out_file = tempfile.mkstemp()[1]
+        try:
+           args = hobeta.parse_args(("info", temp_in_file))
+           self.assertEqual(args.func, hobeta.show_info)
+           args.hobeta_file.close()
+
+           args = hobeta.parse_args(("strip", temp_in_file, temp_out_file))
+           self.assertEqual(args.func, hobeta.strip_header)
+           args.hobeta_file.close()
+           args.output_file.close()
+        finally:
+            os.remove(temp_in_file)
+            os.remove(temp_out_file)
+
     def test_ckechsum(self):
         data = b'F.load.AC\x00\x80\xf9\x06\x00\x07'
         self.assertEqual(hobeta.calc_checksum(data), 20661)

test/test_zeus2txt.py

@@ -7,21 +7,78 @@
 import tempfile
 import unittest
 from collections import namedtuple
+import logging
 
 from zxtools import zeus2txt
 
 
 class TestZeus2Txt(unittest.TestCase):
-    def test_convert(self):
-        test_file = io.BytesIO(self.test_data)
+    def test_args_parser(self):
+        with self.assertRaises(SystemExit):
+            args = zeus2txt.parse_args(("-h", "-v"))
+
+        temp_in_file = tempfile.mkstemp()[1]
+        input_file = open(temp_in_file, "w")
+        input_file.close()
+        temp_out_file = tempfile.mkstemp()[1]
+        try:
+           args = zeus2txt.parse_args(("info", temp_in_file))
+           self.assertEqual(args.func, zeus2txt.show_info)
+           args.zeus_file.close()
+
+           args = zeus2txt.parse_args(("convert", temp_in_file, temp_out_file))
+           self.assertEqual(args.func, zeus2txt.convert_file)
+           args.zeus_file.close()
+           args.output_file.close()
+        finally:
+            os.remove(temp_in_file)
+            os.remove(temp_out_file)
+
+    @staticmethod
+    def prepare_convert_args(test_data):
+        test_file = io.BytesIO(test_data)
         temp_output_path = tempfile.mkstemp()[1]
         temp_output_file = open(temp_output_path, "w")
 
         Args = namedtuple('Args', "zeus_file output_file")
         parsed_args = Args(test_file, temp_output_file)
-        zeus2txt.convert_file(parsed_args)
+        return parsed_args, temp_output_path, temp_output_file
+
+    def test_undefined_token(self):
+        logging.basicConfig(level=logging.DEBUG)
+        args, temp_output_path, temp_output_file = self.prepare_convert_args(
+            b"\x0A\x00\x0A\x06\xFF\x2C\x34\x32\x00\xFF\xFF")
+
+        try:
+            zeus2txt.convert_file(args)
+            temp_output_file.close()
+            temp_output_file = open(temp_output_path, "r")
+            lines = temp_output_file.read().splitlines()
+            self.assertEqual(lines, ["00010       ,42",""])
+        finally:
+            temp_output_file.close()
+            os.remove(temp_output_path)
+
+    def test_no_eof(self):
+        args, temp_output_path, temp_output_file = self.prepare_convert_args(
+            b"\x0A\x00\x0A\x06\x82\x87\x2C\x34\x32\x00")
+
+        try:
+            zeus2txt.convert_file(args)
+            temp_output_file.close()
+            temp_output_file = open(temp_output_path, "r")
+            lines = temp_output_file.read().splitlines()
+            self.assertEqual(lines, ["00010       ADD BC,42",])
+        finally:
+            temp_output_file.close()
+            os.remove(temp_output_path)
+
+    def test_convert(self):
+        args, temp_output_path, temp_output_file = self.prepare_convert_args(
+            self.test_data)
 
         try:
+            zeus2txt.convert_file(args)
             temp_output_file.close()
             temp_output_file = open(temp_output_path, "rb")
             lines = temp_output_file.read().splitlines()

zxtools/hobeta.py

@@ -107,6 +107,8 @@ def strip_header(parsed_args):
                 length -= len(data)
     print("Created file %s, %d bytes copied." %
           (dst_file.name, bytes_to_copy-length))
+    dst_file.close()
+    src_file.close()
     return bytes_to_copy-length
 
 

zxtools/zeus2txt.py

@@ -39,6 +39,9 @@ def read_file(src_file):
 
 
 def convert_file(parsed_args):
+    """ Convert Zeus Z80 assembler file specified in zeus_file to the plain text and print it to the output_file """
+    logger = logging.getLogger('convert_file')
+
     process_string = False
     strnum_lo = False, 0
     tab = False
@@ -63,9 +66,9 @@ def convert_file(parsed_args):
                 continue
             try:
                 print(ASM_META[b-ASM_FIRST_TOKEN], end="", file=output)
-            except KeyError:
-                print("Token not defined: 0x%02X (%d), at line %05d"
-                      % (b, b, strnum))
+            except IndexError:
+                logger.warning("Token not defined: 0x%02X (%d), at line %05d"
+                    % (b, b, strnum))
         else:
             if not strnum_lo[0]:
                 strnum_lo = True, b
@@ -76,6 +79,7 @@ def convert_file(parsed_args):
                     break
                 print("%05d" % strnum, end=" ", file=output)
                 process_string = True
+    output.close()
 
 
 def parse_args(args):