From 60dee71880872406ebdc488d5165403aa836d44e Mon Sep 17 00:00:00 2001
From: Liam Williams <liam.williams@zoho.com>
Date: Tue, 8 Jan 2019 17:22:23 +0000
Subject: [PATCH] Use junit-platform-console-standalone so that both JUnit4 and
 JUnit5 tests can be run

---
 .idea/misc.xml           |  5 +----
 build.xml                |  2 +-
 build/build.dependencies |  2 +-
 build/macros.xml         | 25 +++++++++++++------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a0e862e2..1984f6fb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,9 +9,6 @@
     <option name="id" value="1417888591523" />
     <option name="name" value="default" />
   </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="IdProvider" IDEtalkID="BB54260B97B56A66832099915752DC33" />
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" />
@@ -65,7 +62,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="1.8.0_181" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="RegexUtilComponent" text="1900-01-01 2007/08/13 1900.01.01 1900 01 01 1900-01.01 1900 13 01 1900 02 31" flags="0" regex="(19|20)\d\d([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])" mode="0" />
diff --git a/build.xml b/build.xml
index e7605e62..220e249d 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,7 @@
     </target>
 
     <target name="test">
-        <test jar="${test.jar.path}" classpathref="all.jars" reports="${reports}"/>
+        <test jar="${test.jar.path}" classpathref="all.jars" reports="${reports}" package="com.googlecode.yatspec"/>
     </target>
 
     <target name="package">
diff --git a/build/build.dependencies b/build/build.dependencies
index 5165df6c..87bbc41a 100644
--- a/build/build.dependencies
+++ b/build/build.dependencies
@@ -1,6 +1,6 @@
 mvn:org.hamcrest:hamcrest-core:jar:1.2
 mvn:org.hamcrest:hamcrest-library:jar:1.2
-mvn:junit:junit-dep:jar|sources:4.8.2
+mvn:org.junit.platform:junit-platform-console-standalone:jar:1.3.2
 
 mvn:antlr:antlr:jar:2.7.7
 mvn:org.antlr:stringtemplate:jar:3.2.1
diff --git a/build/macros.xml b/build/macros.xml
index 47eb2b9e..59011b31 100644
--- a/build/macros.xml
+++ b/build/macros.xml
@@ -68,29 +68,30 @@
         <attribute name="jar"/>
         <attribute name="reports"/>
         <attribute name="classpathref"/>
+        <attribute name="package"/>
 
         <sequential>
             <mkdir dir="@{reports}"/>
             <property name="unzipped.jar" value="@{reports}.unzipped.jar"/>
             <mkdir dir="${unzipped.jar}"/>
             <unzip dest="${unzipped.jar}" src="@{jar}"/>
-            <junit printsummary="no" fork="on" failureproperty="failed" forkmode="once">
+            <!-- https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher -->
+            <java classpathref="@{classpathref}" classname="org.junit.platform.console.ConsoleLauncher" fork="true" failonerror="true">
+                <arg value="--select-package=@{package}"/>
+                <arg value="--fail-if-no-tests"/>
+                <arg line="--reports-dir @{reports}"/>
                 <sysproperty key="yatspec.output.dir" value="@{reports}"/>
                 <sysproperty key="yatspec.index.enable" value="true"/>
                 <!--<jvmarg value="-Xdebug"/>-->
                 <!--<jvmarg value="-Xrunjdwp:transport=dt_socket,server=n,address=nurofen:5005,suspend=y"/>-->
-                <classpath refid="@{classpathref}"/>
-                <formatter type="xml"/>
-                <batchtest todir="@{reports}">
-                    <fileset dir="${unzipped.jar}">
-                        <include name="**/*Test.class"/>
-                        <exclude name="**/*$*"/>
-                    </fileset>
-                </batchtest>
-            </junit>
-
+            </java>
+            <junitreport todir="@{reports}">
+                <fileset dir="@{reports}">
+                    <include name="TEST-*.xml"/>
+                </fileset>
+                <report format="frames" todir="@{reports}/html"/>
+            </junitreport>
             <delete dir="${unzipped.jar}"/>
-            <fail message="Tests failed" if="failed"/>
         </sequential>
     </macrodef>