ver Jul4th
fixed check_accessibility_tree function, updated the namespace definitons according the values defined in server/main.py
This commit is contained in:
@@ -178,18 +178,43 @@ def check_list(result: str, rules: Dict[str, List[str]]) -> float:
|
|||||||
return float(all(expect_metrics) and unexpect_metric)
|
return float(all(expect_metrics) and unexpect_metric)
|
||||||
|
|
||||||
|
|
||||||
_accessibility_ns_map = {"st": "uri:deskat:state.at-spi.gnome.org"
|
_accessibility_ns_map = {
|
||||||
, "attr": "uri:deskat:attributes.at-spi.gnome.org"
|
"ubuntu": {
|
||||||
, "cp": "uri:deskat:component.at-spi.gnome.org"
|
"st": "https://accessibility.ubuntu.example.org/ns/state",
|
||||||
, "doc": "uri:deskat:document.at-spi.gnome.org"
|
"attr": "https://accessibility.ubuntu.example.org/ns/attributes",
|
||||||
, "docattr": "uri:deskat:attributes.document.at-spi.gnome.org"
|
"cp": "https://accessibility.ubuntu.example.org/ns/component",
|
||||||
, "txt": "uri:deskat:text.at-spi.gnome.org"
|
"doc": "https://accessibility.ubuntu.example.org/ns/document",
|
||||||
, "val": "uri:deskat:value.at-spi.gnome.org"
|
"docattr": "https://accessibility.ubuntu.example.org/ns/document/attributes",
|
||||||
, "act": "uri:deskat:action.at-spi.gnome.org"
|
"txt": "https://accessibility.ubuntu.example.org/ns/text",
|
||||||
}
|
"val": "https://accessibility.ubuntu.example.org/ns/value",
|
||||||
|
"act": "https://accessibility.ubuntu.example.org/ns/action",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"st": "https://accessibility.windows.example.org/ns/state",
|
||||||
|
"attr": "https://accessibility.windows.example.org/ns/attributes",
|
||||||
|
"cp": "https://accessibility.windows.example.org/ns/component",
|
||||||
|
"doc": "https://accessibility.windows.example.org/ns/document",
|
||||||
|
"docattr": "https://accessibility.windows.example.org/ns/document/attributes",
|
||||||
|
"txt": "https://accessibility.windows.example.org/ns/text",
|
||||||
|
"val": "https://accessibility.windows.example.org/ns/value",
|
||||||
|
"act": "https://accessibility.windows.example.org/ns/action",
|
||||||
|
"class": "https://accessibility.windows.example.org/ns/class"
|
||||||
|
},
|
||||||
|
"macos": {
|
||||||
|
"st": "https://accessibility.macos.example.org/ns/state",
|
||||||
|
"attr": "https://accessibility.macos.example.org/ns/attributes",
|
||||||
|
"cp": "https://accessibility.macos.example.org/ns/component",
|
||||||
|
"doc": "https://accessibility.macos.example.org/ns/document",
|
||||||
|
"txt": "https://accessibility.macos.example.org/ns/text",
|
||||||
|
"val": "https://accessibility.macos.example.org/ns/value",
|
||||||
|
"act": "https://accessibility.macos.example.org/ns/action",
|
||||||
|
"role": "https://accessibility.macos.example.org/ns/role",
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def check_accessibility_tree(result: str, rules: List[Dict[str, Any]]) -> float:
|
def check_accessibility_tree(result: str, rules: List[Dict[str, Any]], osname: str = "ubuntu") -> float:
|
||||||
"""
|
"""
|
||||||
Args:
|
Args:
|
||||||
result (str): XML of GNOME Accessibility Tree
|
result (str): XML of GNOME Accessibility Tree
|
||||||
@@ -205,18 +230,21 @@ def check_accessibility_tree(result: str, rules: List[Dict[str, Any]]) -> float:
|
|||||||
"exact": bool specifying whether exact match or fuzzy match should
|
"exact": bool specifying whether exact match or fuzzy match should
|
||||||
be performed. defaults to True.
|
be performed. defaults to True.
|
||||||
}
|
}
|
||||||
|
osname (str): "ubuntu" | "windows" | "macos". "ubuntu" by default.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
float
|
float
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
a11y_ns_map = _accessibility_ns_map[osname]
|
||||||
|
|
||||||
at: _Element = lxml.etree.fromstring(result)
|
at: _Element = lxml.etree.fromstring(result)
|
||||||
total_match_score = 1.
|
total_match_score = 1.
|
||||||
for r in rules:
|
for r in rules:
|
||||||
if "xpath" in r:
|
if "xpath" in r:
|
||||||
elements: List[_Element] = at.xpath(r["xpath"], namespaces=_accessibility_ns_map)
|
elements: List[_Element] = at.xpath(r["xpath"], namespaces=a11y_ns_map)
|
||||||
elif "selectors" in r:
|
elif "selectors" in r:
|
||||||
selector = CSSSelector(", ".join(r["selectors"]), namespaces=_accessibility_ns_map)
|
selector = CSSSelector(", ".join(r["selectors"]), namespaces=a11y_ns_map)
|
||||||
elements: List[_Element] = selector(at)
|
elements: List[_Element] = selector(at)
|
||||||
else:
|
else:
|
||||||
raise ValueError("At least one of xpath and selectors is required")
|
raise ValueError("At least one of xpath and selectors is required")
|
||||||
@@ -361,7 +389,7 @@ def compare_time_in_speedtest_results(speedtest_result_path, time_diff):
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
# open the speedtest results file(csv)
|
# open the speedtest results file(csv)
|
||||||
date_col = None
|
#date_col = None
|
||||||
try:
|
try:
|
||||||
with open(speedtest_result_path, 'r') as f:
|
with open(speedtest_result_path, 'r') as f:
|
||||||
for i, line in enumerate(f):
|
for i, line in enumerate(f):
|
||||||
|
|||||||
Reference in New Issue
Block a user