Repository: ant Updated Branches: refs/heads/master e648224f5 -> ffb80b688
move the junitlauncher jupiter sample test to the org/example directory, just like the vintage engine ones Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0ed31483 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0ed31483 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0ed31483 Branch: refs/heads/master Commit: 0ed314833651436d7662858d070e5d71d81bb0c3 Parents: e648224 Author: Jaikiran Pai <[email protected]> Authored: Wed Aug 15 10:26:29 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Wed Aug 15 10:26:29 2018 +0530 ---------------------------------------------------------------------- build.xml | 14 ++-- .../taskdefs/optional/junitlauncher.xml | 3 - .../example/jupiter/JupiterSampleTest.java | 67 -------------------- .../jupiter/JupiterSampleTest.java | 67 ++++++++++++++++++++ 4 files changed, 77 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/0ed31483/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index c148105..9945d71 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"> http://git-wip-us.apache.org/repos/asf/ant/blob/0ed31483/src/etc/testcases/taskdefs/optional/junitlauncher.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml index 81861a7..0facadd 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> http://git-wip-us.apache.org/repos/asf/ant/blob/0ed31483/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java deleted file mode 100644 index 07b0a0f..0000000 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional.junitlauncher.example.jupiter; - -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.fail; - -/** - * - */ -public class JupiterSampleTest { - - private static final String message = "The quick brown fox jumps over the lazy dog"; - - @BeforeAll - static void beforeAll() { - } - - @BeforeEach - void beforeEach() { - } - - @Test - void testSucceeds() { - System.out.println(message); - System.out.print("<some-other-message>Hello world! <!-- some comment --></some-other-message>"); - } - - @Test - void testFails() { - fail("intentionally failing"); - } - - @Test - @Disabled("intentionally skipped") - void testSkipped() { - } - - @AfterEach - void afterEach() { - } - - @AfterAll - static void afterAll() { - } -} http://git-wip-us.apache.org/repos/asf/ant/blob/0ed31483/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java b/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java new file mode 100644 index 0000000..b11286b --- /dev/null +++ b/src/tests/junit/org/example/junitlauncher/jupiter/JupiterSampleTest.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.example.junitlauncher.jupiter; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.fail; + +/** + * + */ +public class JupiterSampleTest { + + private static final String message = "The quick brown fox jumps over the lazy dog"; + + @BeforeAll + static void beforeAll() { + } + + @BeforeEach + void beforeEach() { + } + + @Test + void testSucceeds() { + System.out.println(message); + System.out.print("<some-other-message>Hello world! <!-- some comment --></some-other-message>"); + } + + @Test + void testFails() { + fail("intentionally failing"); + } + + @Test + @Disabled("intentionally skipped") + void testSkipped() { + } + + @AfterEach + void afterEach() { + } + + @AfterAll + static void afterAll() { + } +}
