diff --git a/testing-modules/assertion-libraries-2/pom.xml b/testing-modules/assertion-libraries-2/pom.xml index ecd644945a62..bdc134ed0856 100644 --- a/testing-modules/assertion-libraries-2/pom.xml +++ b/testing-modules/assertion-libraries-2/pom.xml @@ -2,18 +2,11 @@ - 4.0.0 assertion-libraries-2 0.1-SNAPSHOT assertion-libraries-2 - - 3.5.0 - 2.18.1 - - - com.baeldung testing-modules @@ -27,20 +20,50 @@ ${json-unit.version} test - org.assertj assertj-core ${assertj.version} test - com.fasterxml.jackson.core jackson-databind ${jackson-databind.version} test + + org.assertj + assertj-guava + ${assertj-guava.version} + + + com.google.guava + guava + ${guava.version} + + + + + org.assertj + assertj-assertions-generator-maven-plugin + ${assertj-generator.version} + + + com.baeldung.assertj.custom.Person + + + + + + + + 3.5.0 + 2.18.1 + 3.4.0 + 2.1.0 + + diff --git a/testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/Member.java b/testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/Member.java similarity index 100% rename from testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/Member.java rename to testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/Member.java diff --git a/testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/custom/Person.java b/testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/custom/Person.java similarity index 100% rename from testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/custom/Person.java rename to testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/custom/Person.java diff --git a/testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/Address.java b/testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/Address.java similarity index 100% rename from testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/Address.java rename to testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/Address.java diff --git a/testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/Person.java b/testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/Person.java similarity index 100% rename from testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/Person.java rename to testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/Person.java diff --git a/testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/ZipCode.java b/testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/ZipCode.java similarity index 100% rename from testing-modules/assertion-libraries/src/main/java/com/baeldung/assertj/extracting/ZipCode.java rename to testing-modules/assertion-libraries-2/src/main/java/com/baeldung/assertj/extracting/ZipCode.java diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJConditionUnitTest.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJConditionUnitTest.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJConditionUnitTest.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJConditionUnitTest.java diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java similarity index 99% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java index 6a552aee7893..dd7a7fb04b38 100644 --- a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java +++ b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJGuavaUnitTest.java @@ -1,5 +1,15 @@ package com.baeldung.assertj; +import static org.assertj.guava.api.Assertions.assertThat; +import static org.assertj.guava.api.Assertions.entry; + +import java.io.File; +import java.util.HashMap; +import java.util.HashSet; + +import org.assertj.guava.data.MapEntry; +import org.junit.Test; + import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashBasedTable; @@ -9,15 +19,6 @@ import com.google.common.collect.Table; import com.google.common.collect.TreeRangeMap; import com.google.common.io.Files; -import org.assertj.guava.data.MapEntry; -import org.junit.Test; - -import java.io.File; -import java.util.HashMap; -import java.util.HashSet; - -import static org.assertj.guava.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.entry; public class AssertJGuavaUnitTest { diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java index a2f58d677d50..2a753a77e949 100644 --- a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java +++ b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/AssertJJava8UnitTest.java @@ -1,6 +1,8 @@ package com.baeldung.assertj; -import org.junit.Test; +import static java.time.LocalDate.ofYearDay; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -10,9 +12,7 @@ import java.util.Optional; import java.util.function.Predicate; -import static java.time.LocalDate.ofYearDay; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; public class AssertJJava8UnitTest { diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/AssertJCustomAssertionsUnitTest.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/AssertJCustomAssertionsUnitTest.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/AssertJCustomAssertionsUnitTest.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/AssertJCustomAssertionsUnitTest.java diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/Assertions.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/Assertions.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/Assertions.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/Assertions.java diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/PersonAssert.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/PersonAssert.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/custom/PersonAssert.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/custom/PersonAssert.java diff --git a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java similarity index 100% rename from testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java rename to testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java index aae4f8a04158..ffd3f7f1a85d 100644 --- a/testing-modules/assertion-libraries/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java +++ b/testing-modules/assertion-libraries-2/src/test/java/com/baeldung/assertj/extracting/AssertJExtractingUnitTest.java @@ -1,13 +1,13 @@ package com.baeldung.assertj.extracting; -import org.assertj.core.api.InstanceOfAssertFactories; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.as; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.List; -import static org.assertj.core.api.Assertions.as; -import static org.assertj.core.api.Assertions.assertThat; +import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.Test; class AssertJExtractingUnitTest { static final List
RESTRICTED_ADDRESSES = new ArrayList<>(); diff --git a/testing-modules/assertion-libraries/pom.xml b/testing-modules/assertion-libraries/pom.xml index 93dae67e5053..a49ebfb172cb 100644 --- a/testing-modules/assertion-libraries/pom.xml +++ b/testing-modules/assertion-libraries/pom.xml @@ -13,37 +13,4 @@ 1.0.0-SNAPSHOT - - - org.assertj - assertj-guava - ${assertj-guava.version} - - - com.google.guava - guava - ${guava.version} - - - - - - - org.assertj - assertj-assertions-generator-maven-plugin - ${assertj-generator.version} - - - com.baeldung.testing.assertj.custom.Person - - - - - - - - 3.4.0 - 2.1.0 - - \ No newline at end of file