GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update TODOs for SPR-11574 

Issue: SPR-11574
pull/441/merge
Sam Brannen 12 years ago
parent
9ce0df89ff
commit
b640b9fdfe
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java

8
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
Unescape 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(

Write Preview
Loading…
Cancel
Save