[BAEL-9017] - Fixed conflicts

spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationUnitTest.java

@@ -0,0 +1,24 @@
+package com.baeldug.groovyconfig;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+public class JavaConfigurationUnitTest {
+
+    @Test
+    public void whenJavaConfig_thenCorrectPerson() {
+
+        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+        ctx.register(JavaBeanConfig.class);
+        ctx.refresh();
+
+        JavaPersonBean j = ctx.getBean(JavaPersonBean.class);
+
+        assertEquals("31", j.getAge());
+        assertEquals("green", j.getEyesColor());
+        assertEquals("blond", j.getHairColor());
+
+    }
+}