From bb5973373659ea7d2cbced64f62e525e0b5c0be1 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 21 Feb 2018 11:18:48 -0700 Subject: [PATCH] Sec2377Tests groovy->java Issue: gh-4939 --- .../configuration/sec2377/Sec2377Tests.groovy | 38 --------------- .../configuration/sec2377/Sec2377Tests.java | 47 +++++++++++++++++++ .../sec2377/a/Sec2377AConfig.java | 2 +- .../sec2377/b/Sec2377BConfig.java | 4 +- 4 files changed, 50 insertions(+), 41 deletions(-) delete mode 100644 config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.groovy create mode 100644 config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.java rename config/src/test/{groovy => java}/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java (94%) rename config/src/test/{groovy => java}/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java (94%) diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.groovy b/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.groovy deleted file mode 100644 index eeb5f66cf2..0000000000 --- a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.groovy +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2002-2013 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.security.config.annotation.web.configuration.sec2377; - -import org.springframework.security.config.annotation.BaseSpringSpec -import org.springframework.security.config.annotation.web.configuration.sec2377.a.* -import org.springframework.security.config.annotation.web.configuration.sec2377.b.* -import org.springframework.web.context.support.AnnotationConfigWebApplicationContext - -public class Sec2377Tests extends BaseSpringSpec { - - def "SEC-2377: Error reporting with multiple EnableWebSecurity from other packages"() { - when: - AnnotationConfigWebApplicationContext parent = new AnnotationConfigWebApplicationContext() - parent.register(Sec2377AConfig) - parent.refresh() - - AnnotationConfigWebApplicationContext child = new AnnotationConfigWebApplicationContext() - child.register(Sec2377BConfig) - child.parent = parent - child.refresh() - then: - noExceptionThrown(); - } -} diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.java new file mode 100644 index 0000000000..aa8a544036 --- /dev/null +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/Sec2377Tests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2002-2018 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.security.config.annotation.web.configuration.sec2377; + +import org.junit.Rule; +import org.junit.Test; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.security.config.annotation.web.configuration.sec2377.a.Sec2377AConfig; +import org.springframework.security.config.annotation.web.configuration.sec2377.b.Sec2377BConfig; +import org.springframework.security.config.test.SpringTestRule; + +/** + * @author Rob Winch + * @author Josh Cummings + */ +public class Sec2377Tests { + + @Rule + public final SpringTestRule parent = new SpringTestRule(); + + @Rule + public final SpringTestRule child = new SpringTestRule(); + + @Test + public void refreshContextWhenParentAndChildRegisteredThenNoException() { + this.parent.register(Sec2377AConfig.class).autowire(); + + ConfigurableApplicationContext context = + this.child.register(Sec2377BConfig.class).getContext(); + context.setParent(this.parent.getContext()); + + this.child.autowire(); + } +} diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java similarity index 94% rename from config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java rename to config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java index 57fff7b72b..6409bd166e 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/a/Sec2377AConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java similarity index 94% rename from config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java rename to config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java index 8e96598f63..b8dd9abf71 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/sec2377/b/Sec2377BConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -21,4 +21,4 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur @EnableWebSecurity public class Sec2377BConfig extends WebSecurityConfigurerAdapter { -} \ No newline at end of file +}