Browse Source

move the junitlauncher jupiter sample test to the org/example directory, just like the vintage engine ones

master
Jaikiran Pai 6 years ago
parent
commit
0ed3148336
3 changed files with 11 additions and 8 deletions
  1. +10
    -4
      build.xml
  2. +0
    -3
      src/etc/testcases/taskdefs/optional/junitlauncher.xml
  3. +1
    -1
      src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java

+ 10
- 4
build.xml View File

@@ -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">


+ 0
- 3
src/etc/testcases/taskdefs/optional/junitlauncher.xml View File

@@ -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>


src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java → src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java View File

@@ -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;

Loading…
Cancel
Save