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

Update TODOs for SPR-11574

Browse Source 
Issue: SPR-11574
This commit is contained in:
Sam Brannen
2014-03-18 18:33:26 +01:00
parent 9ce0df89ff
commit b640b9fdfe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
View File

@@ -130,7 +130,7 @@ public class ConfigurationClassPostProcessorTests {
postProcessorWorksWithComposedConfigurationWithAttributeOverrides(beanDefinition); postProcessorWorksWithComposedConfigurationWithAttributeOverrides(beanDefinition);
} }
// TODO Remove expected exception when SPR-XXXXX is resolved. // TODO Remove expected exception when SPR-11574 is resolved.
@Test(expected = ConflictingBeanDefinitionException.class) @Test(expected = ConflictingBeanDefinitionException.class)
public void postProcessorWorksWithComposedConfigurationWithAttributeOverridesUsingAsm() { public void postProcessorWorksWithComposedConfigurationWithAttributeOverridesUsingAsm() {
RootBeanDefinition beanDefinition = new RootBeanDefinition( RootBeanDefinition beanDefinition = new RootBeanDefinition(
@@ -145,7 +145,7 @@ public class ConfigurationClassPostProcessorTests {
postProcessorWorksWithComposedComposedConfigurationWithAttributeOverrides(beanDefinition); postProcessorWorksWithComposedComposedConfigurationWithAttributeOverrides(beanDefinition);
} }
// TODO Remove expected exception when SPR-XXXXX is resolved. // TODO Remove expected exception when SPR-11574 is resolved.
@Test(expected = ConflictingBeanDefinitionException.class) @Test(expected = ConflictingBeanDefinitionException.class)
public void postProcessorWorksWithComposedComposedConfigurationWithAttributeOverridesUsingAsm() { public void postProcessorWorksWithComposedComposedConfigurationWithAttributeOverridesUsingAsm() {
RootBeanDefinition beanDefinition = new RootBeanDefinition( RootBeanDefinition beanDefinition = new RootBeanDefinition(
@@ -160,7 +160,7 @@ public class ConfigurationClassPostProcessorTests {
postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverrides(beanDefinition); postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverrides(beanDefinition);
} }
// TODO Remove expected exception when SPR-XXXXX is resolved. // TODO Remove expected exception when SPR-11574 is resolved.
@Test(expected = ConflictingBeanDefinitionException.class) @Test(expected = ConflictingBeanDefinitionException.class)
public void postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesUsingAsm() { public void postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesUsingAsm() {
RootBeanDefinition beanDefinition = new RootBeanDefinition( RootBeanDefinition beanDefinition = new RootBeanDefinition(
@@ -175,7 +175,7 @@ public class ConfigurationClassPostProcessorTests {
postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesSubclass(beanDefinition); postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesSubclass(beanDefinition);
} }
// TODO Remove expected exception when SPR-XXXXX is resolved. // TODO Remove expected exception when SPR-11574 is resolved.
@Test(expected = ConflictingBeanDefinitionException.class) @Test(expected = ConflictingBeanDefinitionException.class)
public void postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesSubclassUsingAsm() { public void postProcessorWorksWithMetaComponentScanConfigurationWithAttributeOverridesSubclassUsingAsm() {
RootBeanDefinition beanDefinition = new RootBeanDefinition( RootBeanDefinition beanDefinition = new RootBeanDefinition(