Skip to content
This repository was archived by the owner on Dec 4, 2024. It is now read-only.

Commit 7e3bced

Browse files
slachiewiczslachiewicz
authored
Switch to JUnit5 (#134)
1 parent 65a69ca commit 7e3bced

File tree

5 files changed

+128
-105
lines changed

5 files changed

+128
-105
lines changed

‎plexus-component-metadata/pom.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,20 @@
104104
<scope>provided</scope>
105105
</dependency>
106106
<dependency>
107-
<groupId>junit</groupId>
108-
<artifactId>junit</artifactId>
107+
<groupId>org.codehaus.plexus</groupId>
108+
<artifactId>plexus-testing</artifactId>
109+
<version>1.2.0</version>
110+
<scope>test</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.junit.jupiter</groupId>
114+
<artifactId>junit-jupiter-api</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.slf4j</groupId>
119+
<artifactId>slf4j-simple</artifactId>
120+
<version>1.7.36</version>
109121
<scope>test</scope>
110122
</dependency>
111123
</dependencies>

‎plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java‎

Lines changed: 39 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616

1717
package org.codehaus.plexus.metadata;
1818

19+
import javax.inject.Inject;
20+
1921
import java.io.File;
2022
import java.io.StringReader;
2123
import java.io.StringWriter;
2224
import java.util.Collections;
2325
import java.util.LinkedList;
2426
import java.util.List;
2527

26-
import org.codehaus.plexus.PlexusTestCase;
2728
import org.codehaus.plexus.classworlds.ClassWorld;
2829
import org.codehaus.plexus.classworlds.realm.ClassRealm;
2930
import org.codehaus.plexus.component.repository.*;
@@ -33,38 +34,36 @@
3334
import org.codehaus.plexus.metadata.merge.ComponentsXmlMerger;
3435
import org.codehaus.plexus.metadata.merge.Merger;
3536
import org.codehaus.plexus.metadata.merge.PlexusXmlMerger;
37+
import org.codehaus.plexus.testing.PlexusTest;
3638
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
3739
import org.jdom2.Document;
3840
import org.jdom2.Element;
3941
import org.jdom2.input.SAXBuilder;
42+
import org.junit.jupiter.api.Test;
43+
44+
import static org.junit.jupiter.api.Assertions.assertEquals;
45+
import static org.junit.jupiter.api.Assertions.assertNotNull;
46+
import static org.junit.jupiter.api.Assertions.assertTrue;
4047

4148
/**
4249
* Test for the {@link DefaultComponentDescriptorWriter} class.
4350
*
4451
* @version $Rev$ $Date$
4552
*/
46-
public class DefaultComponentDescriptorWriterTest extends PlexusTestCase {
47-
private DefaultComponentDescriptorWriter descriptorWriter;
48-
49-
// @Override
50-
protected void setUp() throws Exception {
51-
super.setUp();
52-
53-
descriptorWriter = (DefaultComponentDescriptorWriter) lookup(ComponentDescriptorWriter.class);
54-
assertNotNull(descriptorWriter);
55-
}
53+
@PlexusTest
54+
class DefaultComponentDescriptorWriterTest {
5655

57-
// @Override
58-
protected void tearDown() throws Exception {
59-
descriptorWriter = null;
56+
@Inject
57+
private DefaultComponentDescriptorWriter descriptorWriter;
6058

61-
super.tearDown();
62-
}
59+
@Inject
60+
private MetadataGenerator generator;
6361

64-
public void testBasic() throws Exception {
62+
@Test
63+
void testBasic() throws Exception {
6564
ComponentSetDescriptor set = new ComponentSetDescriptor();
6665

67-
ComponentDescriptor component = new ComponentDescriptor();
66+
ComponentDescriptor<String> component = new ComponentDescriptor<>();
6867
component.setImplementation("java.lang.String");
6968
component.setRole("foo");
7069
component.setRoleHint("bar");
@@ -105,8 +104,8 @@ public void testBasic() throws Exception {
105104
//
106105
}
107106

108-
public void testComponentsOrder() throws Exception {
109-
MetadataGenerator generator = lookup(MetadataGenerator.class);
107+
@Test
108+
void testComponentsOrder() throws Exception {
110109
assertNotNull(generator);
111110

112111
MetadataGenerationRequest request = new MetadataGenerationRequest();
@@ -118,58 +117,52 @@ public void testComponentsOrder() throws Exception {
118117

119118
generator.generateDescriptor(request);
120119

121-
assertTrue("Descriptor not generated", request.outputFile.exists());
120+
assertTrue(request.outputFile.exists(), "Descriptor not generated");
122121

123122
Document doc = new SAXBuilder().build(request.outputFile);
124123

125124
// check if the components are sorted by role+impl
126125
List<Element> components = doc.getRootElement().getChild("components").getChildren();
127-
assertEquals("Number of components", 5, components.size());
126+
assertEquals(5, components.size(), "Number of components");
128127

129128
assertEquals(
130-
"Component 1 role",
131129
ComponentDescriptorExtractor.class.getName(),
132-
components.get(0).getChild("role").getText());
130+
components.get(0).getChild("role").getText(),
131+
"Component 1 role");
133132
assertEquals(
134-
"Component 1 impl",
135133
ClassComponentDescriptorExtractor.class.getName(),
136-
components.get(0).getChild("implementation").getText());
134+
components.get(0).getChild("implementation").getText(),
135+
"Component 1 impl");
137136

138137
assertEquals(
139-
"Component 2 role",
140138
ComponentDescriptorExtractor.class.getName(),
141-
components.get(1).getChild("role").getText());
139+
components.get(1).getChild("role").getText(),
140+
"Component 2 role");
142141
assertEquals(
143-
"Component 2 impl",
144142
SourceComponentDescriptorExtractor.class.getName(),
145-
components.get(1).getChild("implementation").getText());
143+
components.get(1).getChild("implementation").getText(),
144+
"Component 2 impl");
146145

147146
assertEquals(
148-
"Component 3 role",
149147
MetadataGenerator.class.getName(),
150-
components.get(2).getChild("role").getText());
148+
components.get(2).getChild("role").getText(),
149+
"Component 3 role");
151150
assertEquals(
152-
"Component 3 impl",
153151
DefaultMetadataGenerator.class.getName(),
154-
components.get(2).getChild("implementation").getText());
152+
components.get(2).getChild("implementation").getText(),
153+
"Component 3 impl");
155154

155+
assertEquals(Merger.class.getName(), components.get(3).getChild("role").getText(), "Component 4 role");
156156
assertEquals(
157-
"Component 4 role",
158-
Merger.class.getName(),
159-
components.get(3).getChild("role").getText());
160-
assertEquals(
161-
"Component 4 impl",
162157
ComponentsXmlMerger.class.getName(),
163-
components.get(3).getChild("implementation").getText());
158+
components.get(3).getChild("implementation").getText(),
159+
"Component 4 impl");
164160

161+
assertEquals(Merger.class.getName(), components.get(4).getChild("role").getText(), "Component 5 role");
165162
assertEquals(
166-
"Component 5 role",
167-
Merger.class.getName(),
168-
components.get(4).getChild("role").getText());
169-
assertEquals(
170-
"Component 5 impl",
171163
PlexusXmlMerger.class.getName(),
172-
components.get(4).getChild("implementation").getText());
164+
components.get(4).getChild("implementation").getText(),
165+
"Component 5 impl");
173166
}
174167

175168
// TODO copied from PlexusTools.buildConfiguration() - find a better way to do this

‎plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/gleaner/AnnotationComponentGleanerTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,24 @@
1818

1919
import java.util.List;
2020

21-
import junit.framework.TestCase;
2221
import org.codehaus.plexus.component.repository.ComponentDescriptor;
2322
import org.codehaus.plexus.component.repository.ComponentRequirement;
2423
import org.codehaus.plexus.component.repository.ComponentRequirementList;
2524
import org.codehaus.plexus.configuration.PlexusConfiguration;
2625
import org.codehaus.plexus.metadata.gleaner.ann.AnnotatedComponent;
2726
import org.codehaus.plexus.metadata.gleaner.ann.AnnotatedComponentRole;
27+
import org.junit.jupiter.api.Test;
28+
29+
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
2831

2932
/**
3033
* @author Eugene Kuleshov
3134
*/
32-
public class AnnotationComponentGleanerTest extends TestCase {
35+
class AnnotationComponentGleanerTest {
3336

34-
public void testGlean() throws Exception {
37+
@Test
38+
void testGlean() throws Exception {
3539
AnnotationComponentGleaner gleaner = new AnnotationComponentGleaner();
3640
Class<AnnotatedComponent> c = AnnotatedComponent.class;
3741
ComponentDescriptor<?> descriptor = gleaner.glean(c.getName(), c.getClassLoader());
@@ -40,7 +44,7 @@ public void testGlean() throws Exception {
4044
assertEquals(AnnotatedComponentRole.class.getName(), descriptor.getRole());
4145

4246
List<ComponentRequirement> requirements = descriptor.getRequirements();
43-
assertEquals(requirements.toString(), 2, requirements.size());
47+
assertEquals(2, requirements.size(), requirements.toString());
4448

4549
ComponentRequirement requirement = requirements.get(0);
4650
assertEquals("dependency", requirement.getFieldName());

‎plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleanerTest.java‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,43 @@
2121
import com.thoughtworks.qdox.JavaProjectBuilder;
2222
import com.thoughtworks.qdox.model.JavaClass;
2323
import com.thoughtworks.qdox.model.JavaSource;
24-
import org.codehaus.plexus.PlexusTestCase;
2524
import org.codehaus.plexus.component.repository.ComponentDescriptor;
2625
import org.codehaus.plexus.component.repository.ComponentRequirement;
2726
import org.codehaus.plexus.configuration.PlexusConfiguration;
27+
import org.junit.jupiter.api.AfterEach;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
30+
31+
import static org.junit.jupiter.api.Assertions.assertEquals;
32+
import static org.junit.jupiter.api.Assertions.assertNotNull;
33+
import static org.junit.jupiter.api.Assertions.assertNull;
34+
import static org.junit.jupiter.api.Assertions.assertTrue;
2835

2936
/**
3037
* Tests for the {@link QDoxComponentGleaner} class.
3138
*
3239
* @version $Rev$ $Date$
3340
*/
34-
public class QDoxComponentGleanerTest extends PlexusTestCase {
41+
class QDoxComponentGleanerTest {
3542
private QDoxComponentGleaner gleaner;
3643

3744
private JavaProjectBuilder builder;
3845

39-
// @Override
40-
protected void setUp() throws Exception {
41-
super.setUp();
42-
46+
@BeforeEach
47+
public void setUp() {
4348
gleaner = new QDoxComponentGleaner();
4449
builder = new JavaProjectBuilder();
4550
}
4651

47-
// @Override
48-
protected void tearDown() throws Exception {
52+
@AfterEach
53+
protected void tearDown() {
4954
gleaner = null;
5055
builder = null;
51-
52-
super.tearDown();
5356
}
5457

5558
private JavaSource addSource(final String name) throws IOException {
5659
File url = new File(
57-
getBasedir(),
58-
"src/test/java/" + getClass().getPackage().getName().replace('.', '/') + "/" + name);
60+
".", "src/test/java/" + this.getClass().getPackage().getName().replace('.', '/') + "/" + name);
5961
assertTrue(url.exists());
6062
return builder.addSource(url);
6163
}
@@ -87,12 +89,14 @@ private ComponentDescriptor<?> glean(final String name) throws Exception {
8789
return glean(name, null);
8890
}
8991

90-
public void testNoAnnotationsClass() throws Exception {
92+
@Test
93+
void testNoAnnotationsClass() throws Exception {
9194
ComponentDescriptor<?> component = glean("NoAnnotationsClass.java");
9295
assertNull(component);
9396
}
9497

95-
public void testAbstractClass() throws Exception {
98+
@Test
99+
void testAbstractClass() throws Exception {
96100
ComponentDescriptor<?> component = glean("AbstractClass.java");
97101
assertNull(component);
98102
}
@@ -104,12 +108,14 @@ public void testAbstractWithAnnoClass() throws Exception {
104108
}
105109
*/
106110

107-
public void testNoAnnotationsIntf() throws Exception {
111+
@Test
112+
void testNoAnnotationsIntf() throws Exception {
108113
ComponentDescriptor<?> component = glean("NoAnnotationsIntf.java");
109114
assertNull(component);
110115
}
111116

112-
public void testMyComponent() throws Exception {
117+
@Test
118+
void testMyComponent() throws Exception {
113119
addSource("ChildComponent.java");
114120
ComponentDescriptor<?> component = glean("MyComponent.java");
115121
assertNotNull(component);

0 commit comments

Comments
 (0)