@@ -124,11 +124,11 @@ @classmethod def setUpClass (cls): gce.load() cls._zError = re.compile(r"\{\{.*?\}\}") - cls._aRuleTested = set() + cls._aTestedRules = set() def test_parse (self): zOption = re.compile("^__([a-zA-Z0-9]+)__ ") spHere, spfThisFile = os.path.split(__file__) with open(os.path.join(spHere, "gc_test.txt"), "r", encoding="utf-8") as hSrc: @@ -170,11 +170,11 @@ if nError: print("Unexpected errors:", nError) # untested rules i = 0 for sOpt, sLineId, sRuleId in gce.listRules(): - if sOpt != "@@@@" and sLineId not in self._aRuleTested and not re.search("^[0-9]+[sp]$|^[pd]_", sRuleId): + if sOpt != "@@@@" and sLineId not in self._aTestedRules and not re.search("^[0-9]+[sp]$|^[pd]_", sRuleId): echo(sLineId + "/" + sRuleId, end= ", ") i += 1 if i: echo("\n[{} untested rules]".format(i)) @@ -194,11 +194,16 @@ lAllSugg = [] for dErr in aErrs: sRes = sRes[:dErr["nStart"]] + "~" * (dErr["nEnd"] - dErr["nStart"]) + sRes[dErr["nEnd"]:] sListErr += " * {sLineId} / {sRuleId} at {nStart}:{nEnd}\n".format(**dErr) lAllSugg.append("|".join(dErr["aSuggestions"])) - self._aRuleTested.add(dErr["sLineId"]) + self._aTestedRules.add(dErr["sLineId"]) + # test messages + if "" in dErr["sMessage"] or "" in dErr["sMessage"]: + print("\n# Line num : " + dErr["sLineId"] + \ + "\n rule name: " + dErr["sRuleId"] + \ + "\n message : " + dErr["sMessage"]) return sRes, sListErr, "|||".join(lAllSugg) def _getExpectedErrors (self, sLine): sRes = " " * len(sLine) for i, m in enumerate(self._zError.finditer(sLine)):