Skip to content

Commit 0814360

Browse files
slachiewiczslachiewicz
committed
Partially migrate to JUnit 5
1 parent cb3e59e commit 0814360

File tree

11 files changed

+101
-75
lines changed

11 files changed

+101
-75
lines changed

‎modello-core/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@
4949
<scope>runtime</scope>
5050
<optional>true</optional>
5151
</dependency>
52+
<dependency>
53+
<groupId>org.junit.jupiter</groupId>
54+
<artifactId>junit-jupiter-api</artifactId>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.codehaus.plexus</groupId>
59+
<artifactId>plexus-testing</artifactId>
60+
<scope>test</scope>
61+
</dependency>
5262
</dependencies>
5363

5464
<build>

‎modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,27 @@
2222
* SOFTWARE.
2323
*/
2424

25+
import javax.inject.Inject;
26+
2527
import org.codehaus.modello.ModelloRuntimeException;
26-
import org.codehaus.plexus.ContainerConfiguration;
27-
import org.codehaus.plexus.PlexusConstants;
28-
import org.codehaus.plexus.PlexusTestCase;
28+
import org.codehaus.plexus.testing.PlexusTest;
29+
import org.junit.jupiter.api.Test;
30+
31+
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
32+
import static org.junit.jupiter.api.Assertions.assertEquals;
33+
import static org.junit.jupiter.api.Assertions.fail;
2934

3035
/**
3136
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
3237
*/
33-
public class DefaultModelloCoreTest extends PlexusTestCase {
34-
public void testModelWithDuplicateClasses() throws Exception {
35-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
38+
@PlexusTest
39+
class DefaultModelloCoreTest {
3640

41+
@Inject
42+
ModelloCore modello;
43+
44+
@Test
45+
void modelWithDuplicateClasses() throws Exception {
3746
try {
3847
modello.loadModel(getTestFile("src/test/resources/models/duplicate-classes.mdo"));
3948

@@ -43,9 +52,8 @@ public void testModelWithDuplicateClasses() throws Exception {
4352
}
4453
}
4554

46-
public void testModelWithDuplicateFields() throws Exception {
47-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
48-
55+
@Test
56+
void modelWithDuplicateFields() throws Exception {
4957
try {
5058
modello.loadModel(getTestFile("src/test/resources/models/duplicate-fields.mdo"));
5159

@@ -55,9 +63,8 @@ public void testModelWithDuplicateFields() throws Exception {
5563
}
5664
}
5765

58-
public void testModelWithDuplicateAssociations() throws Exception {
59-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
60-
66+
@Test
67+
void modelWithDuplicateAssociations() throws Exception {
6168
try {
6269
modello.loadModel(getTestFile("src/test/resources/models/duplicate-associations.mdo"));
6370

@@ -67,15 +74,8 @@ public void testModelWithDuplicateAssociations() throws Exception {
6774
}
6875
}
6976

70-
public void testRecursion() throws Exception {
71-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
72-
77+
@Test
78+
void recursion() throws Exception {
7379
modello.loadModel(getTestFile("src/test/resources/models/recursion.mdo"));
7480
}
75-
76-
@Override
77-
protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
78-
configuration.setAutoWiring(true);
79-
configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX);
80-
}
8181
}

‎modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* SOFTWARE.
2323
*/
2424

25+
import javax.inject.Inject;
26+
2527
import java.util.List;
2628

2729
import org.codehaus.modello.core.ModelloCore;
@@ -31,18 +33,24 @@
3133
import org.codehaus.modello.model.ModelField;
3234
import org.codehaus.modello.model.Version;
3335
import org.codehaus.modello.model.VersionRange;
34-
import org.codehaus.plexus.ContainerConfiguration;
35-
import org.codehaus.plexus.PlexusConstants;
36-
import org.codehaus.plexus.PlexusTestCase;
36+
import org.codehaus.plexus.testing.PlexusTest;
37+
import org.junit.jupiter.api.Test;
38+
39+
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
40+
import static org.junit.jupiter.api.Assertions.*;
3741

3842
/**
3943
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
4044
* @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
4145
*/
42-
public class ModelReaderTest extends PlexusTestCase {
43-
public void testBasic() throws Exception {
44-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
46+
@PlexusTest
47+
class ModelReaderTest {
48+
49+
@Inject
50+
ModelloCore modello;
4551

52+
@Test
53+
void basic() throws Exception {
4654
Model model = modello.loadModel(getTestFile("src/test/resources/models/simple.mdo"));
4755

4856
assertNotNull(model);
@@ -73,14 +81,13 @@ public void testBasic() throws Exception {
7381
assertGirl(model.getClass("Girl", new VersionRange("1.0.0")));
7482
}
7583

76-
public void testAssociationDefaultValues() throws Exception {
77-
ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE);
78-
84+
@Test
85+
void associationDefaultValues() throws Exception {
7986
Model model = modello.loadModel(getTestFile("src/test/resources/models/association.mdo"));
8087

8188
ModelField field = model.getClass("Foo", new VersionRange("1.0.0")).getField("bars", new VersionRange("1.0.0"));
8289

83-
assertTrue(field instanceof ModelAssociation);
90+
assertInstanceOf(ModelAssociation.class, field);
8491

8592
ModelAssociation association = (ModelAssociation) field;
8693

@@ -102,7 +109,7 @@ public void testAssociationDefaultValues() throws Exception {
102109
}
103110

104111
private void assertBoy(Object boyObject) {
105-
assertTrue(boyObject instanceof ModelClass);
112+
assertInstanceOf(ModelClass.class, boyObject);
106113

107114
ModelClass boy = (ModelClass) boyObject;
108115

@@ -122,7 +129,7 @@ private void assertBoy(Object boyObject) {
122129
}
123130

124131
private void assertBoyName(Object nameObject) {
125-
assertTrue(nameObject instanceof ModelField);
132+
assertInstanceOf(ModelField.class, nameObject);
126133

127134
ModelField name = (ModelField) nameObject;
128135

@@ -136,7 +143,7 @@ private void assertBoyName(Object nameObject) {
136143
}
137144

138145
private void assertGirl(Object girlObject) {
139-
assertTrue(girlObject instanceof ModelClass);
146+
assertInstanceOf(ModelClass.class, girlObject);
140147

141148
ModelClass girl = (ModelClass) girlObject;
142149

@@ -156,7 +163,7 @@ private void assertGirl(Object girlObject) {
156163
}
157164

158165
private void assertGirlAge(Object ageObject) {
159-
assertTrue(ageObject instanceof ModelField);
166+
assertInstanceOf(ModelField.class, ageObject);
160167

161168
ModelField age = (ModelField) ageObject;
162169

@@ -166,10 +173,4 @@ private void assertGirlAge(Object ageObject) {
166173

167174
assertEquals("int", age.getType());
168175
}
169-
170-
@Override
171-
protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
172-
configuration.setAutoWiring(true);
173-
configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX);
174-
}
175176
}

‎modello-core/src/test/java/org/codehaus/modello/model/VersionDefinitionTest.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
package org.codehaus.modello.model;
22

3-
import junit.framework.TestCase;
3+
import org.junit.jupiter.api.Test;
44

5-
public class VersionDefinitionTest extends TestCase {
5+
import static org.junit.jupiter.api.Assertions.assertFalse;
6+
import static org.junit.jupiter.api.Assertions.assertTrue;
67

7-
public void testFieldType() {
8+
class VersionDefinitionTest {
9+
10+
@Test
11+
void fieldType() {
812
VersionDefinition def = new VersionDefinition();
913
def.setType("field");
1014
assertTrue(def.isFieldType());
1115
assertFalse(def.isNamespaceType());
1216
}
1317

14-
public void testNamespaceType() {
18+
@Test
19+
void namespaceType() {
1520
VersionDefinition def = new VersionDefinition();
1621
def.setType("namespace");
1722
assertTrue(def.isNamespaceType());
1823
assertFalse(def.isFieldType());
1924
}
2025

21-
public void testFieldAndNamespaceType() {
26+
@Test
27+
void fieldAndNamespaceType() {
2228
VersionDefinition def = new VersionDefinition();
2329
def.setType("field+namespace");
2430
assertTrue(def.isFieldType());

‎modello-core/src/test/java/org/codehaus/modello/model/VersionTest.java

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
package org.codehaus.modello.model;
2-
32
/*
43
* Copyright (c) 2004, Jason van Zyl
54
*
@@ -21,16 +20,20 @@
2120
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2221
* SOFTWARE.
2322
*/
23+
import org.junit.jupiter.api.Test;
2424

25-
import junit.framework.TestCase;
25+
import static org.junit.jupiter.api.Assertions.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertFalse;
27+
import static org.junit.jupiter.api.Assertions.assertTrue;
2628

2729
/**
2830
* @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
2931
*/
30-
public class VersionTest extends TestCase {
32+
class VersionTest {
3133
// TODO: Add testing for multidigit version numbers
3234
// TODO: Add tests for invalid version strings
33-
public void testVersionParsing() {
35+
@Test
36+
void versionParsing() {
3437
Version version = new Version("1.2.3");
3538

3639
assertEquals(1, version.getMajor());
@@ -40,7 +43,8 @@ public void testVersionParsing() {
4043
assertEquals(3, version.getMicro());
4144
}
4245

43-
public void testVersionRange() {
46+
@Test
47+
void versionRange() {
4448
VersionRange range = new VersionRange("2.0.0+");
4549

4650
assertFalse(new Version("1.0.0").inside(range));
@@ -49,36 +53,39 @@ public void testVersionRange() {
4953

5054
assertTrue(new Version("3.0.0").inside(range));
5155

52-
assertTrue(new Version("2.0.0").equals(range.getFromVersion()));
56+
assertEquals(new Version("2.0.0"), range.getFromVersion());
5357

54-
assertTrue(Version.INFINITE.equals(range.getToVersion()));
58+
assertEquals(Version.INFINITE, range.getToVersion());
5559

5660
range = new VersionRange("1.0.0");
5761

58-
assertTrue(new Version("1.0.0").equals(range.getFromVersion()));
62+
assertEquals(new Version("1.0.0"), range.getFromVersion());
5963

60-
assertTrue(new Version("1.0.0").equals(range.getToVersion()));
64+
assertEquals(new Version("1.0.0"), range.getToVersion());
6165

6266
range = new VersionRange("1.0.0/3.0.0");
6367

64-
assertTrue(new Version("1.0.0").equals(range.getFromVersion()));
68+
assertEquals(new Version("1.0.0"), range.getFromVersion());
6569

66-
assertTrue(new Version("3.0.0").equals(range.getToVersion()));
70+
assertEquals(new Version("3.0.0"), range.getToVersion());
6771
}
6872

69-
public void testGreaterThanWhenFooIsLessThanBar() {
73+
@Test
74+
void greaterThanWhenFooIsLessThanBar() {
7075
assertNotGreaterThan("1.0.0", "2.9.9");
7176
assertNotGreaterThan("1.9.9", "2.0.0");
7277
assertNotGreaterThan("0.1.0", "0.2.9");
7378
assertNotGreaterThan("0.1.1", "0.2.0");
7479
assertNotGreaterThan("0.0.1", "0.0.1");
7580
}
7681

77-
public void testGreaterThanWhenFooIsEqualBar() {
82+
@Test
83+
void greaterThanWhenFooIsEqualBar() {
7884
assertNotGreaterThan("1.2.3", "1.2.3");
7985
}
8086

81-
public void testGreaterThanWhenFooIsGreaterThanBar() {
87+
@Test
88+
void greaterThanWhenFooIsGreaterThanBar() {
8289
assertGreaterThan("2.0.0", "1.9.9");
8390
assertGreaterThan("2.9.9", "1.0.0");
8491
assertGreaterThan("0.2.9", "0.1.0");

‎modello-maven-plugin/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@
143143
<artifactId>slf4j-simple</artifactId>
144144
<scope>test</scope>
145145
</dependency>
146+
<dependency>
147+
<groupId>junit</groupId>
148+
<artifactId>junit</artifactId>
149+
<scope>test</scope>
150+
</dependency>
146151
</dependencies>
147152

148153
<reporting>
@@ -162,7 +167,6 @@
162167
<plugin>
163168
<groupId>org.apache.maven.plugins</groupId>
164169
<artifactId>maven-invoker-plugin</artifactId>
165-
<version>3.9.0</version>
166170
<configuration>
167171
<projectsDirectory>src/it</projectsDirectory>
168172
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -175,7 +179,7 @@
175179
<debug>true</debug>
176180
<filterProperties>
177181
<plexusUtilsVersion>3.0.22</plexusUtilsVersion>
178-
<junitVersion>4.13.2</junitVersion>
182+
<junit4Version>${junit4Version}</junit4Version>
179183
<java.version>${java.version}</java.version>
180184
<jdom.version>${jdom.version}</jdom.version>
181185
</filterProperties>

‎modello-maven-plugin/src/it/clone-java5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>junit</groupId>
2323
<artifactId>junit</artifactId>
24-
<version>@junitVersion@</version>
24+
<version>@junit4Version@</version>
2525
</dependency>
2626
</dependencies>
2727

‎modello-maven-plugin/src/it/clone/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>junit</groupId>
2323
<artifactId>junit</artifactId>
24-
<version>@junitVersion@</version>
24+
<version>@junit4Version@</version>
2525
</dependency>
2626
</dependencies>
2727

‎modello-maven-plugin/src/it/javadoc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>junit</groupId>
1818
<artifactId>junit</artifactId>
19-
<version>@junitVersion@</version>
19+
<version>@junit4Version@</version>
2020
</dependency>
2121

2222
<dependency>

‎modello-maven-plugin/src/it/maven-model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>junit</groupId>
5353
<artifactId>junit</artifactId>
54-
<version>4.13.1</version>
54+
<version>@junit4Version@</version>
5555
</dependency>
5656
</dependencies>
5757
</project>

0 commit comments

Comments
 (0)