<Enhancement>[UnitTest]: Update scripts

Move scripts to 'scripts' directory

[#64]

Author: hasii2011

scripts/runtests.sh

@@ -11,3 +11,9 @@ function changeToProjectRoot {
 changeToProjectRoot
 
 python3 -m test.RunTests
+
+status=$?
+
+echo "Exit with status: ${status}"
+exit ${status}
+

test/RunTests.py

@@ -1,7 +1,9 @@
 
-import unittest
+
+from unittest import TestResult
 from unittest import TestSuite
 from unittest import TestLoader
+from unittest import TextTestRunner
 
 from test.TestFindResources import TestFindResources
 from test.TestPredictor import TestPredictor
@@ -16,25 +18,32 @@
 
 def main():
     # Initialize the test suite
-    testLoader: TestLoader = unittest.TestLoader()
-    suite: TestSuite = unittest.TestSuite()
+    testLoader: TestLoader = TestLoader()
+    suite: TestSuite = TestSuite()
 
     suite.addTest(testLoader.loadTestsFromTestCase(TestFindResources))
     suite.addTest(testLoader.loadTestsFromTestCase(TestPredictor))
     suite.addTest(testLoader.loadTestsFromTestCase(TestReferences))
     suite.addTest(testLoader.loadTestsFromTestCase(TestResourceUtility))
-    suite.addTest(testLoader.loadTestsFromTestCase(TestScheduledCall))
     suite.addTest(testLoader.loadTestsFromTestCase(TestTheme))
     suite.addTest(testLoader.loadTestsFromTestCase(TestThemeProperty))
 
+    suite.addTest(testLoader.loadTestsFromTestCase(TestScheduledCall))
     suite.addTest(testLoader.loadTestsFromTestCase(TestScheduler))
 
     # initialize a runner, pass it our suite and run it
-    runner = unittest.TextTestRunner()
-    result = runner.run(suite)
+    runner = TextTestRunner()
+    result: TestResult = runner.run(suite)
 
     print(result)
 
+    if len(result.failures) != 0:
+        return 1
+    else:
+        return 0
+
 
 if __name__ == '__main__':
-    main()
+
+    cliStatus: int = main()
+    exit(cliStatus)

test/TestReferences.py

@@ -1,12 +1,11 @@
 
-import logging
+from logging import Logger
+from logging import getLogger
 
-import unittest
-
-from test.TestBase import TestBase
+from unittest import expectedFailure
+from unittest import main as unitTestMain
 
 from test.DummyControl import DummyControl
-
 from test.DummyVehicle import DummyVehicle
 
 from albow.ItemRefInsertionException import ItemRefInsertionException
@@ -15,6 +14,9 @@
 from albow.References import ItemRef
 
 
+from test.TestBase import TestBase
+
+
 TEST_ITEM_INDEX = 3
 
 
@@ -29,7 +31,7 @@ def setUpClass(cls):
 
     def setUp(self):
         """"""
-        self.logger = logging.getLogger(__name__)
+        self.logger: Logger = getLogger(__name__)
 
     def testBasicAttrRef(self):
 
@@ -55,7 +57,7 @@ def testBasicAttrRef(self):
         velocityControl.set_value(500)
         self.assertTrue(velocityControl.get_value() == testVehicle.velocity, "Control did not update reference")
 
-    @unittest.expectedFailure
+    @expectedFailure
     def testBadItemRefInsertion(self):
 
         vehicleList = self.getVehicleList()
@@ -113,4 +115,4 @@ def getVehicleList():
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unitTestMain()