[BAEL-9017] - Fixed conflicts

zdougherty-softwarfare · Sep 29, 2018 · 2af9eb8 · 2af9eb8
1 parent 258532c
commit 2af9eb8
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/...n/src/test/java/com/baeldung/AppTest.java → ...c/test/java/com/baeldung/AppUnitTest.java b/...n/src/test/java/com/baeldung/AppTest.java → ...c/test/java/com/baeldung/AppUnitTest.java
@@ -7,15 +7,15 @@
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppUnitTest 
     extends TestCase
 {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
+    public AppUnitTest( String testName )
     {
         super( testName );
     }
@@ -25,7 +25,7 @@ public AppTest( String testName )
      */
     public static Test suite()
     {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( AppUnitTest.class );
     }
 
     /**

diff --git a/.../com/stackify/services/MyServiceTest.java → .../stackify/services/MyServiceUnitTest.java b/.../com/stackify/services/MyServiceTest.java → .../stackify/services/MyServiceUnitTest.java
@@ -18,9 +18,9 @@
 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/...tackify/services/EmployeeServiceTest.java → ...ify/services/EmployeeServiceUnitTest.java b/...tackify/services/EmployeeServiceTest.java → ...ify/services/EmployeeServiceUnitTest.java
@@ -9,7 +9,7 @@
 
 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/...om/stackify/services/UserServiceTest.java → ...tackify/services/UserServiceLiveTest.java b/...om/stackify/services/UserServiceTest.java → ...tackify/services/UserServiceLiveTest.java
@@ -6,7 +6,7 @@
 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/.../test/java/com/baeldung/DateDiffTest.java → ...t/java/com/baeldung/DateDiffUnitTest.java b/.../test/java/com/baeldung/DateDiffTest.java → ...t/java/com/baeldung/DateDiffUnitTest.java
@@ -14,7 +14,7 @@
 
 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
@@ -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,21 +1098,21 @@
 				<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>
 				<!-- <module>micronaut</module> --><!-- Not upgraded to java 9 -->
 				<!-- <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/...a/src/test/java/com/baeldung/AppTest.java → ...c/test/java/com/baeldung/AppLiveTest.java b/...a/src/test/java/com/baeldung/AppTest.java → ...c/test/java/com/baeldung/AppLiveTest.java
@@ -16,16 +16,16 @@
 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/...groovyconfig/GroovyConfigurationTest.java → ...vyconfig/GroovyConfigurationUnitTest.java b/...groovyconfig/GroovyConfigurationTest.java → ...vyconfig/GroovyConfigurationUnitTest.java
@@ -7,7 +7,7 @@
 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/...g/groovyconfig/JavaConfigurationTest.java → ...oovyconfig/JavaConfigurationUnitTest.java b/...g/groovyconfig/JavaConfigurationTest.java → ...oovyconfig/JavaConfigurationUnitTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class JavaConfigurationTest {
+public class JavaConfigurationUnitTest {
 
     @Test
     public void whenJavaConfig_thenCorrectPerson() {

diff --git a/...ug/groovyconfig/XmlConfigurationTest.java → ...roovyconfig/XmlConfigurationUnitTest.java b/...ug/groovyconfig/XmlConfigurationTest.java → ...roovyconfig/XmlConfigurationUnitTest.java
@@ -6,7 +6,7 @@
 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/...va/com/baeldug/spring_groovy/AppTest.java → ...om/baeldug/spring_groovy/AppUnitTest.java b/...va/com/baeldug/spring_groovy/AppTest.java → ...om/baeldug/spring_groovy/AppUnitTest.java
@@ -7,15 +7,15 @@
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppUnitTest 
     extends TestCase
 {
     /**
      * Create the test case
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
+    public AppUnitTest( String testName )
     {
         super( testName );
     }
@@ -25,7 +25,7 @@ public AppTest( String testName )
      */
     public static Test suite()
     {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( AppUnitTest.class );
     }
 
     /**

diff --git a/...c/test/java/com/baeldung/pmd/CntTest.java → ...st/java/com/baeldung/pmd/CntUnitTest.java b/...c/test/java/com/baeldung/pmd/CntTest.java → ...st/java/com/baeldung/pmd/CntUnitTest.java
@@ -4,7 +4,7 @@
 
 import org.junit.Test;
 
-public class CntTest {
+public class CntUnitTest {
 
     private Cnt service;