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

declarative destroy-method="..." specifications get validated at bean creation time (SPR-5602)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-03-27 17:45:53 +00:00
parent d14cc0d7a2
commit bcf6f23225
4 changed files with 98 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 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.
@@ -16,21 +16,20 @@
package org.springframework.beans.factory.xml;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import static org.junit.Assert.*;
import org.junit.Test;
import test.beans.TestBean;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.ClassPathResource;
import test.beans.TestBean;
/**
* @author Juergen Hoeller
* @author Chris Beams
@@ -71,6 +70,21 @@ public class FactoryMethodTests {
assertTrue(tb.wasDestroyed());
}
@Test
public void testFactoryMethodsWithInvalidDestroyMethod() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
try {
xbf.getBean("defaultTestBeanWithInvalidDestroyMethod");
fail("Should have thrown BeanCreationException");
}
catch (BeanCreationException ex) {
// expected
}
}
@Test
public void testFactoryMethodsWithNullInstance() {
DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();

3
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/factory-methods.xml
View File

@@ -12,6 +12,9 @@
<bean id="defaultTestBean" factory-bean="default" factory-method="getTestBean"
init-method="haveBirthday" destroy-method="destroy"/>
<bean id="defaultTestBeanWithInvalidDestroyMethod" factory-bean="default" factory-method="getTestBean"
init-method="haveBirthday" destroy-method="xxx" lazy-init="true"/>
<bean id="defaultTestBean.protected" factory-bean="default" factory-method="protectedGetTestBean"
init-method="haveBirthday" destroy-method="destroy"/>