diff --git a/assertj/README.md b/assertj/README.md deleted file mode 100644 index 86eff05057..0000000000 --- a/assertj/README.md +++ /dev/null @@ -1,3 +0,0 @@ -### Relevant Articles: -- [AssertJ’s Java 8 Features](http://www.baeldung.com/assertJ-java-8-features) -- [AssertJ for Guava](http://www.baeldung.com/assertJ-for-guava) diff --git a/assertj/pom.xml b/assertj/pom.xml deleted file mode 100644 index 032f33c89d..0000000000 --- a/assertj/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - com.baeldung - assertj - 1.0.0-SNAPSHOT - - - - - com.google.guava - guava - ${guava.version} - - - org.assertj - assertj-guava - 3.0.0 - - - - junit - junit - ${junit.version} - test - - - org.assertj - assertj-core - ${assertj-core.version} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - - - 19.0 - 3.1.0 - 4.12 - 3.6.1 - - 3.6.0 - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 956013c467..57041f2340 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,6 @@ apache-fop apache-poi apache-thrift - assertj autovalue axon diff --git a/testing/README.md b/testing/README.md index 121472ae13..0960ce5957 100644 --- a/testing/README.md +++ b/testing/README.md @@ -5,4 +5,7 @@ ### Relevant Articles: - [Introduction to Mutation Testing Using the PITest Library](http://www.baeldung.com/java-mutation-testing-with-pitest) - [Intro to JaCoCo](http://www.baeldung.com/jacoco) +- [AssertJ’s Java 8 Features](http://www.baeldung.com/assertJ-java-8-features) +- [AssertJ for Guava](http://www.baeldung.com/assertJ-for-guava) +- [Introduction to AssertJ](http://www.baeldung.com/introduction-to-assertj) diff --git a/testing/pom.xml b/testing/pom.xml index 1bdc5c87f0..3b336d0904 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -1,17 +1,37 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung - mutation-testing + testing 0.1-SNAPSHOT - mutation-testing - - - 1.1.10 - 4.12 - 0.7.7.201606060606 - + testing + + + com.google.guava + guava + ${guava.version} + + + org.assertj + assertj-guava + 3.0.0 + + + + junit + junit + ${junit.version} + test + + + org.assertj + assertj-core + ${assertj-core.version} + test + + + org.pitest pitest-parent @@ -78,6 +98,26 @@ + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + 1.1.10 + 4.12 + 0.7.7.201606060606 + 19.0 + 3.1.0 + 4.12 + 3.6.1 + 3.6.0 + diff --git a/assertj/src/main/java/com/baeldung/assertj/introduction/domain/Dog.java b/testing/src/main/java/com/baeldung/testing/assertj/Dog.java similarity index 85% rename from assertj/src/main/java/com/baeldung/assertj/introduction/domain/Dog.java rename to testing/src/main/java/com/baeldung/testing/assertj/Dog.java index 623f71214c..7a1c158500 100644 --- a/assertj/src/main/java/com/baeldung/assertj/introduction/domain/Dog.java +++ b/testing/src/main/java/com/baeldung/testing/assertj/Dog.java @@ -1,4 +1,4 @@ -package com.baeldung.assertj.introduction.domain; +package com.baeldung.testing.assertj; public class Dog { private String name; diff --git a/assertj/src/main/java/com/baeldung/assertj/introduction/domain/Person.java b/testing/src/main/java/com/baeldung/testing/assertj/Person.java similarity index 85% rename from assertj/src/main/java/com/baeldung/assertj/introduction/domain/Person.java rename to testing/src/main/java/com/baeldung/testing/assertj/Person.java index 90ef787ebe..43e9ff8884 100644 --- a/assertj/src/main/java/com/baeldung/assertj/introduction/domain/Person.java +++ b/testing/src/main/java/com/baeldung/testing/assertj/Person.java @@ -1,4 +1,4 @@ -package com.baeldung.assertj.introduction.domain; +package com.baeldung.testing.assertj; public class Person { private String name; diff --git a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJCoreTest.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java similarity index 95% rename from assertj/src/test/java/com/baeldung/assertj/introduction/AssertJCoreTest.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java index 10bb011903..2e95355df5 100644 --- a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJCoreTest.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java @@ -1,7 +1,5 @@ -package com.baeldung.assertj.introduction; +package com.baeldung.testing.assertj; -import com.baeldung.assertj.introduction.domain.Dog; -import com.baeldung.assertj.introduction.domain.Person; import org.assertj.core.util.Maps; import org.junit.Ignore; import org.junit.Test; diff --git a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java similarity index 98% rename from assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java index 84aaf46dd1..d226c3fce9 100644 --- a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java @@ -1,4 +1,4 @@ -package com.baeldung.assertj.introduction; +package com.baeldung.testing.assertj; import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; diff --git a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJJava8Test.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java similarity index 98% rename from assertj/src/test/java/com/baeldung/assertj/introduction/AssertJJava8Test.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java index f89defaed1..a671a49da1 100644 --- a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJJava8Test.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java @@ -1,4 +1,4 @@ -package com.baeldung.assertj.introduction; +package com.baeldung.testing.assertj; import org.junit.Test;