Skip to content

Commit b8b94ed

Browse files
authored
[JAVA-47301] Moved code from assertion-libraries to assertion-libraries-2 (#18627)
1 parent 42da05e commit b8b94ed

File tree

14 files changed

+50
-59
lines changed

14 files changed

+50
-59
lines changed

testing-modules/assertion-libraries-2/pom.xml

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
65
<modelVersion>4.0.0</modelVersion>
76
<artifactId>assertion-libraries-2</artifactId>
87
<version>0.1-SNAPSHOT</version>
98
<name>assertion-libraries-2</name>
109

11-
<properties>
12-
<json-unit.version>3.5.0</json-unit.version>
13-
<jackson-databind.version>2.18.1</jackson-databind.version>
14-
</properties>
15-
16-
1710
<parent>
1811
<groupId>com.baeldung</groupId>
1912
<artifactId>testing-modules</artifactId>
@@ -27,20 +20,50 @@
2720
<version>${json-unit.version}</version>
2821
<scope>test</scope>
2922
</dependency>
30-
3123
<dependency>
3224
<groupId>org.assertj</groupId>
3325
<artifactId>assertj-core</artifactId>
3426
<version>${assertj.version}</version>
3527
<scope>test</scope>
3628
</dependency>
37-
3829
<dependency>
3930
<groupId>com.fasterxml.jackson.core</groupId>
4031
<artifactId>jackson-databind</artifactId>
4132
<version>${jackson-databind.version}</version>
4233
<scope>test</scope>
4334
</dependency>
35+
<dependency>
36+
<groupId>org.assertj</groupId>
37+
<artifactId>assertj-guava</artifactId>
38+
<version>${assertj-guava.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.guava</groupId>
42+
<artifactId>guava</artifactId>
43+
<version>${guava.version}</version>
44+
</dependency>
4445
</dependencies>
4546

47+
<build>
48+
<plugins>
49+
<plugin>
50+
<groupId>org.assertj</groupId>
51+
<artifactId>assertj-assertions-generator-maven-plugin</artifactId>
52+
<version>${assertj-generator.version}</version>
53+
<configuration>
54+
<classes>
55+
<param>com.baeldung.assertj.custom.Person</param>
56+
</classes>
57+
</configuration>
58+
</plugin>
59+
</plugins>
60+
</build>
61+
62+
<properties>
63+
<json-unit.version>3.5.0</json-unit.version>
64+
<jackson-databind.version>2.18.1</jackson-databind.version>
65+
<assertj-guava.version>3.4.0</assertj-guava.version>
66+
<assertj-generator.version>2.1.0</assertj-generator.version>
67+
</properties>
68+
4669
</project>

testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java renamed to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
package com.baeldung.assertj;
22

3+
import static org.assertj.guava.api.Assertions.assertThat;
4+
import static org.assertj.guava.api.Assertions.entry;
5+
6+
import java.io.File;
7+
import java.util.HashMap;
8+
import java.util.HashSet;
9+
10+
import org.assertj.guava.data.MapEntry;
11+
import org.junit.Test;
12+
313
import com.google.common.base.Optional;
414
import com.google.common.collect.ArrayListMultimap;
515
import com.google.common.collect.HashBasedTable;
@@ -9,15 +19,6 @@
919
import com.google.common.collect.Table;
1020
import com.google.common.collect.TreeRangeMap;
1121
import com.google.common.io.Files;
12-
import org.assertj.guava.data.MapEntry;
13-
import org.junit.Test;
14-
15-
import java.io.File;
16-
import java.util.HashMap;
17-
import java.util.HashSet;
18-
19-
import static org.assertj.guava.api.Assertions.assertThat;
20-
import static org.assertj.guava.api.Assertions.entry;
2122

2223
public class AssertJGuavaUnitTest {
2324

testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java renamed to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.baeldung.assertj;
22

3-
import org.junit.Test;
3+
import static java.time.LocalDate.ofYearDay;
4+
import static java.util.Arrays.asList;
5+
import static org.assertj.core.api.Assertions.assertThat;
46

57
import java.time.LocalDate;
68
import java.time.LocalDateTime;
@@ -10,9 +12,7 @@
1012
import java.util.Optional;
1113
import java.util.function.Predicate;
1214

13-
import static java.time.LocalDate.ofYearDay;
14-
import static java.util.Arrays.asList;
15-
import static org.assertj.core.api.Assertions.assertThat;
15+
import org.junit.Test;
1616

1717
public class AssertJJava8UnitTest {
1818

0 commit comments

Comments
 (0)