Improve OMTypedParser test coverage

Removing the extra lines + hitting convertString2 in tests has brought
coverage up to 100%.

Author: ondras12345

OMPython/OMTypedParser.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 __author__ = "Anand Kalaiarasi Ganeson, ganan642@student.liu.se, 2012-03-19, and Martin Sjölund"
 __license__ = """
@@ -52,8 +51,6 @@
     opAssoc,
 )
 
-import sys
-
 
 def convertNumbers(s, l, toks):
     n = toks[0]
@@ -142,22 +139,3 @@ def parseString(string):
     if len(res) == 0:
         return
     return res[0]
-
-
-if __name__ == "__main__":
-    testdata = """
-   (1.0,{{1,true,3},{"4\\"
-",5.9,6,NONE ( )},record ABC
-  startTime = ErrorLevel.warning,
-  'stop*Time' = SOME(1.0)
-end ABC;})
-    """
-    expected = (1.0, ((1, True, 3), ('4"\n', 5.9, 6, None), {"'stop*Time'": 1.0, 'startTime': 'ErrorLevel.warning'}))
-    results = parseString(testdata)
-    if results != expected:
-        print("Results:", results)
-        print("Expected:", expected)
-        print("Failed")
-        sys.exit(1)
-    print("Matches expected output")
-    print(type(results), repr(results))

tests/test_typedParser.py

@@ -37,3 +37,17 @@ def test_str():
 
 def test_UnStringable():
     pass
+
+
+def test_everything():
+    # this test used to be in OMTypedParser.py's main()
+    testdata = """
+   (1.0,{{1,true,3},{"4\\"
+",5.9,6,NONE ( )},record ABC
+  startTime = ErrorLevel.warning,
+  'stop*Time' = SOME(1.0)
+end ABC;})
+    """
+    expected = (1.0, ((1, True, 3), ('4"\n', 5.9, 6, None), {"'stop*Time'": 1.0, 'startTime': 'ErrorLevel.warning'}))
+    results = typeCheck(testdata)
+    assert results == expected