From 2af9eb89f18557e566c2b9cdd0218b5a01745b99 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 29 Sep 2018 21:12:21 +0530
Subject: [PATCH] [BAEL-9017] - Fixed conflicts

---
 .../{AppTest.java => AppUnitTest.java}        |  6 +++---
 ...erviceTest.java => MyServiceUnitTest.java} |  4 ++--
 ...Test.java => EmployeeServiceUnitTest.java} |  2 +-
 ...viceTest.java => UserServiceLiveTest.java} |  2 +-
 ...ateDiffTest.java => DateDiffUnitTest.java} |  2 +-
 pom.xml                                       | 20 +++++++++----------
 .../{AppTest.java => AppLiveTest.java}        |  6 +++---
 ....java => GroovyConfigurationUnitTest.java} |  2 +-
 ...st.java => JavaConfigurationUnitTest.java} |  2 +-
 ...est.java => XmlConfigurationUnitTest.java} |  2 +-
 .../{AppTest.java => AppUnitTest.java}        |  6 +++---
 .../pmd/{CntTest.java => CntUnitTest.java}    |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)
 rename animal-sniffer-mvn-plugin/src/test/java/com/baeldung/{AppTest.java => AppUnitTest.java} (81%)
 rename guest/log4j2-example/src/test/java/com/stackify/services/{MyServiceTest.java => MyServiceUnitTest.java} (98%)
 rename guest/logback-example/src/test/java/com/stackify/services/{EmployeeServiceTest.java => EmployeeServiceUnitTest.java} (98%)
 rename guest/webservices/rest-server/src/test/java/com/stackify/services/{UserServiceTest.java => UserServiceLiveTest.java} (95%)
 rename java-difference-date/src/test/java/com/baeldung/{DateDiffTest.java => DateDiffUnitTest.java} (98%)
 rename rest-with-spark-java/src/test/java/com/baeldung/{AppTest.java => AppLiveTest.java} (96%)
 rename spring-groovy/src/test/java/com/baeldug/groovyconfig/{GroovyConfigurationTest.java => GroovyConfigurationUnitTest.java} (97%)
 rename spring-groovy/src/test/java/com/baeldug/groovyconfig/{JavaConfigurationTest.java => JavaConfigurationUnitTest.java} (93%)
 rename spring-groovy/src/test/java/com/baeldug/groovyconfig/{XmlConfigurationTest.java => XmlConfigurationUnitTest.java} (94%)
 rename spring-groovy/src/test/java/com/baeldug/spring_groovy/{AppTest.java => AppUnitTest.java} (82%)
 rename static-analysis/src/test/java/com/baeldung/pmd/{CntTest.java => CntUnitTest.java} (92%)

diff --git a/animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppTest.java b/animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppUnitTest.java
similarity index 81%
rename from animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppTest.java
rename to animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppUnitTest.java
index 8ecb1bc629..dcfd22ff87 100644
--- a/animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppTest.java
+++ b/animal-sniffer-mvn-plugin/src/test/java/com/baeldung/AppUnitTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppUnitTest 
     extends TestCase
 {
     /**
@@ -15,7 +15,7 @@ public class AppTest
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
+    public AppUnitTest( String testName )
     {
         super( testName );
     }
@@ -25,7 +25,7 @@ public class AppTest
      */
     public static Test suite()
     {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( AppUnitTest.class );
     }
 
     /**
diff --git a/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java b/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
similarity index 98%
rename from guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java
rename to guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
index 49e367e45b..bd08225be4 100644
--- a/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceTest.java
+++ b/guest/log4j2-example/src/test/java/com/stackify/services/MyServiceUnitTest.java
@@ -18,9 +18,9 @@ import org.junit.Test;
 import com.stackify.models.User;
 import com.stackify.services.MyService;
 
-public class MyServiceTest {
+public class MyServiceUnitTest {
 
-    private static final Logger logger = LogManager.getLogger(MyServiceTest.class);
+    private static final Logger logger = LogManager.getLogger(MyServiceUnitTest.class);
 
     @Test
     public void testService() {
diff --git a/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java b/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
similarity index 98%
rename from guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java
rename to guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
index 187b27e1df..a3051f7087 100644
--- a/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceTest.java
+++ b/guest/logback-example/src/test/java/com/stackify/services/EmployeeServiceUnitTest.java
@@ -9,7 +9,7 @@ import com.stackify.models.Employee;
 
 import ch.qos.logback.classic.Level;
 
-public class EmployeeServiceTest {
+public class EmployeeServiceUnitTest {
     private static final Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
     private EmployeeService employeeService = new EmployeeService();
diff --git a/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java b/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
similarity index 95%
rename from guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java
rename to guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
index 064951fbbe..be3992b7f7 100644
--- a/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceTest.java
+++ b/guest/webservices/rest-server/src/test/java/com/stackify/services/UserServiceLiveTest.java
@@ -6,7 +6,7 @@ import io.restassured.RestAssured;
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 
-public class UserServiceTest {
+public class UserServiceLiveTest {
     @Test
     public void whenAddUser_thenGetUserOk() {
         RestAssured.baseURI = "http://localhost:8080/rest-server";
diff --git a/java-difference-date/src/test/java/com/baeldung/DateDiffTest.java b/java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
similarity index 98%
rename from java-difference-date/src/test/java/com/baeldung/DateDiffTest.java
rename to java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
index 4203f7ef38..2c5323be6f 100644
--- a/java-difference-date/src/test/java/com/baeldung/DateDiffTest.java
+++ b/java-difference-date/src/test/java/com/baeldung/DateDiffUnitTest.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
 
-public class DateDiffTest {
+public class DateDiffUnitTest {
     @Test
     public void givenTwoDatesBeforeJava8_whenDifferentiating_thenWeGetSix() throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH);
diff --git a/pom.xml b/pom.xml
index 495aeb434b..d99832db52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1081,8 +1081,8 @@
 				<!-- <module>libraries</module> <module>jmeter</module> -->
 				<!--<module>java-dates</module> --> <!-- Commented because we have still not upgraded to java 9 -->
 				<module>java-websocket</module>
-				<!-- <module>activejdbc</module> --><!-- PMD voilation -->
-				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
+				<module>activejdbc</module>
+				<module>animal-sniffer-mvn-plugin</module>
 				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
 				<module>apache-bval</module>
 				<module>apache-shiro</module>
@@ -1098,7 +1098,7 @@
 				<module>dubbo</module>
 				<!-- <module>flyway</module> --><!-- Malformed POM -->
 				<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
-				<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
+				<module>java-difference-date</module>
 				<!-- <module>JGit</module> --><!-- Unit test failure -->
 				<module>jni</module>
 				<module>jooby</module>
@@ -1106,13 +1106,13 @@
 				<!-- <module>microprofile</module> --><!-- Takes too much time : Downloads 93 MBs zip and .. -->
 				<!-- <module>muleesb</module> --><!-- load main class org.mule.munit.remote.RemoteRunner -->
 				<module>ratpack</module>
-				<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
+				<module>rest-with-spark-java</module>
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-custom-starter</module>
-				<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
+				<module>spring-boot-jasypt</module>
 				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
 				<module>spring-data-rest-querydsl</module>
-				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
+				<module>spring-groovy</module>
 				<module>spring-mobile</module>
 				<module>spring-mustache</module>
 				<module>spring-mvc-simple</module>
@@ -1123,7 +1123,7 @@
 				<module>spring-roo</module>
 				<module>spring-security-stormpath</module>
 				<module>sse-jaxrs</module>
-				<!-- <module>static-analysis</module> --><!-- PMD voilation -->
+				<module>static-analysis</module>
 				<module>stripe</module>
 				<!-- <module>structurizr</module> --><!-- Artiifact not found -->
 				<!-- <module>Twitter4J</module> --><!-- Test failure -->
@@ -1134,8 +1134,8 @@
 				<!-- <module>graphql/graphql-java</module> --><!-- Wrong parent -->
 				<!-- <module>guest/deep-jsf</module> --><!-- guest post on different site -->
 				<!-- <module>guest/junit5-example</module> --><!-- guest post on different site - Compilation failure -->
-				<!-- <module>guest/log4j2-example</module> --><!-- PMD voilation -->
-				<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
+				<!-- <module>guest/log4j2-example</module> --><!-- guest post on different site -->
+				<!-- <module>guest/logback-example</module> --><!-- guest post on different site -->
 				<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
 				<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
 				<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
@@ -1151,7 +1151,7 @@
 				<module>spring-boot-h2/spring-boot-h2-database</module>
 				<!--module>spring-boot-h2/spring-boot-h2-remote-app</module-->
 				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
-				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
+				<!-- <module>guest\webservices\rest-server</module> --><!-- guest post on different site -->
 				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
 			</modules>
 
diff --git a/rest-with-spark-java/src/test/java/com/baeldung/AppTest.java b/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
similarity index 96%
rename from rest-with-spark-java/src/test/java/com/baeldung/AppTest.java
rename to rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
index c7b88dd6d1..9e24879767 100644
--- a/rest-with-spark-java/src/test/java/com/baeldung/AppTest.java
+++ b/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
@@ -16,16 +16,16 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-public class AppTest extends TestCase {
+public class AppLiveTest extends TestCase {
 
 	ObjectMapper mapper = new ObjectMapper();
 
-    public AppTest( String testName ) {
+    public AppLiveTest( String testName ) {
         super( testName );
     }
 
     public static Test suite() {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( AppLiveTest.class );
     }
 
     public void testApp() throws IOException, ClassNotFoundException {
diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationUnitTest.java
similarity index 97%
rename from spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java
rename to spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationUnitTest.java
index 91ca6dbfe9..dbefba5ba5 100644
--- a/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java
+++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationUnitTest.java
@@ -7,7 +7,7 @@ import java.io.File;
 import org.junit.Test;
 import org.springframework.context.support.GenericGroovyApplicationContext;
 
-public class GroovyConfigurationTest {
+public class GroovyConfigurationUnitTest {
     
     private static final String FILE_NAME = "GroovyBeanConfig.groovy";
     private static final String FILE_PATH = "src/main/java/com/baeldug/groovyconfig/";
diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationUnitTest.java
similarity index 93%
rename from spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java
rename to spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationUnitTest.java
index 2d9b1000ff..c1e16f1b62 100644
--- a/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java
+++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationUnitTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class JavaConfigurationTest {
+public class JavaConfigurationUnitTest {
 
     @Test
     public void whenJavaConfig_thenCorrectPerson() {
diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationUnitTest.java
similarity index 94%
rename from spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java
rename to spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationUnitTest.java
index 3ee724207c..b8d341ee39 100644
--- a/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java
+++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class XmlConfigurationTest {
+public class XmlConfigurationUnitTest {
        
     @Test
     public void whenXmlConfig_thenCorrectPerson() {
diff --git a/spring-groovy/src/test/java/com/baeldug/spring_groovy/AppTest.java b/spring-groovy/src/test/java/com/baeldug/spring_groovy/AppUnitTest.java
similarity index 82%
rename from spring-groovy/src/test/java/com/baeldug/spring_groovy/AppTest.java
rename to spring-groovy/src/test/java/com/baeldug/spring_groovy/AppUnitTest.java
index 19eefb6c0f..3d8fa3e2d8 100644
--- a/spring-groovy/src/test/java/com/baeldug/spring_groovy/AppTest.java
+++ b/spring-groovy/src/test/java/com/baeldug/spring_groovy/AppUnitTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppUnitTest 
     extends TestCase
 {
     /**
@@ -15,7 +15,7 @@ public class AppTest
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
+    public AppUnitTest( String testName )
     {
         super( testName );
     }
@@ -25,7 +25,7 @@ public class AppTest
      */
     public static Test suite()
     {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( AppUnitTest.class );
     }
 
     /**
diff --git a/static-analysis/src/test/java/com/baeldung/pmd/CntTest.java b/static-analysis/src/test/java/com/baeldung/pmd/CntUnitTest.java
similarity index 92%
rename from static-analysis/src/test/java/com/baeldung/pmd/CntTest.java
rename to static-analysis/src/test/java/com/baeldung/pmd/CntUnitTest.java
index ed72602f99..cdbf9f6f5e 100644
--- a/static-analysis/src/test/java/com/baeldung/pmd/CntTest.java
+++ b/static-analysis/src/test/java/com/baeldung/pmd/CntUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class CntTest {
+public class CntUnitTest {
 
     private Cnt service;