diff options
Diffstat (limited to 'spring-context/src/test/java/org/springframework/beans/factory/xml')
-rw-r--r-- | spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 6543e365..25c3ab13 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -129,16 +129,16 @@ public class XmlBeanFactoryTests { return new ClassPathResource(CLASSNAME + suffix, CLASS); } - /* SPR-2368 */ - @Test - public void testCollectionsReferredToAsRefLocals() throws Exception { + + @Test // SPR-2368 + public void testCollectionsReferredToAsRefLocals() { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(factory).loadBeanDefinitions(COLLECTIONS_XSD_CONTEXT); factory.preInstantiateSingletons(); } @Test - public void testRefToSeparatePrototypeInstances() throws Exception { + public void testRefToSeparatePrototypeInstances() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); @@ -157,7 +157,7 @@ public class XmlBeanFactoryTests { } @Test - public void testRefToSingleton() throws Exception { + public void testRefToSingleton() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE); @@ -313,7 +313,7 @@ public class XmlBeanFactoryTests { } @Test - public void testInheritanceFromParentFactoryPrototype() throws Exception { + public void testInheritanceFromParentFactoryPrototype() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -329,7 +329,7 @@ public class XmlBeanFactoryTests { } @Test - public void testInheritanceWithDifferentClass() throws Exception { + public void testInheritanceWithDifferentClass() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -344,7 +344,7 @@ public class XmlBeanFactoryTests { } @Test - public void testInheritanceWithClass() throws Exception { + public void testInheritanceWithClass() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -359,7 +359,7 @@ public class XmlBeanFactoryTests { } @Test - public void testPrototypeInheritanceFromParentFactoryPrototype() throws Exception { + public void testPrototypeInheritanceFromParentFactoryPrototype() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -379,7 +379,7 @@ public class XmlBeanFactoryTests { } @Test - public void testPrototypeInheritanceFromParentFactorySingleton() throws Exception { + public void testPrototypeInheritanceFromParentFactorySingleton() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -439,7 +439,7 @@ public class XmlBeanFactoryTests { } @Test - public void testDependenciesMaterializeThis() throws Exception { + public void testDependenciesMaterializeThis() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEP_MATERIALIZE_CONTEXT); @@ -458,7 +458,7 @@ public class XmlBeanFactoryTests { } @Test - public void testChildOverridesParentBean() throws Exception { + public void testChildOverridesParentBean() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -477,7 +477,7 @@ public class XmlBeanFactoryTests { * If a singleton does this the factory will fail to load. */ @Test - public void testBogusParentageFromParentFactory() throws Exception { + public void testBogusParentageFromParentFactory() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -488,7 +488,7 @@ public class XmlBeanFactoryTests { } catch (BeanDefinitionStoreException ex) { // check exception message contains the name - assertTrue(ex.getMessage().indexOf("bogusParent") != -1); + assertTrue(ex.getMessage().contains("bogusParent")); assertTrue(ex.getCause() instanceof NoSuchBeanDefinitionException); } } @@ -499,7 +499,7 @@ public class XmlBeanFactoryTests { * instances even if derived from a prototype */ @Test - public void testSingletonInheritsFromParentFactoryPrototype() throws Exception { + public void testSingletonInheritsFromParentFactoryPrototype() { DefaultListableBeanFactory parent = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT); DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent); @@ -664,7 +664,7 @@ public class XmlBeanFactoryTests { } @Test - public void testInitMethodIsInvoked() throws Exception { + public void testInitMethodIsInvoked() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); DoubleInitializer in = (DoubleInitializer) xbf.getBean("init-method1"); @@ -684,14 +684,14 @@ public class XmlBeanFactoryTests { fail(); } catch (BeanCreationException ex) { - assertTrue(ex.getResourceDescription().indexOf("initializers.xml") != -1); + assertTrue(ex.getResourceDescription().contains("initializers.xml")); assertEquals("init-method2", ex.getBeanName()); assertTrue(ex.getCause() instanceof IOException); } } @Test - public void testNoSuchInitMethod() throws Exception { + public void testNoSuchInitMethod() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); try { @@ -700,9 +700,9 @@ public class XmlBeanFactoryTests { } catch (FatalBeanException ex) { // check message is helpful - assertTrue(ex.getMessage().indexOf("initializers.xml") != -1); - assertTrue(ex.getMessage().indexOf("init-method3") != -1); - assertTrue(ex.getMessage().indexOf("init") != -1); + assertTrue(ex.getMessage().contains("initializers.xml")); + assertTrue(ex.getMessage().contains("init-method3")); + assertTrue(ex.getMessage().contains("init")); } } @@ -710,7 +710,7 @@ public class XmlBeanFactoryTests { * Check that InitializingBean method is called first. */ @Test - public void testInitializingBeanAndInitMethod() throws Exception { + public void testInitializingBeanAndInitMethod() { InitAndIB.constructed = false; DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); @@ -731,7 +731,7 @@ public class XmlBeanFactoryTests { * Check that InitializingBean method is not called twice. */ @Test - public void testInitializingBeanAndSameInitMethod() throws Exception { + public void testInitializingBeanAndSameInitMethod() { InitAndIB.constructed = false; DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT); @@ -749,7 +749,7 @@ public class XmlBeanFactoryTests { } @Test - public void testDefaultLazyInit() throws Exception { + public void testDefaultLazyInit() { InitAndIB.constructed = false; DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_LAZY_CONTEXT); @@ -765,13 +765,13 @@ public class XmlBeanFactoryTests { } @Test(expected = BeanDefinitionStoreException.class) - public void noSuchXmlFile() throws Exception { + public void noSuchXmlFile() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(MISSING_CONTEXT); } @Test(expected = BeanDefinitionStoreException.class) - public void invalidXmlFile() throws Exception { + public void invalidXmlFile() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INVALID_CONTEXT); } @@ -825,7 +825,7 @@ public class XmlBeanFactoryTests { } @Test - public void testAutowire() throws Exception { + public void testAutowire() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT); TestBean spouse = new TestBean("kerry", 0); @@ -834,7 +834,7 @@ public class XmlBeanFactoryTests { } @Test - public void testAutowireWithParent() throws Exception { + public void testAutowireWithParent() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); @@ -847,7 +847,7 @@ public class XmlBeanFactoryTests { doTestAutowire(xbf); } - private void doTestAutowire(DefaultListableBeanFactory xbf) throws Exception { + private void doTestAutowire(DefaultListableBeanFactory xbf) { DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1"); TestBean kerry = (TestBean) xbf.getBean("spouse"); // should have been autowired @@ -896,7 +896,7 @@ public class XmlBeanFactoryTests { } @Test - public void testAutowireWithDefault() throws Exception { + public void testAutowireWithDefault() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_AUTOWIRE_CONTEXT); @@ -919,7 +919,7 @@ public class XmlBeanFactoryTests { } @Test - public void testAutowireByConstructor() throws Exception { + public void testAutowireByConstructor() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorDependenciesBean rod1 = (ConstructorDependenciesBean) xbf.getBean("rod1"); @@ -957,7 +957,7 @@ public class XmlBeanFactoryTests { } @Test - public void testAutowireByConstructorWithSimpleValues() throws Exception { + public void testAutowireByConstructorWithSimpleValues() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); @@ -995,7 +995,7 @@ public class XmlBeanFactoryTests { xbf.getBean("rod2Accessor"); } catch (BeanCreationException ex) { - assertTrue(ex.toString().indexOf("touchy") != -1); + assertTrue(ex.toString().contains("touchy")); ex.printStackTrace(); assertNull(ex.getRelatedCauses()); } @@ -1075,14 +1075,14 @@ public class XmlBeanFactoryTests { } @Test(expected = BeanCreationException.class) - public void throwsExceptionOnTooManyArguments() throws Exception { + public void throwsExceptionOnTooManyArguments() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); xbf.getBean("rod7", ConstructorDependenciesBean.class); } @Test(expected = UnsatisfiedDependencyException.class) - public void throwsExceptionOnAmbiguousResolution() throws Exception { + public void throwsExceptionOnAmbiguousResolution() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); xbf.getBean("rod8", ConstructorDependenciesBean.class); @@ -1176,7 +1176,7 @@ public class XmlBeanFactoryTests { fail("Must have thrown a CannotLoadBeanClassException"); } catch (CannotLoadBeanClassException ex) { - assertTrue(ex.getResourceDescription().indexOf("classNotFound.xml") != -1); + assertTrue(ex.getResourceDescription().contains("classNotFound.xml")); assertTrue(ex.getCause() instanceof ClassNotFoundException); } } @@ -1428,12 +1428,12 @@ public class XmlBeanFactoryTests { } catch (BeanDefinitionStoreException ex) { // Check that the bogus method name was included in the error message - assertTrue("Bogus method name correctly reported", ex.getMessage().indexOf("bogusMethod") != -1); + assertTrue("Bogus method name correctly reported", ex.getMessage().contains("bogusMethod")); } } @Test - public void serializableMethodReplacerAndSuperclass() throws Exception { + public void serializableMethodReplacerAndSuperclass() throws IOException { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf); reader.loadBeanDefinitions(DELEGATION_OVERRIDES_CONTEXT); @@ -1632,7 +1632,7 @@ public class XmlBeanFactoryTests { } @Test - public void testWithDuplicateName() throws Exception { + public void testWithDuplicateName() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); try { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAMES_CONTEXT); @@ -1644,7 +1644,7 @@ public class XmlBeanFactoryTests { } @Test - public void testWithDuplicateNameInAlias() throws Exception { + public void testWithDuplicateNameInAlias() { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); try { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT); |