Merge pull request #20 from sumannam/dev/DevOps

I created a file (test_main.py) to distinguish between the main.py an…

projects/simparc/conf.py → projects/simparc/config.py

@@ -3,6 +3,16 @@
 from pathlib import Path
 
 PROJECT_NAME = "DEVS-Python"
+TBASE_FOLDER = ""
+
+if 'win' in sys.platform:  # Windows
+    sys.path.append('D:/Git/DEVS-Python')
+    sys.path.append('D:/Git/DEVS-Python/projects/simparc')
+    TBASE_FOLDER = os.path.dirname(os.path.abspath(__file__)) + "\\tbase"
+else:  # Linux, Unix, MacOS
+    sys.path.append('.')
+    TBASE_FOLDER = os.path.dirname(os.path.abspath(__file__)) + "/tbase"
+
 
 def setDevPath():
     current_path = Path.cwd()

projects/simparc/coupbase/EF_P.py

@@ -1,6 +1,6 @@
 import sys
 
-from conf import setDevPath
+from projects.simparc.config import setDevPath
 setDevPath()
 
 # from pypreprocessor import pypreprocessor

projects/simparc/main.py

@@ -1,37 +1,8 @@
-import os
-import sys
-import time
-
-sys.path.append('D:/Git/DEVS-Python')
-sys.path.append('D:/Git/DEVS-Python/projects/simparc')
-
-TBASE_FOLDER = os.path.dirname(os.path.abspath(__file__)) + "\\tbase"
-
-from projects.simparc.mbase.IP import IP
-from TEST_ATOMIC_MODELS import TEST_ATOMIC_MODELS
-
-if __name__ == '__main__':
-    ip = IP()
-    model_test = TEST_ATOMIC_MODELS()
-
-    ## 자동 테스트
-    # json_file = os.path.join(TBASE_FOLDER, 'ip_test_script.json')
-
-    # start = time.time() 
-
-    # model_test.runAutoModelTest(ip, json_file)
-    # end = time.time()
-
-    # print(f"{end - start:.5f} sec")
-
-    ## 수동 테스트
-    ip.modelTest(ip)
-
+import config
 
 # 시뮬레이션
-# from projects.simparc.EF_P import EF_P
-# if __name__ == '__main__':
-#     ef_p = EF_P()
-#     ef_p.initialize() 
-#     ef_p.restart()
-
+from projects.simparc.coupbase.EF_P import EF_P
+if __name__ == '__main__':
+    ef_p = EF_P()
+    ef_p.initialize() 
+    ef_p.restart()

projects/simparc/test_main.py

@@ -0,0 +1,24 @@
+import os
+import time
+
+import config
+
+from projects.simparc.mbase.IP import IP
+from TEST_ATOMIC_MODELS import TEST_ATOMIC_MODELS
+
+if __name__ == '__main__':
+    ip = IP()
+    model_test = TEST_ATOMIC_MODELS()
+
+    # 자동 테스트
+    json_file = os.path.join(config.TBASE_FOLDER, 'ip_test_script.json')
+
+    start = time.time() 
+
+    model_test.runAutoModelTest(ip, json_file)
+    end = time.time()
+
+    print(f"{end - start:.5f} sec")
+
+    ## 수동 테스트
+    # ip.modelTest(ip)

test/config.py

@@ -0,0 +1,8 @@
+import os
+import sys
+
+if 'win' in sys.platform:  # Windows
+    sys.path.append('D:/Git/DEVS-Python')
+    sys.path.append('D:/Git/DEVS-Python/projects/simparc')
+else:  # Linux, Unix, MacOS
+    sys.path.append('.')

test/testEF_P.py

@@ -3,7 +3,7 @@
 
 sys.path.append('D:/Git/DEVS-Python')
 
-from projects.simparc.EF_P import EF_P
+from projects.simparc.coupbase.EF_P import EF_P
 
 class testEF_P(unittest.TestCase):
     def setUp(self):
@@ -20,4 +20,4 @@ def testAddModels(self):
 
     def testAddInteralCoupling(self):
         coupling_list = self.ef_p.getInternalCoupling()
-        assert coupling_list.coupling_dic == {'EF.out': 'P.in', 'P.out': 'EF.in'}
+        assert coupling_list.coupling_dic == {'EF.out': ['P.in'], 'P.out': ['EF.in']}

test/testPModelTest.py

@@ -4,7 +4,7 @@
 
 sys.path.append('D:/Git/DEVS-Python')
 
-from projects.simparc.P import P
+from projects.simparc.mbase.P import P
 from src.CONTENT import CONTENT
 
 class testPModelTest(unittest.TestCase):
@@ -77,7 +77,7 @@ def test_modeltest_p_inject(self):
 
         send_result = self.p.getInjectResult("inject")
 
-        assert send_result == "state s = (4 busy g1 5)"
+        assert send_result == "state s = (5 busy g1 5)"
 
 if __name__ == '__main__':
     start = time.time()    

test/testROOT_CO_ORDINATORS.py

@@ -4,7 +4,7 @@
 sys.path.append('D:/Git/DEVS-Python')
 sys.path.append('D:/Git/DEVS-Python/projects/simparc')
 
-from projects.simparc.EF_P import EF_P
+from projects.simparc.coupbase.EF_P import EF_P
 
 class testROOT_CO_ORDINATORS(unittest.TestCase):
     def setUp(self):

test/test_basic.py

@@ -1,39 +1,40 @@
 import sys
 import unittest
 
-sys.path.append('D:/Git/DEVS-Python')
+import config
 
-from testPModelTest import testPModelTest
-# from testEF_P import testEF_P
-# from testROOT_CO_ORDINATORS import testROOT_CO_ORDINATORS
+# from testPModelTest import testPModelTest
+from testEF_P import testEF_P
+from testROOT_CO_ORDINATORS import testROOT_CO_ORDINATORS
 
+# TO-DO : 테스트 실행 파일을 엔진과 모델 테스트로 분리할 것[Jira-DEVS-41]
 if __name__ == '__main__':
-    test_p0 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
-    test_p1 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
-    test_p2 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
-    test_p3 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
-    test_p4 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
+    # test_p0 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
+    # test_p1 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
+    # test_p2 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
+    # test_p3 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
+    # test_p4 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
     # test_p5 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
     # test_p6 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
     # test_p7 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
     # test_p8 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
     # test_p9 = unittest.TestLoader().loadTestsFromTestCase(testPModelTest)
-    # test_efp = unittest.TestLoader().loadTestsFromTestCase(testEF_P)
-    # test_root_coordinators = unittest.TestLoader().loadTestsFromTestCase(testROOT_CO_ORDINATORS)
+    test_efp = unittest.TestLoader().loadTestsFromTestCase(testEF_P)
+    test_root_coordinators = unittest.TestLoader().loadTestsFromTestCase(testROOT_CO_ORDINATORS)
 
     allTests = unittest.TestSuite()
-    allTests.addTest(test_p0)
-    allTests.addTest(test_p1)
-    allTests.addTest(test_p2)
-    allTests.addTest(test_p3)
-    allTests.addTest(test_p4)
+    # allTests.addTest(test_p0)
+    # allTests.addTest(test_p1)
+    # allTests.addTest(test_p2)
+    # allTests.addTest(test_p3)
+    # allTests.addTest(test_p4)
     # allTests.addTest(test_p5)
     # allTests.addTest(test_p6)
     # allTests.addTest(test_p7)
     # allTests.addTest(test_p8)
     # allTests.addTest(test_p9)
-    # allTests.addTest(test_efp)
-    # allTests.addTest(test_root_coordinators)
+    allTests.addTest(test_efp)
+    allTests.addTest(test_root_coordinators)
 
     unittest.TextTestRunner(verbosity=2, failfast=True).run(allTests)