DATALDAP-1 - Polishing.

Split XML configuration into infrastructure and test-specific parts. Add test logging configuration. Rename test classes to end with Tests suffix.

src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTest.java → src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java

@@ -42,7 +42,7 @@
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class SimpleLdapRepositoryTest {
+public class SimpleLdapRepositoryTests {
 
     private LdapOperations ldapOperationsMock;
     private ObjectDirectoryMapper odmMock;

src/test/java/org/springframework/data/ldap/repository/config/AnnotationConfigTests.java

@@ -46,7 +46,7 @@ public void testAnnotationConfig() {
 	}
 
 	@Configuration
-	@ImportResource("classpath:/ldap-annotation-config.xml")
+	@ImportResource("classpath:/infrastructure.xml")
 	@EnableLdapRepositories(basePackageClasses = DummyLdapRepository.class)
 	static class Config {}
 }

src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTest.java → src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests.java

@@ -36,8 +36,8 @@
  * @author Mattias Hellborg Arthursson
  * @author Eddu Melendez
  */
-@ContextConfiguration("classpath:/query-test.xml")
-public class PartTreeLdapRepositoryQueryTest extends AbstractJUnit4SpringContextTests {
+@ContextConfiguration
+public class PartTreeLdapRepositoryQueryTests extends AbstractJUnit4SpringContextTests {
 
 	@Autowired private LdapTemplate ldapTemplate;
 	private Class<?> targetClass;

src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTest.java → src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTests.java

@@ -29,7 +29,7 @@
  * @author Mattias Hellborg Arthursson
  * @author Eddu Melendez
  */
-public class QueryDslFilterGeneratorTest {
+public class QueryDslFilterGeneratorTests {
 
 	private LdapSerializer tested;
 	private QPerson person;

src/test/resources/logback.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>

src/test/resources/logging.properties

@@ -0,0 +1 @@
+handlers = org.slf4j.bridge.SLF4JBridgeHandler

src/test/resources/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests-context.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:data-ldap="http://www.springframework.org/schema/data/ldap"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/data/ldap http://www.springframework.org/schema/data/ldap/spring-ldap.xsd
+		">
+
+	<import resource="classpath:infrastructure.xml"/>
+
+	<data-ldap:repositories base-package="org.springframework.ldap.repository.query"/>
+
+</beans>