Skip to content

Commit 432c7a3

Browse files
author
Vincent Potucek
committed
[POC] Migrate JUnit asserts to AssertJ - impl
1 parent 7e9aeee commit 432c7a3

35 files changed

+885
-1053
lines changed

‎impl/maven-impl/src/test/java/org/apache/maven/impl/AbstractVersionTest.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020

2121
import org.apache.maven.api.Version;
2222

23-
import static org.junit.jupiter.api.Assertions.assertEquals;
24-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
23+
import static org.assertj.core.api.Assertions.assertThat;
2524

2625
/**
2726
*/
@@ -40,21 +39,21 @@ protected void assertOrder(int expected, String version1, String version2) {
4039
Version v2 = newVersion(version2);
4140

4241
if (expected > 0) {
43-
assertEquals(1, Integer.signum(v1.compareTo(v2)), "expected " + v1 + " > " + v2);
44-
assertEquals(-1, Integer.signum(v2.compareTo(v1)), "expected " + v2 + " < " + v1);
45-
assertNotEquals(v1, v2, "expected " + v1 + " != " + v2);
46-
assertNotEquals(v2, v1, "expected " + v2 + " != " + v1);
42+
assertThat(Integer.signum(v1.compareTo(v2))).as("expected " + v1 + " > " + v2).isEqualTo(1);
43+
assertThat(Integer.signum(v2.compareTo(v1))).as("expected " + v2 + " < " + v1).isEqualTo(-1);
44+
assertThat(v2).as("expected " + v1 + " != " + v2).isNotEqualTo(v1);
45+
assertThat(v1).as("expected " + v2 + " != " + v1).isNotEqualTo(v2);
4746
} else if (expected < 0) {
48-
assertEquals(-1, Integer.signum(v1.compareTo(v2)), "expected " + v1 + " < " + v2);
49-
assertEquals(1, Integer.signum(v2.compareTo(v1)), "expected " + v2 + " > " + v1);
50-
assertNotEquals(v1, v2, "expected " + v1 + " != " + v2);
51-
assertNotEquals(v2, v1, "expected " + v2 + " != " + v1);
47+
assertThat(Integer.signum(v1.compareTo(v2))).as("expected " + v1 + " < " + v2).isEqualTo(-1);
48+
assertThat(Integer.signum(v2.compareTo(v1))).as("expected " + v2 + " > " + v1).isEqualTo(1);
49+
assertThat(v2).as("expected " + v1 + " != " + v2).isNotEqualTo(v1);
50+
assertThat(v1).as("expected " + v2 + " != " + v1).isNotEqualTo(v2);
5251
} else {
53-
assertEquals(0, v1.compareTo(v2), "expected " + v1 + " == " + v2);
54-
assertEquals(0, v2.compareTo(v1), "expected " + v2 + " == " + v1);
55-
assertEquals(v1, v2, "expected " + v1 + " == " + v2);
56-
assertEquals(v2, v1, "expected " + v2 + " == " + v1);
57-
assertEquals(v1.hashCode(), v2.hashCode(), "expected #(" + v1 + ") == #(" + v1 + ")");
52+
assertThat(v1.compareTo(v2)).as("expected " + v1 + " == " + v2).isEqualTo(0);
53+
assertThat(v2.compareTo(v1)).as("expected " + v2 + " == " + v1).isEqualTo(0);
54+
assertThat(v2).as("expected " + v1 + " == " + v2).isEqualTo(v1);
55+
assertThat(v1).as("expected " + v2 + " == " + v1).isEqualTo(v2);
56+
assertThat(v2.hashCode()).as("expected #(" + v1 + ") == #(" + v1 + ")").isEqualTo(v1.hashCode());
5857
}
5958
}
6059

‎impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelVersionParserTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
import org.eclipse.aether.util.version.GenericVersionScheme;
2323
import org.junit.jupiter.api.Test;
2424

25-
import static org.junit.jupiter.api.Assertions.assertEquals;
26-
import static org.junit.jupiter.api.Assertions.assertNotNull;
25+
import static org.assertj.core.api.Assertions.assertThat;
2726

2827
class DefaultModelVersionParserTest {
2928

3029
@Test
3130
void parseVersion() {
3231
Version v = new DefaultModelVersionParser(new GenericVersionScheme()).parseVersion("");
33-
assertNotNull(v);
34-
assertEquals("", v.toString());
32+
assertThat(v).isNotNull();
33+
assertThat(v.toString()).isEqualTo("");
3534
}
3635
}

‎impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultModelXmlFactoryTest.java‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
import org.junit.jupiter.api.BeforeEach;
2727
import org.junit.jupiter.api.Test;
2828

29-
import static org.junit.jupiter.api.Assertions.assertEquals;
30-
import static org.junit.jupiter.api.Assertions.assertThrows;
31-
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
import static org.assertj.core.api.Assertions.assertThat;
30+
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
3231

3332
class DefaultModelXmlFactoryTest {
3433

@@ -40,7 +39,7 @@ void setUp() {
4039
}
4140

4241
@Test
43-
void testValidNamespaceWithModelVersion400() throws Exception {
42+
void validNamespaceWithModelVersion400() throws Exception {
4443
String xml =
4544
"""
4645
<project xmlns="http://maven.apache.org/POM/4.0.0">
@@ -51,12 +50,12 @@ void testValidNamespaceWithModelVersion400() throws Exception {
5150
XmlReaderRequest.builder().reader(new StringReader(xml)).build();
5251

5352
Model model = factory.read(request);
54-
assertEquals("4.0.0", model.getModelVersion());
55-
assertEquals("http://maven.apache.org/POM/4.0.0", model.getNamespaceUri());
53+
assertThat(model.getModelVersion()).isEqualTo("4.0.0");
54+
assertThat(model.getNamespaceUri()).isEqualTo("http://maven.apache.org/POM/4.0.0");
5655
}
5756

5857
@Test
59-
void testValidNamespaceWithModelVersion410() throws Exception {
58+
void validNamespaceWithModelVersion410() throws Exception {
6059
String xml =
6160
"""
6261
<project xmlns="http://maven.apache.org/POM/4.1.0">
@@ -67,12 +66,12 @@ void testValidNamespaceWithModelVersion410() throws Exception {
6766
XmlReaderRequest.builder().reader(new StringReader(xml)).build();
6867

6968
Model model = factory.read(request);
70-
assertEquals("4.1.0", model.getModelVersion());
71-
assertEquals("http://maven.apache.org/POM/4.1.0", model.getNamespaceUri());
69+
assertThat(model.getModelVersion()).isEqualTo("4.1.0");
70+
assertThat(model.getNamespaceUri()).isEqualTo("http://maven.apache.org/POM/4.1.0");
7271
}
7372

7473
@Test
75-
void testInvalidNamespaceWithModelVersion410() {
74+
void invalidNamespaceWithModelVersion410() {
7675
String xml =
7776
"""
7877
<project xmlns="http://invalid.namespace/4.1.0">
@@ -82,13 +81,13 @@ void testInvalidNamespaceWithModelVersion410() {
8281
XmlReaderRequest request =
8382
XmlReaderRequest.builder().reader(new StringReader(xml)).build();
8483

85-
XmlReaderException ex = assertThrows(XmlReaderException.class, () -> factory.read(request));
86-
assertTrue(ex.getMessage().contains("Invalid namespace 'http://invalid.namespace/4.1.0'"));
87-
assertTrue(ex.getMessage().contains("4.1.0"));
84+
XmlReaderException ex = assertThatExceptionOfType(XmlReaderException.class).isThrownBy(() -> factory.read(request)).actual();
85+
assertThat(ex.getMessage().contains("Invalid namespace 'http://invalid.namespace/4.1.0'")).isTrue();
86+
assertThat(ex.getMessage().contains("4.1.0")).isTrue();
8887
}
8988

9089
@Test
91-
void testNoNamespaceWithModelVersion400() throws Exception {
90+
void noNamespaceWithModelVersion400() throws Exception {
9291
String xml =
9392
"""
9493
<project>
@@ -99,17 +98,17 @@ void testNoNamespaceWithModelVersion400() throws Exception {
9998
XmlReaderRequest.builder().reader(new StringReader(xml)).build();
10099

101100
Model model = factory.read(request);
102-
assertEquals("4.0.0", model.getModelVersion());
103-
assertEquals("", model.getNamespaceUri());
101+
assertThat(model.getModelVersion()).isEqualTo("4.0.0");
102+
assertThat(model.getNamespaceUri()).isEqualTo("");
104103
}
105104

106105
@Test
107-
void testNullRequest() {
108-
assertThrows(IllegalArgumentException.class, () -> factory.read((XmlReaderRequest) null));
106+
void nullRequest() {
107+
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> factory.read((XmlReaderRequest) null));
109108
}
110109

111110
@Test
112-
void testMalformedModelVersion() throws Exception {
111+
void malformedModelVersion() throws Exception {
113112
String xml =
114113
"""
115114
<project xmlns="http://maven.apache.org/POM/4.0.0">
@@ -120,6 +119,6 @@ void testMalformedModelVersion() throws Exception {
120119
XmlReaderRequest.builder().reader(new StringReader(xml)).build();
121120

122121
Model model = factory.read(request);
123-
assertEquals("invalid.version", model.getModelVersion());
122+
assertThat(model.getModelVersion()).isEqualTo("invalid.version");
124123
}
125124
}

‎impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultNodeTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import org.junit.jupiter.api.Test;
2828
import org.mockito.Mockito;
2929

30-
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import static org.assertj.core.api.Assertions.assertThat;
3131

3232
class DefaultNodeTest {
3333

3434
@Test
35-
void testAsString() {
35+
void asString() {
3636
InternalSession session = Mockito.mock(InternalSession.class);
3737

3838
// Create a basic dependency node
@@ -42,28 +42,26 @@ void testAsString() {
4242

4343
// Test non-verbose mode
4444
DefaultNode defaultNode = new DefaultNode(session, node, false);
45-
assertEquals("org.example:myapp:jar:1.0:compile", defaultNode.asString());
45+
assertThat(defaultNode.asString()).isEqualTo("org.example:myapp:jar:1.0:compile");
4646

4747
// Test verbose mode with managed version
4848
node.setData(DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION, "0.9");
4949
node.setManagedBits(DependencyNode.MANAGED_VERSION);
5050
defaultNode = new DefaultNode(session, node, true);
51-
assertEquals("org.example:myapp:jar:1.0:compile (version managed from 0.9)", defaultNode.asString());
51+
assertThat(defaultNode.asString()).isEqualTo("org.example:myapp:jar:1.0:compile (version managed from 0.9)");
5252

5353
// Test verbose mode with managed scope
5454
node.setData(DependencyManagerUtils.NODE_DATA_PREMANAGED_SCOPE, "runtime");
5555
node.setManagedBits(DependencyNode.MANAGED_VERSION | DependencyNode.MANAGED_SCOPE);
5656
defaultNode = new DefaultNode(session, node, true);
57-
assertEquals(
58-
"org.example:myapp:jar:1.0:compile (version managed from 0.9; scope managed from runtime)",
59-
defaultNode.asString());
57+
assertThat(defaultNode.asString()).isEqualTo("org.example:myapp:jar:1.0:compile (version managed from 0.9; scope managed from runtime)");
6058

6159
// Test verbose mode with conflict resolution
6260
DefaultDependencyNode winner =
6361
new DefaultDependencyNode(new Dependency(new DefaultArtifact("org.example:myapp:2.0"), "compile"));
6462
node.setData(ConflictResolver.NODE_DATA_WINNER, winner);
6563
node.setManagedBits(0);
6664
defaultNode = new DefaultNode(session, node, true);
67-
assertEquals("(org.example:myapp:jar:1.0:compile - omitted for conflict with 2.0)", defaultNode.asString());
65+
assertThat(defaultNode.asString()).isEqualTo("(org.example:myapp:jar:1.0:compile - omitted for conflict with 2.0)");
6866
}
6967
}

0 commit comments

Comments
 (0)