X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=tests%2Fcoverage_dungeon.py;h=6484fa79b008f0ff15d95bd6e530c0cc5275e3a3;hp=a9ea285e9f03f4532aed34a1be334d30ea789057;hb=7701642e0c5bbe9f9b437d2692dd15ab9aaf5170;hpb=ac4e43196c0b20c2afdd655b47b9cde441acd970
diff --git a/tests/coverage_dungeon.py b/tests/coverage_dungeon.py
index a9ea285..6484fa7 100755
--- a/tests/coverage_dungeon.py
+++ b/tests/coverage_dungeon.py
@@ -14,51 +14,56 @@ import re
TEST_DIR = "."
YAML_PATH = "../adventure.yaml"
-HTML_TEMPLATE_PATH = "coverage_dungeon.html.tpl"
+HTML_TEMPLATE_PATH = "../templates/coverage_dungeon.html.tpl"
DEFAULT_HTML_OUTPUT_PATH = "../coverage/adventure.yaml.html"
STDOUT_REPORT_CATEGORY = " {name:.<19}: {percent:5.1f}% covered ({covered} of {total})\n"
-HTML_SUMMARY_ROW = """
+HTML_SUMMARY_ROW = '''
-"""
+'''
-HTML_CATEGORY_SECTION = """
+HTML_CATEGORY_SECTION = '''
|
{rows}
| |
-"""
+'''
-HTML_CATEGORY_HEADER = """
+HTML_CATEGORY_HEADER = '''
| {label} |
{cells}
-"""
+'''
HTML_CATEGORY_HEADER_CELL = '{} | \n'
HTML_CATEGORY_COVERAGE_CELL = ' | \n'
-HTML_CATEGORY_ROW = """
+HTML_CATEGORY_ROW = '''
| {id} |
{cells}
-"""
+'''
def search(needle, haystack):
# Search for needle in haystack, first escaping needle for regex, then
# replacing %s, %d, etc. with regex wildcards, so the variable messages
# within the dungeon definition will actually match
- needle = re.escape(needle) \
+
+ if needle == None or needle == "" or needle == "NO_MESSAGE":
+ # if needle is empty, assume we're going to find an empty string
+ return True
+
+ needle_san = re.escape(needle) \
.replace("\\n", "\n") \
.replace("\\t", "\t") \
.replace("\%S", ".*") \
@@ -66,7 +71,7 @@ def search(needle, haystack):
.replace("\%d", ".*") \
.replace("\%V", ".*")
- return re.search(needle, haystack)
+ return re.search(needle_san, haystack)
def obj_coverage(objects, text, report):
# objects have multiple descriptions based on state
@@ -78,26 +83,24 @@ def obj_coverage(objects, text, report):
if name not in report["messages"]:
report["messages"][name] = {"covered" : False}
report["total"] += 1
- if report["messages"][name]["covered"] != True:
- if desc == None or desc == '' or search(desc, text):
- report["messages"][name]["covered"] = True
- report["covered"] += 1
+ if report["messages"][name]["covered"] != True and search(desc, text):
+ report["messages"][name]["covered"] = True
+ report["covered"] += 1
def loc_coverage(locations, text, report):
# locations have a long and a short description, that each have to
# be checked seperately
for name, loc in locations:
+ desc = loc["description"]
if name not in report["messages"]:
report["messages"][name] = {"long" : False, "short": False}
report["total"] += 2
- if report["messages"][name]["long"] != True:
- if loc["description"]["long"] == None or loc["description"]["long"] == '' or search(loc["description"]["long"], text):
- report["messages"][name]["long"] = True
- report["covered"] += 1
- if report["messages"][name]["short"] != True:
- if loc["description"]["short"] == None or loc["description"]["short"] == '' or search(loc["description"]["short"], text):
- report["messages"][name]["short"] = True
- report["covered"] += 1
+ if report["messages"][name]["long"] != True and search(desc["long"], text):
+ report["messages"][name]["long"] = True
+ report["covered"] += 1
+ if report["messages"][name]["short"] != True and search(desc["short"], text):
+ report["messages"][name]["short"] = True
+ report["covered"] += 1
def hint_coverage(obituaries, text, report):
# hints have a "question" where the hint is offered, followed
@@ -136,31 +139,28 @@ def threshold_coverage(classes, text, report):
if name not in report["messages"]:
report["messages"][name] = {"covered" : "False"}
report["total"] += 1
- if report["messages"][name]["covered"] != True:
- if item["message"] == None or item["message"] == "NO_MESSAGE" or search(item["message"], text):
- report["messages"][name]["covered"] = True
- report["covered"] += 1
+ if report["messages"][name]["covered"] != True and search(item["message"], text):
+ report["messages"][name]["covered"] = True
+ report["covered"] += 1
def arb_coverage(arb_msgs, text, report):
for name, message in arb_msgs:
if name not in report["messages"]:
report["messages"][name] = {"covered" : False}
report["total"] += 1
- if report["messages"][name]["covered"] != True:
- if message == None or search(message, text):
- report["messages"][name]["covered"] = True
- report["covered"] += 1
+ if report["messages"][name]["covered"] != True and search(message, text):
+ report["messages"][name]["covered"] = True
+ report["covered"] += 1
-def specials_actions_coverage(items, text, report):
- # works for actions or specials
+def actions_coverage(items, text, report):
+ # works for actions
for name, item in items:
if name not in report["messages"]:
report["messages"][name] = {"covered" : False}
report["total"] += 1
- if report["messages"][name]["covered"] != True:
- if item["message"] == None or item["message"] == "NO_MESSAGE" or search(item["message"], text):
- report["messages"][name]["covered"] = True
- report["covered"] += 1
+ if report["messages"][name]["covered"] != True and search(item["message"], text):
+ report["messages"][name]["covered"] = True
+ report["covered"] += 1
def coverage_report(db, check_file_contents):
# Create report for each catagory, including total items, number of items
@@ -182,8 +182,7 @@ def coverage_report(db, check_file_contents):
loc_coverage(db["locations"], chk, report["locations"])
obit_coverage(db["obituaries"], chk, report["obituaries"])
obj_coverage(db["objects"], chk, report["objects"])
- specials_actions_coverage(db["actions"], chk, report["actions"])
- specials_actions_coverage(db["specials"], chk, report["specials"])
+ actions_coverage(db["actions"], chk, report["actions"])
threshold_coverage(db["classes"], chk, report["classes"])
threshold_coverage(db["turn_thresholds"], chk, report["turn_thresholds"])
@@ -219,7 +218,8 @@ if __name__ == "__main__":
category["percent"] = (category["covered"] / float(category["total"])) * 100
# render section header
- cat_keys = category["messages"].items()[0][1].keys()
+ cat_messages = sorted(category["messages"].items())
+ cat_keys = cat_messages[0][1].keys()
headers_html = ""
colspan = 10 - len(cat_keys)
for key in cat_keys:
@@ -227,7 +227,7 @@ if __name__ == "__main__":
category_html = HTML_CATEGORY_HEADER.format(colspan=colspan, label=category["name"], cells=headers_html)
# render message coverage row
- for message_id, covered in sorted(category["messages"].items()):
+ for message_id, covered in cat_messages:
category_html_row = ""
for key, value in covered.items():
category_html_row += HTML_CATEGORY_COVERAGE_CELL.format("uncovered" if value != True else "covered")