moving unit tests from .testsuite -> .beans

added <?> wildcard to Scope methods that accept ObjectFactory

org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2002-2006 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.beans.factory.config;
+
+import static org.junit.Assert.*;
+
+import org.apache.commons.logging.Log;
+import org.junit.Test;
+
+/**
+ * Unit tests for the {@link CommonsLogFactoryBean} class.
+ *
+ * @author Rick Evans
+ * @author Chris Beams
+ */
+public final class CommonsLogFactoryBeanTests {
+
+	@Test
+	public void testIsSingleton() throws Exception {
+		CommonsLogFactoryBean factory = new CommonsLogFactoryBean();
+		assertTrue(factory.isSingleton());
+	}
+
+	@Test
+	public void testGetObjectTypeDefaultsToPlainResourceInterfaceifLookupResourceIsNotSupplied() throws Exception {
+		CommonsLogFactoryBean factory = new CommonsLogFactoryBean();
+		assertEquals(Log.class, factory.getObjectType());
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testWhenLogNameIsMissing() throws Exception {
+		CommonsLogFactoryBean factory = new CommonsLogFactoryBean();
+		factory.afterPropertiesSet();
+	}
+
+	@Test
+	public void testSunnyDayPath() throws Exception {
+		CommonsLogFactoryBean factory = new CommonsLogFactoryBean();
+		factory.setLogName("The Tin Drum");
+		factory.afterPropertiesSet();
+		Object object = factory.getObject();
+
+		assertNotNull("As per FactoryBean contract, the return value of getObject() cannot be null.", object);
+		assertTrue("Obviously not getting a Log back", Log.class.isAssignableFrom(object.getClass()));
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2002-2008 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.beans.factory.config;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+
+/**
+ * @author Rick Evans
+ * @author Juergen Hoeller
+ * @author Chris Beams
+ */
+public class CustomScopeConfigurerTests {
+
+	private static final String FOO_SCOPE = "fooScope";
+	private ConfigurableListableBeanFactory factory;
+
+	@Before
+	public void setUp() {
+		factory = new DefaultListableBeanFactory();
+	}
+
+	@Test
+	public void testWithNoScopes() throws Exception {
+		Scope scope = createMock(Scope.class);
+		replay(scope);
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.postProcessBeanFactory(factory);
+		verify(scope);
+	}
+
+	@Test
+	public void testSunnyDayWithBonaFideScopeInstance() throws Exception {
+		Scope scope = createMock(Scope.class);
+		replay(scope);
+		factory.registerScope(FOO_SCOPE, scope);
+		Map<String, Object> scopes = new HashMap<String, Object>();
+		scopes.put(FOO_SCOPE, scope);
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+		verify(scope);
+	}
+
+	@Test
+	public void testSunnyDayWithBonaFideScopeClass() throws Exception {
+		Map<String, Object> scopes = new HashMap<String, Object>();
+		scopes.put(FOO_SCOPE, NoOpScope.class);
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+		assertTrue(factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope);
+	}
+
+	@Test
+	public void testSunnyDayWithBonaFideScopeClassname() throws Exception {
+		Map<String, Object> scopes = new HashMap<String, Object>();
+		scopes.put(FOO_SCOPE, NoOpScope.class.getName());
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+		assertTrue(factory.getRegisteredScope(FOO_SCOPE) instanceof NoOpScope);
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testWhereScopeMapHasNullScopeValueInEntrySet() throws Exception {
+		Map<String, Object> scopes = new HashMap<String, Object>();
+		scopes.put(FOO_SCOPE, null);
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testWhereScopeMapHasNonScopeInstanceInEntrySet() throws Exception {
+		Map<String, Object> scopes = new HashMap<String, Object>();
+		scopes.put(FOO_SCOPE, this); // <-- not a valid value...
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test(expected=ClassCastException.class)
+	public void testWhereScopeMapHasNonStringTypedScopeNameInKeySet() throws Exception {
+		Map scopes = new HashMap();
+		scopes.put(this, new NoOpScope()); // <-- not a valid value (the key)...
+		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
+		figurer.setScopes(scopes);
+		figurer.postProcessBeanFactory(factory);
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/config/NoOpScope.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2008 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.beans.factory.config;
+
+import org.springframework.beans.factory.ObjectFactory;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class NoOpScope implements Scope {
+
+	public Object get(String name, ObjectFactory<?> objectFactory) {
+		throw new UnsupportedOperationException();
+	}
+
+	public Object remove(String name) {
+		throw new UnsupportedOperationException();
+	}
+
+	public void registerDestructionCallback(String name, Runnable callback) {
+	}
+
+	public Object resolveContextualObject(String key) {
+		return null;
+	}
+
+	public String getConversationId() {
+		return null;
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2002-2007 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.beans.factory.config;
+
+import static org.junit.Assert.*;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.TestBean;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+
+/**
+ * Simple test to illustrate and verify scope usage.
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @author Chris Beams
+ */
+public class SimpleScopeTests {
+
+	private DefaultListableBeanFactory beanFactory;
+	
+	@Before
+	public void setUp() {
+		beanFactory = new DefaultListableBeanFactory();
+		Scope scope = new NoOpScope() {
+			private int index;
+			private List<TestBean> objects = new LinkedList<TestBean>(); {
+				objects.add(new TestBean());
+				objects.add(new TestBean());
+			}
+			public Object get(String name, ObjectFactory<?> objectFactory) {
+				if (index >= objects.size()) {
+					index = 0;
+				}
+				return objects.get(index++);
+			}
+		};
+
+		beanFactory.registerScope("myScope", scope);
+
+		String[] scopeNames = beanFactory.getRegisteredScopeNames();
+		assertEquals(1, scopeNames.length);
+		assertEquals("myScope", scopeNames[0]);
+		assertSame(scope, beanFactory.getRegisteredScope("myScope"));
+
+		XmlBeanDefinitionReader xbdr = new XmlBeanDefinitionReader(beanFactory);
+		xbdr.loadBeanDefinitions("org/springframework/beans/factory/config/simpleScope.xml");
+	}
+	
+	@Test
+	public void testCanGetScopedObject() {
+		TestBean tb1 = (TestBean) beanFactory.getBean("usesScope");
+		TestBean tb2 = (TestBean) beanFactory.getBean("usesScope");
+		assertNotSame(tb1, tb2);
+		TestBean tb3 = (TestBean) beanFactory.getBean("usesScope");
+		assertSame(tb3, tb1);
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/config/simpleScope.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xmlns:util="http://www.springframework.org/schema/util"
+	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+	<bean id="usesScope" class="org.springframework.beans.TestBean" scope="myScope"/>
+
+</beans>

org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntryTests.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2006 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.beans.factory.parsing;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for the {@link ConstructorArgumentEntry} class.
+ *
+ * @author Rick Evans
+ * @author Chris Beams
+ */
+public final class ConstructorArgumentEntryTests {
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testCtorBailsOnNegativeCtorIndexArgument() {
+		new ConstructorArgumentEntry(-1);
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-2006 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.beans.factory.parsing;
+
+import static org.easymock.EasyMock.*;
+
+import org.apache.commons.logging.Log;
+import org.junit.Test;
+import org.springframework.core.io.DescriptiveResource;
+
+/**
+ * @author Rick Evans
+ * @author Juergen Hoeller
+ * @author Chris Beams
+ */
+public final class FailFastProblemReporterTests {
+
+	@Test(expected=BeanDefinitionParsingException.class)
+	public void testError() throws Exception {
+		FailFastProblemReporter reporter = new FailFastProblemReporter();
+		reporter.error(new Problem("VGER", new Location(new DescriptiveResource("here")),
+				null, new IllegalArgumentException()));
+	}
+
+	@Test
+	public void testWarn() throws Exception {
+		Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")),
+				null, new IllegalArgumentException());
+
+		Log log = createMock(Log.class);
+		log.warn(anyObject(), isA(IllegalArgumentException.class));
+		replay(log);
+
+		FailFastProblemReporter reporter = new FailFastProblemReporter();
+		reporter.setLogger(log);
+		reporter.warning(problem);
+
+		verify(log);
+	}
+
+}

org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/PropertyEntryTests.java

@@ -0,0 +1,28 @@
+package org.springframework.beans.factory.parsing;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for the {@link PropertyEntry} class.
+ *
+ * @author Rick Evans
+ * @author Chris Beams
+ */
+public final class PropertyEntryTests {
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testCtorBailsOnNullPropertyNameArgument() throws Exception {
+		new PropertyEntry(null);
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testCtorBailsOnEmptyPropertyNameArgument() throws Exception {
+		new PropertyEntry("");
+	}
+
+	@Test(expected=IllegalArgumentException.class)
+	public void testCtorBailsOnWhitespacedPropertyNameArgument() throws Exception {
+		new PropertyEntry("\t   ");
+	}
+
+}