From e29b8394e0f4f170c13a31b07cfc25991b3ee079 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpiwowarek@gmail.com>
Date: Wed, 26 Apr 2017 20:31:31 +0200
Subject: [PATCH] Merge assertj -> testing (#1738)

---
 assertj/README.md                             |  3 -
 assertj/pom.xml                               | 61 -------------------
 pom.xml                                       |  1 -
 testing/README.md                             |  3 +
 testing/pom.xml                               | 58 +++++++++++++++---
 .../com/baeldung/testing/assertj}/Dog.java    |  2 +-
 .../com/baeldung/testing/assertj}/Person.java |  2 +-
 .../testing/assertj}/AssertJCoreTest.java     |  4 +-
 .../testing/assertj}/AssertJGuavaTest.java    |  2 +-
 .../testing/assertj}/AssertJJava8Test.java    |  2 +-
 10 files changed, 57 insertions(+), 81 deletions(-)
 delete mode 100644 assertj/README.md
 delete mode 100644 assertj/pom.xml
 rename {assertj/src/main/java/com/baeldung/assertj/introduction/domain => testing/src/main/java/com/baeldung/testing/assertj}/Dog.java (85%)
 rename {assertj/src/main/java/com/baeldung/assertj/introduction/domain => testing/src/main/java/com/baeldung/testing/assertj}/Person.java (85%)
 rename {assertj/src/test/java/com/baeldung/assertj/introduction => testing/src/test/java/com/baeldung/testing/assertj}/AssertJCoreTest.java (95%)
 rename {assertj/src/test/java/com/baeldung/assertj/introduction => testing/src/test/java/com/baeldung/testing/assertj}/AssertJGuavaTest.java (98%)
 rename {assertj/src/test/java/com/baeldung/assertj/introduction => testing/src/test/java/com/baeldung/testing/assertj}/AssertJJava8Test.java (98%)

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 @@
-<?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>
\ 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 @@
         <module>apache-fop</module>
         <module>apache-poi</module>
         <module>apache-thrift</module>
-        <module>assertj</module>
         <module>autovalue</module>
         <module>axon</module>
 
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 @@
 <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">
+         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>
-    
-    <properties>
-        <pitest.version>1.1.10</pitest.version>
-        <junit.version>4.12</junit.version>
-        <jacoco.version>0.7.7.201606060606</jacoco.version>
-    </properties>
+    <name>testing</name>
+
     <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>
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;