diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml b/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml index 2f77c98b6..230d9d750 100644 --- a/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml +++ b/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml @@ -31,12 +31,5 @@ under the License. UTF-8 - - - junit - junit - 3.8.1 - test - - + diff --git a/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java deleted file mode 100644 index 0954cf2d6..000000000 --- a/src/it/MCOMPILER-170/mcompiler-170-1/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java +++ /dev/null @@ -1,34 +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.maven.plugins.compiler.it; - -import org.junit.jupiter.api.Test; - -/** - * Unit test for simple App. - */ -public class AppTest { - /** - * Rigourous Test :-) - */ - @Test - public void testApp() { - assertTrue(true); - } -} diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml b/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml index cbd90e448..0228d414f 100644 --- a/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml +++ b/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml @@ -31,12 +31,4 @@ under the License. UTF-8 - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java deleted file mode 100644 index af3a45420..000000000 --- a/src/it/MCOMPILER-170/mcompiler-170-2/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java +++ /dev/null @@ -1,51 +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.maven.plugins.compiler.it; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml b/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml index a1b1dcf02..dd4d25dbc 100644 --- a/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml +++ b/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml @@ -31,12 +31,4 @@ under the License. UTF-8 - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java deleted file mode 100644 index af3a45420..000000000 --- a/src/it/MCOMPILER-170/mcompiler-170-3/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java +++ /dev/null @@ -1,51 +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.maven.plugins.compiler.it; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml b/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml index 77636abd7..7fec7df85 100644 --- a/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml +++ b/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml @@ -31,12 +31,4 @@ under the License. UTF-8 - - - junit - junit - 3.8.1 - test - - diff --git a/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java b/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java deleted file mode 100644 index af3a45420..000000000 --- a/src/it/MCOMPILER-170/mcompiler-170-4/src/test/java/org/apache/maven/plugins/compiler/it/AppTest.java +++ /dev/null @@ -1,51 +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.maven.plugins.compiler.it; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } - - /** - * Rigourous Test :-) - */ - public void testApp() { - assertTrue(true); - } -} diff --git a/src/it/MCOMPILER-268_modulepath/pom.xml b/src/it/MCOMPILER-268_modulepath/pom.xml index 9a4dbcb0f..9eb49cfd9 100644 --- a/src/it/MCOMPILER-268_modulepath/pom.xml +++ b/src/it/MCOMPILER-268_modulepath/pom.xml @@ -34,12 +34,6 @@ commons-lang3 3.18.0 - - junit - junit - 3.8.2 - test - diff --git a/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java deleted file mode 100644 index 072b8086e..000000000 --- a/src/it/MCOMPILER-268_modulepath/src/test/java/com/foo/MyTest.java +++ /dev/null @@ -1,25 +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 com.foo; - -import junit.framework.TestCase; - -public class MyTest extends TestCase { - private MyClass myClass = new MyClass(); -} diff --git a/src/it/MCOMPILER-270_release/pom.xml b/src/it/MCOMPILER-270_release/pom.xml index 0067c894d..dd525485a 100644 --- a/src/it/MCOMPILER-270_release/pom.xml +++ b/src/it/MCOMPILER-270_release/pom.xml @@ -30,14 +30,6 @@ UTF-8 - - - junit - junit - 3.8.2 - - - diff --git a/src/it/MCOMPILER-270_release/src/test/java/MyTest.java b/src/it/MCOMPILER-270_release/src/test/java/MyTest.java deleted file mode 100644 index 77db4f1d1..000000000 --- a/src/it/MCOMPILER-270_release/src/test/java/MyTest.java +++ /dev/null @@ -1,23 +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 foo; - -import junit.framework.TestCase; - -public class MyTest extends TestCase {} diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml index 0b30d9ec6..a13255a3b 100644 --- a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml +++ b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml @@ -32,13 +32,12 @@ - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test - diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java index 072b8086e..5cdd641df 100644 --- a/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java +++ b/src/it/MCOMPILER-275_separate-moduleinfo/src/test/java/com/foo/MyTest.java @@ -18,8 +18,15 @@ */ package com.foo; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class MyTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class MyTest { private MyClass myClass = new MyClass(); + + @Test + public void testApp() { + assertTrue(true); + } } diff --git a/src/it/MCOMPILER-284/pom.xml b/src/it/MCOMPILER-284/pom.xml index 0c35ed05c..962348d8a 100644 --- a/src/it/MCOMPILER-284/pom.xml +++ b/src/it/MCOMPILER-284/pom.xml @@ -32,13 +32,12 @@ - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test - diff --git a/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java b/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java index 072b8086e..5cdd641df 100644 --- a/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java +++ b/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java @@ -18,8 +18,15 @@ */ package com.foo; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class MyTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class MyTest { private MyClass myClass = new MyClass(); + + @Test + public void testApp() { + assertTrue(true); + } } diff --git a/src/it/default-fork-windows/pom.xml b/src/it/default-fork-windows/pom.xml index 9926604f1..41dbf515b 100644 --- a/src/it/default-fork-windows/pom.xml +++ b/src/it/default-fork-windows/pom.xml @@ -29,15 +29,14 @@ UTF-8 - - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 + test - diff --git a/src/it/default-fork-windows/src/test/java/MyTest.java b/src/it/default-fork-windows/src/test/java/MyTest.java index 77db4f1d1..8bbd42507 100644 --- a/src/it/default-fork-windows/src/test/java/MyTest.java +++ b/src/it/default-fork-windows/src/test/java/MyTest.java @@ -18,6 +18,12 @@ */ package foo; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class MyTest extends TestCase {} +public class MyTest { + + @Test + public void test() { + System.out.println("test"); + } +} diff --git a/src/it/default-fork/pom.xml b/src/it/default-fork/pom.xml index 9926604f1..a2e2da97f 100644 --- a/src/it/default-fork/pom.xml +++ b/src/it/default-fork/pom.xml @@ -32,9 +32,10 @@ - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 + test diff --git a/src/it/default-fork/src/test/java/MyTest.java b/src/it/default-fork/src/test/java/MyTest.java index 77db4f1d1..8bbd42507 100644 --- a/src/it/default-fork/src/test/java/MyTest.java +++ b/src/it/default-fork/src/test/java/MyTest.java @@ -18,6 +18,12 @@ */ package foo; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class MyTest extends TestCase {} +public class MyTest { + + @Test + public void test() { + System.out.println("test"); + } +} diff --git a/src/it/default-incremental-disable/pom.xml b/src/it/default-incremental-disable/pom.xml index 1db8db573..3c8065cfb 100644 --- a/src/it/default-incremental-disable/pom.xml +++ b/src/it/default-incremental-disable/pom.xml @@ -29,15 +29,14 @@ UTF-8 - - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter-api + 5.14.0 + test - diff --git a/src/it/default-incremental-disable/src/test/java/foo/MyTest.java b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java index 77db4f1d1..8bbd42507 100644 --- a/src/it/default-incremental-disable/src/test/java/foo/MyTest.java +++ b/src/it/default-incremental-disable/src/test/java/foo/MyTest.java @@ -18,6 +18,12 @@ */ package foo; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class MyTest extends TestCase {} +public class MyTest { + + @Test + public void test() { + System.out.println("test"); + } +} diff --git a/src/it/default/pom.xml b/src/it/default/pom.xml index 01ee3ad46..b9d081ca1 100644 --- a/src/it/default/pom.xml +++ b/src/it/default/pom.xml @@ -30,14 +30,6 @@ UTF-8 - - - junit - junit - 3.8.2 - - - diff --git a/src/it/default/src/test/java/MyTest.java b/src/it/default/src/test/java/MyTest.java index 77db4f1d1..08064cd35 100644 --- a/src/it/default/src/test/java/MyTest.java +++ b/src/it/default/src/test/java/MyTest.java @@ -18,6 +18,4 @@ */ package foo; -import junit.framework.TestCase; - -public class MyTest extends TestCase {} +public class MyTest {} diff --git a/src/it/includes-excludes/pom.xml b/src/it/includes-excludes/pom.xml index 3f28af7a9..3fe396cf4 100644 --- a/src/it/includes-excludes/pom.xml +++ b/src/it/includes-excludes/pom.xml @@ -29,14 +29,12 @@ under the License. - junit - junit - 3.8.2 - jar + org.junit.jupiter + junit-jupiter-api + 5.14.0 test - diff --git a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java index f36016586..848ab311c 100644 --- a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java +++ b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTest.java @@ -18,9 +18,13 @@ */ package org.apache.maven.it0055; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class PersonTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class PersonTest { + + @Test public void testPerson() { Person person = new Person(); diff --git a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java index a9096ee39..96a6c29db 100644 --- a/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java +++ b/src/it/includes-excludes/src/test/java/org/apache/maven/it0055/PersonTwoTest.java @@ -18,9 +18,13 @@ */ package org.apache.maven.it0055; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class PersonTwoTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class PersonTwoTest { + + @Test public void testPerson() { Person person = new Person(); diff --git a/src/it/jdk16-annotation/pom.xml b/src/it/jdk16-annotation/pom.xml index fff3e23cc..119bece9c 100644 --- a/src/it/jdk16-annotation/pom.xml +++ b/src/it/jdk16-annotation/pom.xml @@ -25,13 +25,12 @@ under the License. - junit - junit - 3.8.1 + org.junit.jupiter + junit-jupiter-api + 5.14.0 test - diff --git a/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java b/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java index 63bde8ed8..6ec945867 100644 --- a/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java +++ b/src/it/jdk16-annotation/src/test/java/com/mycompany/jdk16annotation/AppTest.java @@ -18,34 +18,20 @@ */ package com.mycompany.jdk16annotation; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for simple App. */ @ServiceProvider(service = App.class, path = "xxx", position = 1) -public class AppTest extends TestCase { - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest(String testName) { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() { - return new TestSuite(AppTest.class); - } +public class AppTest { /** * Rigourous Test :-) */ + @Test public void testApp() { assertTrue(true); }