Merge branch 'master' into BAEL-9018

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 );
     }
 
     /**

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() {

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();

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";

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

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>activejdbc</module>
-				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
+				<module>animal-sniffer-mvn-plugin</module>
 				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
 				<module>apache-bval</module>
 				<module>apache-shiro</module>
@@ -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/log4j2-example</module> --><!-- guest post on different site -->
-				<!-- <module>guest/logback-example</module> --><!-- PMD voilation -->
+				<!-- <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 -->

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 {

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/";

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() {

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() {

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 );
     }
 
     /**

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;