[BAEL-9017] - Fixed conflicts

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