Skip to content

Commit fdc2f1a

Browse files
Remove JUnit 3 references, drop usage of TestCase
1 parent 2c013b6 commit fdc2f1a

File tree

78 files changed

+156
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+156
-618
lines changed

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void testNoClassDefFromMojoLoad() throws IOException, VerificationExcepti
6464
int msg = indexOf(lines, "(?i).*required class is missing.*");
6565
assertTrue("User-friendly message was not found in output.", msg >= 0);
6666

67-
int cls = lines.get(msg).toString().replace('/', '.').indexOf("junit.framework.TestCase");
67+
int cls = lines.get(msg).toString().replace('/', '.').indexOf("org.apache.commons.lang3.StringUtils");
6868
assertTrue("Missing class name was not found in output.", cls >= 0);
6969
}
7070

@@ -89,7 +89,7 @@ public void testNoClassDefFromMojoConfiguration() throws IOException, Verificati
8989
int msg = indexOf(lines, "(?i).*required class (i|wa)s missing( during (mojo )?configuration)?.*");
9090
assertTrue("User-friendly message was not found in output.", msg >= 0);
9191

92-
int cls = lines.get(msg).toString().replace('/', '.').indexOf("junit.framework.TestCase");
92+
int cls = lines.get(msg).toString().replace('/', '.').indexOf("org.apache.commons.lang3.StringUtils");
9393
assertTrue("Missing class name was not found in output.", cls >= 0);
9494
}
9595

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testBuildFailureUTFail() throws Exception {
6363
} catch (VerificationException e) {
6464
// expected, as the build will fail due to always failing UT
6565
}
66-
verifier.verifyTextInLog("testApp(org.apache.maven.its.mng5640.FailingTest)");
66+
verifier.verifyTextInLog("org.apache.maven.its.mng5640.FailingTest.testApp()");
6767

6868
verifier.verifyFilePresent("target/afterProjectsRead.txt");
6969
// See https://issues.apache.org/jira/browse/MNG-5641

core-it-suite/src/test/resources/it0030/child-hierarchy/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,4 @@
1313
<module>project1</module>
1414
<module>project2</module>
1515
</modules>
16-
<dependencies>
17-
<dependency>
18-
<groupId>junit</groupId>
19-
<artifactId>junit</artifactId>
20-
<scope>test</scope>
21-
</dependency>
22-
</dependencies>
2316
</project>

core-it-suite/src/test/resources/it0030/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
</modules>
1414
<dependencyManagement>
1515
<dependencies>
16-
<dependency>
17-
<groupId>junit</groupId>
18-
<artifactId>junit</artifactId>
19-
<version>3.8.1</version>
20-
</dependency>
2116
<dependency>
2217
<groupId>org.apache.maven.its.it0030</groupId>
2318
<artifactId>project1</artifactId>

core-it-suite/src/test/resources/mng-0666/repo/org/apache/maven/its/it0059/test/3.8.1/test-3.8.1.jar.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

core-it-suite/src/test/resources/mng-0666/repo/org/apache/maven/its/it0059/test/3.8.1/test-3.8.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project>
2-
<groupId>junit</groupId>
3-
<artifactId>junit</artifactId>
2+
<groupId>test</groupId>
3+
<artifactId>test</artifactId>
44
<version>3.8.1</version>
55
</project>

core-it-suite/src/test/resources/mng-0666/repo/org/apache/maven/its/it0059/test/3.8.1/test-3.8.1.pom.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

core-it-suite/src/test/resources/mng-0666/repo/org/apache/maven/its/it0059/test/3.8.1/test-3.8.1.pom.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,12 @@
1818
*/
1919
package com.stchome.mavenTest.it0096;
2020

21-
import junit.framework.Test;
22-
import junit.framework.TestCase;
23-
import junit.framework.TestSuite;
24-
2521
/**
2622
* Unit test for simple App.
2723
*/
28-
public class AppTest extends TestCase {
29-
/**
30-
* Create the test case
31-
*
32-
* @param testName name of the test case
33-
*/
34-
public AppTest(String testName) {
35-
super(testName);
36-
}
37-
38-
/**
39-
* @return the suite of tests being tested
40-
*/
41-
public static Test suite() {
42-
return new TestSuite(AppTest.class);
43-
}
44-
24+
public class AppTest {
4525
/**
4626
* Rigourous Test :-)
4727
*/
48-
public void testApp() {
49-
assertTrue(true);
50-
}
28+
public void testApp() {}
5129
}

0 commit comments

Comments
 (0)