From 8ad36ef8125f68eb320f21db0c53921062bfa8bf Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 16 Jun 2013 20:03:21 +0200 Subject: [PATCH] Delete remaining JUnit 3.8 tests in spring-test This commit deletes the remaining JUnit 3.8 tests in the spring-test module that were still subclassing deprecated class hierarchies. Issue: SPR-10499 --- ...stractSpr3350SingleSpringContextTests.java | 79 ------------------- ...ingleSpringContextTests-context.properties | 2 - ...sBasedSpr3350SingleSpringContextTests.java | 60 -------------- ...DependencyInjectionSpringContextTests.java | 67 ---------------- .../test/Spr3264SingleSpringContextTests.java | 55 ------------- ...pr3350SingleSpringContextTests-context.xml | 9 --- ...lBasedSpr3350SingleSpringContextTests.java | 45 ----------- 7 files changed, 317 deletions(-) delete mode 100644 spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java delete mode 100644 spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties delete mode 100644 spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java delete mode 100644 spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java delete mode 100644 spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java delete mode 100644 spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml delete mode 100644 spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java deleted file mode 100644 index ba8c81c294..0000000000 --- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java +++ /dev/null @@ -1,79 +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.test; - -import org.springframework.tests.sample.beans.Pet; -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.context.ApplicationContext; - -/** - * Abstract JUnit 3.8 based unit test which verifies new functionality requested - * in SPR-3350. - * - * @author Sam Brannen - * @since 2.5 - */ -@SuppressWarnings("deprecation") -public abstract class AbstractSpr3350SingleSpringContextTests extends AbstractDependencyInjectionSpringContextTests { - - private Pet cat; - - - public AbstractSpr3350SingleSpringContextTests() { - super(); - } - - public AbstractSpr3350SingleSpringContextTests(String name) { - super(name); - } - - public final void setCat(final Pet cat) { - this.cat = cat; - } - - /** - * Forcing concrete subclasses to provide a config path appropriate to the - * configured - * {@link #createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext) - * BeanDefinitionReader}. - * - * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigPath() - */ - @Override - protected abstract String getConfigPath(); - - /** - *

- * Test which addresses the following issue raised in SPR-3350: - *

- *

- * {@link AbstractSingleSpringContextTests} always uses an - * {@link XmlBeanDefinitionReader} internally when creating the - * {@link ApplicationContext} inside - * {@link #createApplicationContext(String[])}. It would be nice to have the - * bean definition reader creation in a separate method so that subclasses - * can choose that individually without having to copy-n-paste code from - * createApplicationContext() to do the context creation and refresh. - * Consider JavaConfig where an Annotation based reader can be plugged in. - *

- */ - public final void testApplicationContextNotAutoCreated() { - assertNotNull("The cat field should have been autowired.", this.cat); - assertEquals("Garfield", this.cat.getName()); - } -} diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties deleted file mode 100644 index 7b96503a3f..0000000000 --- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties +++ /dev/null @@ -1,2 +0,0 @@ -cat.(class)=org.springframework.tests.sample.beans.Pet -cat.$0=Garfield diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java deleted file mode 100644 index 07b0cf4b5e..0000000000 --- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2002-2012 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.test; - -import org.springframework.beans.factory.support.BeanDefinitionReader; -import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader; -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.context.support.GenericApplicationContext; - -/** - * Concrete implementation of {@link AbstractSpr3350SingleSpringContextTests} - * which configures a {@link PropertiesBeanDefinitionReader} instead of the - * default {@link XmlBeanDefinitionReader}. - * - * @author Sam Brannen - * @since 2.5 - */ -public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3350SingleSpringContextTests { - - public PropertiesBasedSpr3350SingleSpringContextTests() { - super(); - } - - public PropertiesBasedSpr3350SingleSpringContextTests(String name) { - super(name); - } - - /** - * Creates a new {@link PropertiesBeanDefinitionReader}. - * - * @see org.springframework.test.AbstractSingleSpringContextTests#createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext) - */ - @Override - protected final BeanDefinitionReader createBeanDefinitionReader(GenericApplicationContext context) { - return new PropertiesBeanDefinitionReader(context); - } - - /** - * Returns - * "PropertiesBasedSpr3350SingleSpringContextTests-context.properties". - */ - @Override - protected final String getConfigPath() { - return "PropertiesBasedSpr3350SingleSpringContextTests-context.properties"; - } -} diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java deleted file mode 100644 index 08523c7949..0000000000 --- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2002-2012 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.test; - -/** - * JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264. - * - * @author Sam Brannen - * @since 2.5 - * @see Spr3264SingleSpringContextTests - */ -@SuppressWarnings("deprecation") -public class Spr3264DependencyInjectionSpringContextTests extends AbstractDependencyInjectionSpringContextTests { - - public Spr3264DependencyInjectionSpringContextTests() { - super(); - } - - public Spr3264DependencyInjectionSpringContextTests(String name) { - super(name); - } - - /** - *

- * Test which addresses the following issue raised in SPR-3264: - *

- *

- * AbstractDependencyInjectionSpringContextTests will try to apply - * auto-injection; this can be disabled but it has to be done manually - * inside the onSetUp... - *

- */ - public void testInjectDependenciesThrowsIllegalStateException() { - - // Re-assert issues covered by Spr3264SingleSpringContextTests as a - // safety net. - assertNull("The ApplicationContext should NOT be automatically created if no 'locations' are defined.", - this.applicationContext); - assertEquals("Verifying the ApplicationContext load count.", 0, super.getLoadCount()); - - // Assert changes to AbstractDependencyInjectionSpringContextTests: - new AssertThrows(IllegalStateException.class) { - - @Override - public void test() throws Exception { - Spr3264DependencyInjectionSpringContextTests.super.injectDependencies(); - } - }.runTest(); - } - -} diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java deleted file mode 100644 index 4b3223f4ba..0000000000 --- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2012 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.test; - -/** - * JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264. - * - * @author Sam Brannen - * @since 2.5 - * @see Spr3264DependencyInjectionSpringContextTests - */ -@SuppressWarnings("deprecation") -public class Spr3264SingleSpringContextTests extends AbstractSingleSpringContextTests { - - public Spr3264SingleSpringContextTests() { - super(); - } - - public Spr3264SingleSpringContextTests(String name) { - super(name); - } - - /** - *

- * Test which addresses the following issue raised in SPR-3264: - *

- *

- * AbstractSingleSpringContextTests always expects an application context to - * be created even if no files/locations are specified which can lead to NPE - * problems or force an appCtx to be instantiated even if not needed. - *

- */ - public void testApplicationContextNotAutoCreated() { - assertNull("The ApplicationContext should NOT be automatically created if no 'locations' are defined.", - super.applicationContext); - assertEquals("Verifying the ApplicationContext load count.", 0, super.getLoadCount()); - } - -} diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml deleted file mode 100644 index b1939de12f..0000000000 --- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java deleted file mode 100644 index 192d005f4a..0000000000 --- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2002-2012 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.test; - -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; - -/** - * Concrete implementation of {@link AbstractSpr3350SingleSpringContextTests} - * which is based on the default {@link XmlBeanDefinitionReader}. - * - * @author Sam Brannen - * @since 2.5 - */ -public class XmlBasedSpr3350SingleSpringContextTests extends AbstractSpr3350SingleSpringContextTests { - - public XmlBasedSpr3350SingleSpringContextTests() { - super(); - } - - public XmlBasedSpr3350SingleSpringContextTests(String name) { - super(name); - } - - /** - * Returns "XmlBasedSpr3350SingleSpringContextTests-context.xml". - */ - @Override - protected final String getConfigPath() { - return "XmlBasedSpr3350SingleSpringContextTests-context.xml"; - } -} -- GitLab