[xproc-maven-plugin] xprocspec: Support focus on x:description

see issue daisy/xprocspec#45
daisy · Dec 13, 2016 · 0966320 · 0966320
1 parent e2dfd3d
commit 0966320
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/xprocspec-runner/src/main/java/org/daisy/maven/xproc/xprocspec/XProcSpecRunner.java b/xprocspec-runner/src/main/java/org/daisy/maven/xproc/xprocspec/XProcSpecRunner.java
@@ -87,11 +87,18 @@ public boolean hasFocus(File testDir) {
 	public boolean hasFocus(Collection<File> tests) {
 		for (File test : tests)
 			if (test.exists())
-				if ((Boolean)evaluateXPath(test, "exists(//x:scenario[@focus])", XPROCSPEC_NS, Boolean.class))
+				if (fileHasFocus(test))
 					return true;
 		return false;
 	}
 
+	private boolean fileHasFocus(File test) {
+		return (Boolean)evaluateXPath(test,
+		                              "exists(//x:scenario[@focus]) or exists(/x:description[@focus])",
+		                              XPROCSPEC_NS,
+		                              Boolean.class);
+	}
+
 	public boolean run(Map<String,File> tests,
 	                   File reportsDir,
 	                   File surefireReportsDir,
@@ -119,7 +126,7 @@ public boolean run(Map<String,File> tests,
 			for (String testName : tests.keySet()) {
 				File test = tests.get(testName);
 				if (test.exists())
-					if ((Boolean)evaluateXPath(test, "exists(//x:scenario[@focus])", XPROCSPEC_NS, Boolean.class))
+					if (fileHasFocus(test))
 						focusTests.add(testName); }}
 		Set<String> skipTests = new HashSet<String>(); {
 			if (!focusTests.isEmpty())