forked from spring-projects/spring-boot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit adds new annotation `@DataLdapTest` which provides test infrastructure for LDAP. By default, embedded ldap server is initialized if available. See spring-projectsgh-8536
- Loading branch information
1 parent
209ecf9
commit 2830bef
Showing
13 changed files
with
605 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...ain/java/org/springframework/boot/test/autoconfigure/data/ldap/AutoConfigureDataLdap.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright 2012-2017 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.test.autoconfigure.data.ldap; | ||
|
||
import java.lang.annotation.Documented; | ||
import java.lang.annotation.ElementType; | ||
import java.lang.annotation.Inherited; | ||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
import java.lang.annotation.Target; | ||
|
||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; | ||
|
||
/** | ||
* {@link ImportAutoConfiguration Auto-configuration imports} for typical Data LDAP | ||
* tests. Most tests should consider using {@link DataLdapTest @DataLdapTest} rather | ||
* than using this annotation directly. | ||
* | ||
* @author Eddú Meléndez | ||
* @since 2.0.0 | ||
* @see DataLdapTest | ||
*/ | ||
@Target(ElementType.TYPE) | ||
@Retention(RetentionPolicy.RUNTIME) | ||
@Documented | ||
@Inherited | ||
@ImportAutoConfiguration | ||
public @interface AutoConfigureDataLdap { | ||
|
||
} |
93 changes: 93 additions & 0 deletions
93
...ure/src/main/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
/* | ||
* Copyright 2012-2017 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.test.autoconfigure.data.ldap; | ||
|
||
import java.lang.annotation.Documented; | ||
import java.lang.annotation.ElementType; | ||
import java.lang.annotation.Inherited; | ||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
import java.lang.annotation.Target; | ||
|
||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; | ||
import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration; | ||
import org.springframework.boot.test.autoconfigure.core.AutoConfigureCache; | ||
import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters; | ||
import org.springframework.boot.test.context.SpringBootTestContextBootstrapper; | ||
import org.springframework.context.annotation.ComponentScan.Filter; | ||
import org.springframework.core.annotation.AliasFor; | ||
import org.springframework.test.context.BootstrapWith; | ||
|
||
/** | ||
* Annotation that can be used in combination with {@code @RunWith(SpringRunner.class)} | ||
* for a typical LDAP test. Can be used when a test focuses <strong>only</strong> on | ||
* LDAP components. | ||
* <p> | ||
* Using this annotation will disable full auto-configuration and instead apply only | ||
* configuration relevant to LDAP tests. | ||
* <p> | ||
* By default, tests annotated with {@code @DataLdapTest} will use an embedded in-memory | ||
* LDAP process (if available). | ||
* | ||
* @author Eddú Meléndez | ||
* @since 2.0.0 | ||
*/ | ||
@Target(ElementType.TYPE) | ||
@Retention(RetentionPolicy.RUNTIME) | ||
@Documented | ||
@Inherited | ||
@BootstrapWith(SpringBootTestContextBootstrapper.class) | ||
@OverrideAutoConfiguration(enabled = false) | ||
@TypeExcludeFilters(DataLdapTypeExcludeFilter.class) | ||
@AutoConfigureCache | ||
@AutoConfigureDataLdap | ||
@ImportAutoConfiguration | ||
public @interface DataLdapTest { | ||
|
||
/** | ||
* Determines if default filtering should be used with | ||
* {@link SpringBootApplication @SpringBootApplication}. By default no beans are | ||
* included. | ||
* @see #includeFilters() | ||
* @see #excludeFilters() | ||
* @return if default filters should be used | ||
*/ | ||
boolean useDefaultFilters() default true; | ||
|
||
/** | ||
* A set of include filters which can be used to add otherwise filtered beans to the | ||
* application context. | ||
* @return include filters to apply | ||
*/ | ||
Filter[] includeFilters() default {}; | ||
|
||
/** | ||
* A set of exclude filters which can be used to filter beans that would otherwise be | ||
* added to the application context. | ||
* @return exclude filters to apply | ||
*/ | ||
Filter[] excludeFilters() default {}; | ||
|
||
/** | ||
* Auto-configuration exclusions that should be applied for this test. | ||
* @return auto-configuration exclusions to apply | ||
*/ | ||
@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") | ||
Class<?>[] excludeAutoConfiguration() default {}; | ||
|
||
} |
73 changes: 73 additions & 0 deletions
73
...java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTypeExcludeFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* Copyright 2012-2017 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.test.autoconfigure.data.ldap; | ||
|
||
import java.util.Collections; | ||
import java.util.Set; | ||
|
||
import org.springframework.boot.context.TypeExcludeFilter; | ||
import org.springframework.boot.test.autoconfigure.filter.AnnotationCustomizableTypeExcludeFilter; | ||
import org.springframework.context.annotation.ComponentScan.Filter; | ||
import org.springframework.core.annotation.AnnotatedElementUtils; | ||
|
||
/** | ||
* {@link TypeExcludeFilter} for {@link DataLdapTest @DataLdapTest}. | ||
* | ||
* @author Eddú Meléndez | ||
*/ | ||
class DataLdapTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { | ||
|
||
private final DataLdapTest annotation; | ||
|
||
DataLdapTypeExcludeFilter(Class<?> testClass) { | ||
this.annotation = AnnotatedElementUtils.getMergedAnnotation(testClass, | ||
DataLdapTest.class); | ||
} | ||
|
||
@Override | ||
protected boolean hasAnnotation() { | ||
return this.annotation != null; | ||
} | ||
|
||
@Override | ||
protected Filter[] getFilters(FilterType type) { | ||
switch (type) { | ||
case INCLUDE: | ||
return this.annotation.includeFilters(); | ||
case EXCLUDE: | ||
return this.annotation.excludeFilters(); | ||
default: | ||
throw new IllegalStateException("Unsupported type " + type); | ||
} | ||
} | ||
|
||
@Override | ||
protected boolean isUseDefaultFilters() { | ||
return this.annotation.useDefaultFilters(); | ||
} | ||
|
||
@Override | ||
protected Set<Class<?>> getDefaultIncludes() { | ||
return Collections.emptySet(); | ||
} | ||
|
||
@Override | ||
protected Set<Class<?>> getComponentIncludes() { | ||
return Collections.emptySet(); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...a/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestIntegrationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* Copyright 2012-2017 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.test.autoconfigure.data.ldap; | ||
|
||
import org.junit.Rule; | ||
import org.junit.Test; | ||
import org.junit.rules.ExpectedException; | ||
import org.junit.runner.RunWith; | ||
|
||
import org.springframework.beans.factory.NoSuchBeanDefinitionException; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.context.ApplicationContext; | ||
import org.springframework.ldap.core.LdapTemplate; | ||
import org.springframework.ldap.query.LdapQuery; | ||
import org.springframework.ldap.query.LdapQueryBuilder; | ||
import org.springframework.ldap.support.LdapUtils; | ||
import org.springframework.test.context.TestPropertySource; | ||
import org.springframework.test.context.junit4.SpringRunner; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* Sample test for {@link DataLdapTest @DataLdapTest} | ||
* | ||
* @author Eddú Meléndez | ||
*/ | ||
@RunWith(SpringRunner.class) | ||
@DataLdapTest | ||
@TestPropertySource(properties = {"spring.ldap.embedded.base-dn=dc=spring,dc=org", | ||
"spring.ldap.embedded.ldif=classpath:org/springframework/boot/test/autoconfigure/data/ldap/schema.ldif"}) | ||
public class DataLdapTestIntegrationTests { | ||
|
||
@Rule | ||
public ExpectedException thrown = ExpectedException.none(); | ||
|
||
@Autowired | ||
private LdapTemplate ldapTemplate; | ||
|
||
@Autowired | ||
private ExampleRepository exampleRepository; | ||
|
||
@Autowired | ||
private ApplicationContext applicationContext; | ||
|
||
@Test | ||
public void testRepository() { | ||
LdapQuery ldapQuery = LdapQueryBuilder.query().where("cn").is("Bob Smith"); | ||
ExampleEntry entry = this.exampleRepository.findOne(ldapQuery); | ||
assertThat(entry.getDn()) | ||
.isEqualTo(LdapUtils.newLdapName("cn=Bob Smith,ou=company1,c=Sweden,dc=spring,dc=org")); | ||
assertThat(this.ldapTemplate.findOne(ldapQuery, ExampleEntry.class).getDn()) | ||
.isEqualTo(LdapUtils.newLdapName("cn=Bob Smith,ou=company1,c=Sweden,dc=spring,dc=org")); | ||
} | ||
|
||
@Test | ||
public void didNotInjectExampleService() { | ||
this.thrown.expect(NoSuchBeanDefinitionException.class); | ||
this.applicationContext.getBean(ExampleService.class); | ||
} | ||
|
||
} |
Oops, something went wrong.