diff --git a/basic/program.py b/basic/program.py index 9744228..1cd7e4b 100644 --- a/basic/program.py +++ b/basic/program.py @@ -278,17 +278,41 @@ class Job: def hasElement(self, parameter, elem): + """ + the function searches in an optional job.parameter + (a) true, if the parameter does not exist (DEFAULT) + (b) true, if the element is member of the parameter + (c) false, if parameter exists and elem is not member of the parameter + :param parameter: + :param elem: + :return: + """ if hasattr(self.par, parameter): print (parameter + " in Parameter") if getattr(self.par, parameter).find(elem) >= 0: return True return False return True - def hascomponente(self, komp): - return self.hasElement("componente", komp) + def hascomponente(self, comp): + """ + it searches if comp is member of the optional job.parameter (default = each is member) + :param comp: + :return: + """ + return self.hasElement("componente", comp) def hasFunction(self, fct): + """ + it searches if fct is member of the optional job.parameter (default = each is member) + :param fct: + :return: + """ return self.hasElement("function", fct) def hasTool(self, tool): + """ + it searches if tool is member of the optional job.parameter (default = each is member) + :param tool: + :return: + """ return self.hasElement("tool", tool) def getMessageLevel(self, errtyp, elem): if (not hasattr(self, "m")) or (self.m is None): diff --git a/init_testcase.py b/init_testcase.py index de0b073..16b50b3 100644 --- a/init_testcase.py +++ b/init_testcase.py @@ -23,9 +23,12 @@ def startPyJob(job): for c in comps: comp = cm.getComponent(c) comp.m.logInfo("------- "+comp.name+" ----------------------------------------") - comp.reset_TData(B.PAR_TESTCASE) - comp.load_TData(B.PAR_TESTCASE, testdata) - comp.read_TData("vorher", B.PAR_TESTCASE) + if job.hasFunction("reset_TData"): + comp.reset_TData(B.PAR_TESTCASE) + if job.hasFunction("load_TData"): + comp.load_TData(B.PAR_TESTCASE, testdata) + if job.hasFunction("read_TData"): + comp.read_TData("vorher", B.PAR_TESTCASE) comp.m.logInfo("------- "+comp.name+" ----------------------------------------") job.m.merge(comp.m) print(str(comp)) diff --git a/test/test_job.py b/test/test_job.py index 498c02e..16b9a43 100644 --- a/test/test_job.py +++ b/test/test_job.py @@ -52,6 +52,7 @@ class MyTestCase(unittest.TestCase): programs = ["init_testcase"] testcase = "TC0001" timexec = "2022-06-28_21-23-34" + fct = "read_TData" # os.system("python "+os.path.join(HOME_PATH, "check_environment.py")+" -a TEST -e ENV01") # os.system("python "+os.path.join(HOME_PATH, "init_testsuite.py")+" -a TEST -e ENV01 " # "-ts "+os.path.join(HOME_PATH, "test","lauf","V0.1","implement_2021-08-28_23-50-51")+" -dt csv -ds implement -dn firstunit") @@ -64,7 +65,7 @@ class MyTestCase(unittest.TestCase): if "init_testcase" in programs: program = "init_testcase" job = Job("unit") - args = { B.PAR_APP: "TESTAPP", B.PAR_ENV: "ENV01", "modus": "unit", + args = { B.PAR_APP: "TESTAPP", B.PAR_ENV: "ENV01", "modus": "unit", B.PAR_FCT: fct, B.PAR_TCDIR: os.path.join(job.conf.confs[B.SUBJECT_PATH][B.ATTR_PATH_ARCHIV], testcase, timexec), "step": 1 } # "usecase": "TST001", "tstime": "2022-03-17_17-28"}