Add get-html-body function.

jason-fox · Nov 14, 2022 · a57c5e4 · a57c5e4
1 parent fb242fe
commit a57c5e4
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 3 deletions.
diff --git a/lib/unittest-1.2.jar → lib/unittest-1.3.jar b/lib/unittest-1.2.jar → lib/unittest-1.3.jar
diff --git a/plugin.xml b/plugin.xml
@@ -3,7 +3,7 @@
 	This file is part of the DITA-OT Unit Test Plug-in project.
 	See the accompanying LICENSE file for applicable licenses.
 -->
-<plugin id="fox.jason.unit-test" version="2.1.1">
+<plugin id="fox.jason.unit-test" version="2.2.0">
 
 	<transtype desc="Runs an antro ANT profiling report" name="antro">
 		<param

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fox.jason</groupId>
 	<artifactId>unittest</artifactId>
-	<version>1.2</version>
+	<version>1.3</version>
 
 	<dependencies>
 		<dependency>

diff --git a/resource/antlib.xml b/resource/antlib.xml
@@ -527,7 +527,7 @@
 
 	<taskdef
     resource="fox/jason/unittest/antlib.xml"
-    classpath="${dita.dir}/plugins/fox.jason.unit-test/lib/unittest-1.2.jar"
+    classpath="${dita.dir}/plugins/fox.jason.unit-test/lib/unittest-1.3.jar"
   />
 
 </antlib>
diff --git a/src/fox/jason/unittest/tasks/FindBodyTask.java b/src/fox/jason/unittest/tasks/FindBodyTask.java
@@ -0,0 +1,34 @@
+/*
+ *  This file is part of the DITA-OT Unit Test Plug-in project.
+ *  See the accompanying LICENSE file for applicable licenses.
+ */
+
+package fox.jason.unittest.tasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+// Task to extract the string between <article> tags.
+
+public class FindBodyTask extends Task {
+
+  /**
+   * Creates a new <code>FindBodyTask</code> instance.
+   */
+  public FindBodyTask() {
+    super();
+  }
+
+  /**
+   * Method execute.
+   *
+   * @throws BuildException if something goes wrong
+   */
+  @Override
+  public void execute() {
+    String input = getProject().getProperty("htmlSource");
+    int start = input.indexOf("<body");
+    int end = input.indexOf("</body>") + 7;
+    getProject().setProperty("fragment", input.substring(start, end));
+  }
+}
diff --git a/src/main/resources/fox/jason/unittest/antlib.xml b/src/main/resources/fox/jason/unittest/antlib.xml
@@ -239,6 +239,28 @@
 		</sequential>
 	</macrodef>
 
+	<!-- 
+		Extract the <body>from the input HTML.
+	
+		@param dir - the source directory
+		@param from - the source file to extract a fragment from
+		@param to - the file to write to
+	-->
+	<macrodef name="get-html-body">
+		<attribute default="${output.dir}/html" name="dir"/>
+		<attribute name="from"/>
+		<attribute default="${output.dir}/fragment.html" name="to"/>
+		<sequential>
+			<local name="htmlSource"/>
+			<local name="fragment"/>
+			<loadfile failonerror="true" property="htmlSource" srcfile="@{dir}/@{from}"/>
+			<find-body/>
+
+			<!-- strip out comments and save comments only to a separate file -->
+			<echo file="@{to}" message="${fragment}"/>	
+		</sequential>
+	</macrodef>
+
 	<!--
 		Extract the string between <article> tags.
 	-->
@@ -248,6 +270,15 @@
     onerror="ignore"
   />
 
+  	<!--
+		Extract the string between <Body> tags.
+	-->
+	<taskdef
+    classname="fox.jason.unittest.tasks.FindBodyTask"
+    name="find-body"
+    onerror="ignore"
+  />
+
 
 	<!-- 
 		Obtain a test resource from any of the following: