Skip to content

Add a jupiter-tests target to run JUnit 5 tests#235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slachiewicz wants to merge 1 commit into
base:master
Choose a base branch
from
+46 −3
Open

Add a jupiter-tests target to run JUnit 5 tests #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion build.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
<property name="build.junit.xml" location="${build.tests}/xml"/>
<property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
<property name="build.junit.reports" location="${build.tests}/reports"/>
<property name="build.jupiter.xml" location="${build.tests}/jupiter-xml"/>
<property name="build.pkg.dir" value="${build.dir}/pkg"/>
<property name="antunit.xml" location="${build.dir}/antunit/xml"/>
<property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
Expand DownExpand Up@@ -239,6 +240,14 @@
</or>
</selector>

<!-- Tests written against JUnit 5. Run by the jupiter-tests target; the junit
task cannot run them, so it excludes this same selector. -->
<selector id="jupiter.tests">
<or>
<filename name="${ant.package}/util/UnicodeUtilTest.*"/>
</or>
</selector>

<selector id="needs.apache-regexp">
<filename name="${regexp.package}/JakartaRegexp*"/>
</selector>
Expand DownExpand Up@@ -1916,7 +1925,36 @@ ${antunit.reports}
</junitreport>
</target>

<target name="junit-tests" depends="junit-batch,graaljs-tests,junit-single-test"/>
<target name="junit-tests" depends="junit-batch,graaljs-tests,junit-single-test,jupiter-tests"/>

<target name="jupiter-tests" depends="compile-tests,test-init"
if="junit.engine.jupiter.present"
description="--> runs the JUnit 5 tests">
<!-- A report whose test class is gone would still be picked up by the concat below. -->
<delete dir="${build.jupiter.xml}"/>
<mkdir dir="${build.jupiter.xml}"/>

<junitlauncher printSummary="${junit.summary}" failureProperty="junit.failed">
<classpath refid="tests-runtime-classpath"/>
<testclasses outputdir="${build.jupiter.xml}">
<fileset dir="${build.tests}">
<selector refid="jupiter.tests"/>
</fileset>
<listener type="legacy-plain" sendSysOut="true"/>
</testclasses>
</junitlauncher>

<!-- legacy-plain writes to files only, so print the failing ones. The fileset
selects nothing when the run passed. -->
<concat>
<fileset dir="${build.jupiter.xml}" includes="TEST-*.txt">
<or>
<contains text="FAILED"/>
<contains text="Caused an ERROR"/>
</or>
</fileset>
</concat>
</target>

<target name="graaljs-tests" depends="compile-tests,test-init"
if="graaljs.present">
Expand DownExpand Up@@ -1983,6 +2021,11 @@ ${antunit.reports}
<!-- JUnit 5 / junitlauncher tests that aren't meant to run by junit task -->
<exclude name="${optional.package}/junitlauncher/"/>

<!-- JUnit 5 tests, run by the jupiter-tests target -->
<none>
<selector refid="jupiter.tests"/>
</none>

<!-- interactive tests -->
<exclude name="${taskdefs.package}/TestProcess.java"/>
<exclude name="${optional.package}/splash/SplashScreenTest.java"/>
Expand Down
4 changes: 2 additions & 2 deletions src/tests/junit/org/apache/tools/ant/util/UnicodeUtilTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,9 @@
*/
package org.apache.tools.ant.util;

import org.junit.Test;
import org.junit.jupiter.api.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

public class UnicodeUtilTest {

Expand Down