Merge assertj -> testing (#1738)

assertj/README.md

@@ -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)

assertj/pom.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>assertj</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-guava</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <guava.version>19.0</guava.version>
-        <assertj-guava.version>3.1.0</assertj-guava.version>
-        <junit.version>4.12</junit.version>
-        <assertj-core.version>3.6.1</assertj-core.version>
-
-        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-    </properties>
-
-</project>

pom.xml

@@ -22,7 +22,6 @@
         <module>apache-fop</module>
         <module>apache-poi</module>
         <module>apache-thrift</module>
-        <module>assertj</module>
         <module>autovalue</module>
         <module>axon</module>
 

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)
 

testing/pom.xml

@@ -2,16 +2,36 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>mutation-testing</artifactId>
+    <artifactId>testing</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>mutation-testing</name>
+    <name>testing</name>
 
-    <properties>
-        <pitest.version>1.1.10</pitest.version>
-        <junit.version>4.12</junit.version>
-        <jacoco.version>0.7.7.201606060606</jacoco.version>
-    </properties>
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-guava</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.pitest</groupId>
             <artifactId>pitest-parent</artifactId>
@@ -78,6 +98,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <pitest.version>1.1.10</pitest.version>
+        <junit.version>4.12</junit.version>
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <guava.version>19.0</guava.version>
+        <assertj-guava.version>3.1.0</assertj-guava.version>
+        <junit.version>4.12</junit.version>
+        <assertj-core.version>3.6.1</assertj-core.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+    </properties>
 </project>

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;

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;

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;

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;

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;