From 0ed314833651436d7662858d070e5d71d81bb0c3 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Wed, 15 Aug 2018 10:26:29 +0530
Subject: [PATCH] move the junitlauncher jupiter sample test to the org/example
 directory, just like the vintage engine ones

---
 build.xml                                          | 14 ++++++++++----
 .../testcases/taskdefs/optional/junitlauncher.xml  |  3 ---
 .../junitlauncher}/jupiter/JupiterSampleTest.java  |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename src/tests/junit/org/{apache/tools/ant/taskdefs/optional/junitlauncher/example => example/junitlauncher}/jupiter/JupiterSampleTest.java (95%)

diff --git a/build.xml b/build.xml
index c148105d0..9945d71d1 100644
--- a/build.xml
+++ b/build.xml
@@ -213,13 +213,19 @@
   </selector>
 
   <selector id="needs.junit.engine.vintage">
-    <!-- we need JUnit vintage engine only in tests where we test the junitlauncher task -->
-    <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+    <or>
+      <!-- we need JUnit vintage engine only in tests where we test the junitlauncher task -->
+      <filename name="${optional.package}/junitlauncher/**/*"/>
+      <filename name="org/example/junitlauncher/vintage/**/*"/>
+    </or>
   </selector>
 
   <selector id="needs.junit.engine.jupiter">
-    <!-- we need JUnit jupiter engine only in tests where we test the junitlauncher task -->
-    <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+    <or>
+      <!-- we need JUnit jupiter engine only in tests where we test the junitlauncher task -->
+      <filename name="${optional.package}/junitlauncher/**/*"/>
+      <filename name="org/example/junitlauncher/jupiter/**/*"/>
+    </or>
   </selector>
 
   <selector id="needs.apache-regexp">
diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
index 81861a79c..0facaddf2 100644
--- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml
+++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
@@ -103,9 +103,6 @@
                 <fileset dir="${build.classes.dir}">
                     <include name="org/example/**/junitlauncher/**/"/>
                 </fileset>
-                <fileset dir="${build.classes.dir}">
-                    <include name="org/apache/tools/ant/taskdefs/optional/junitlauncher/example/**/"/>
-                </fileset>
                 <listener type="legacy-brief" sendSysOut="true"/>
                 <listener type="legacy-xml" sendSysErr="true" sendSysOut="true"/>
             </testclasses>
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java b/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java
similarity index 95%
rename from src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java
rename to src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java
index 07b0a0f41..b11286b78 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java
+++ b/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.tools.ant.taskdefs.optional.junitlauncher.example.jupiter;
+package org.example.junitlauncher.jupiter;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;