diff --git a/config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy b/config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy index 25ef3580a3..d5aeea2e5c 100644 --- a/config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy +++ b/config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy @@ -42,7 +42,7 @@ class LdapProviderBeanDefinitionParserTests extends AbstractXmlConfigTests { def simpleProviderAuthenticatesCorrectly() { - xml.'ldap-server'() + xml.'ldap-server'(ldif:'test-server.ldif') xml.'authentication-manager'{ 'ldap-authentication-provider'('group-search-filter':'member={0}') } @@ -72,7 +72,7 @@ class LdapProviderBeanDefinitionParserTests extends AbstractXmlConfigTests { } def supportsPasswordComparisonAuthentication() { - xml.'ldap-server'() + xml.'ldap-server'(ldif:'test-server.ldif') xml.'authentication-manager'{ 'ldap-authentication-provider'('user-dn-pattern': 'uid={0},ou=people') 'password-compare' @@ -89,7 +89,7 @@ class LdapProviderBeanDefinitionParserTests extends AbstractXmlConfigTests { } def supportsPasswordComparisonAuthenticationWithHashAttribute() { - xml.'ldap-server'() + xml.'ldap-server'(ldif:'test-server.ldif') xml.'authentication-manager'{ 'ldap-authentication-provider'('user-dn-pattern': 'uid={0},ou=people') { 'password-compare'('password-attribute': 'uid', hash: 'plaintext') @@ -108,7 +108,7 @@ class LdapProviderBeanDefinitionParserTests extends AbstractXmlConfigTests { } def supportsPasswordComparisonAuthenticationWithPasswordEncoder() { - xml.'ldap-server'() + xml.'ldap-server'(ldif:'test-server.ldif') xml.'authentication-manager'{ 'ldap-authentication-provider'('user-dn-pattern': 'uid={0},ou=people') { 'password-compare'('password-attribute': 'uid') { diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index c1d59f3e7f..0708080572 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -1,6 +1,7 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder apply plugin: 'java' +apply plugin: 'groovy' apply plugin: 'javadocHotfix' apply plugin: 'eclipse-wtp' apply plugin: 'propdeps' @@ -70,6 +71,7 @@ configurations { sourceSets { integrationTest { java.srcDir file('src/integration-test/java') + groovy.srcDirs file('src/integration-test/groovy') resources.srcDir file('src/integration-test/resources') compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime @@ -81,6 +83,10 @@ task integrationTest(type: Test, dependsOn: jar) { logging.captureStandardOutput(LogLevel.INFO) classpath = sourceSets.integrationTest.runtimeClasspath maxParallelForks = 1 + reports { + html.destination = project.file("$project.buildDir/reports/integration-tests/") + junitXml.destination = project.file("$project.buildDir/integration-test-results/") + } } project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 1, project.configurations.getByName("integrationTestCompile"), Conf2ScopeMappingContainer.TEST) project.conf2ScopeMappings.addMapping(MavenPlugin.TEST_COMPILE_PRIORITY + 2, project.configurations.getByName("integrationTestRuntime"), Conf2ScopeMappingContainer.TEST)