Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move inner-types so that they are always last

Browse Source 
Move all inner-types so that they are consistently the last item
defined. This aligns with the style used by Spring Framework and
the consistency generally makes it easier to scan the source.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-26 13:35:03 -07:00
committed by Rob Winch
parent 418c3d6808
commit a2f2e9ac8d
163 changed files with 10287 additions and 10332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java
View File

@@ -58,6 +58,46 @@ public class UnboundIdContainerLdifTests {
assertThat(template.compare("uid=bob,ou=people", "uid", "bob")).isTrue();
}
@Test
public void unboundIdContainerWhenWildcardLdifNameThenLdifLoaded() {
this.appCtx = new AnnotationConfigApplicationContext(WildcardLdifConfig.class);
DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx
.getBean(ContextSource.class);
SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource);
assertThat(template.compare("uid=bob,ou=people", "uid", "bob")).isTrue();
}
@Test
public void unboundIdContainerWhenMalformedLdifThenException() {
try {
this.appCtx = new AnnotationConfigApplicationContext(MalformedLdifConfig.class);
failBecauseExceptionWasNotThrown(IllegalStateException.class);
}
catch (Exception e) {
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:test-server-malformed.txt");
}
}
@Test
public void unboundIdContainerWhenMissingLdifThenException() {
try {
this.appCtx = new AnnotationConfigApplicationContext(MissingLdifConfig.class);
failBecauseExceptionWasNotThrown(IllegalStateException.class);
}
catch (Exception e) {
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:does-not-exist.ldif");
}
}
@Test
public void unboundIdContainerWhenWildcardLdifNotFoundThenProceeds() {
new AnnotationConfigApplicationContext(WildcardNoLdifConfig.class);
}
@Configuration
static class CustomLdifConfig {
@@ -83,17 +123,6 @@ public class UnboundIdContainerLdifTests {
}
@Test
public void unboundIdContainerWhenWildcardLdifNameThenLdifLoaded() {
this.appCtx = new AnnotationConfigApplicationContext(WildcardLdifConfig.class);
DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx
.getBean(ContextSource.class);
SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource);
assertThat(template.compare("uid=bob,ou=people", "uid", "bob")).isTrue();
}
@Configuration
static class WildcardLdifConfig {
@@ -119,18 +148,6 @@ public class UnboundIdContainerLdifTests {
}
@Test
public void unboundIdContainerWhenMalformedLdifThenException() {
try {
this.appCtx = new AnnotationConfigApplicationContext(MalformedLdifConfig.class);
failBecauseExceptionWasNotThrown(IllegalStateException.class);
}
catch (Exception e) {
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:test-server-malformed.txt");
}
}
@Configuration
static class MalformedLdifConfig {
@@ -150,18 +167,6 @@ public class UnboundIdContainerLdifTests {
}
@Test
public void unboundIdContainerWhenMissingLdifThenException() {
try {
this.appCtx = new AnnotationConfigApplicationContext(MissingLdifConfig.class);
failBecauseExceptionWasNotThrown(IllegalStateException.class);
}
catch (Exception e) {
assertThat(e.getCause()).isInstanceOf(IllegalStateException.class);
assertThat(e.getMessage()).contains("Unable to load LDIF classpath:does-not-exist.ldif");
}
}
@Configuration
static class MissingLdifConfig {
@@ -181,11 +186,6 @@ public class UnboundIdContainerLdifTests {
}
@Test
public void unboundIdContainerWhenWildcardLdifNotFoundThenProceeds() {
new AnnotationConfigApplicationContext(WildcardNoLdifConfig.class);
}
@Configuration
static class WildcardNoLdifConfig {