Moved tests from testsuite to orm

org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright 2002-2005 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.orm.jdo;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Method;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+
+import junit.framework.TestCase;
+
+import org.aopalliance.intercept.Interceptor;
+import org.aopalliance.intercept.Invocation;
+import org.aopalliance.intercept.MethodInvocation;
+import org.easymock.MockControl;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class JdoInterceptorTests extends TestCase {
+
+	public void testInterceptor() {
+		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
+		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoInterceptor interceptor = new JdoInterceptor();
+		interceptor.setPersistenceManagerFactory(pmf);
+		try {
+			interceptor.invoke(new TestInvocation(pmf));
+		}
+		catch (Throwable t) {
+			fail("Should not have thrown Throwable: " + t.getMessage());
+		}
+
+		pmfControl.verify();
+		pmControl.verify();
+	}
+
+	public void testInterceptorWithPrebound() {
+		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		MockControl pmControl = MockControl.createControl(PersistenceManager.class);
+		PersistenceManager pm = (PersistenceManager) pmControl.getMock();
+		pmfControl.replay();
+		pmControl.replay();
+
+		TransactionSynchronizationManager.bindResource(pmf, new PersistenceManagerHolder(pm));
+		JdoInterceptor interceptor = new JdoInterceptor();
+		interceptor.setPersistenceManagerFactory(pmf);
+		try {
+			interceptor.invoke(new TestInvocation(pmf));
+		}
+		catch (Throwable t) {
+			fail("Should not have thrown Throwable: " + t.getMessage());
+		}
+		finally {
+			TransactionSynchronizationManager.unbindResource(pmf);
+		}
+
+		pmfControl.verify();
+		pmControl.verify();
+	}
+
+
+	private static class TestInvocation implements MethodInvocation {
+
+		private PersistenceManagerFactory persistenceManagerFactory;
+
+		public TestInvocation(PersistenceManagerFactory persistenceManagerFactory) {
+			this.persistenceManagerFactory = persistenceManagerFactory;
+		}
+
+		public Object proceed() throws Throwable {
+			if (!TransactionSynchronizationManager.hasResource(this.persistenceManagerFactory)) {
+				throw new IllegalStateException("PersistenceManager not bound");
+			}
+			return null;
+		}
+
+		public Object[] getArguments() {
+			return null;
+		}
+
+		public int getCurrentInterceptorIndex() {
+			return 0;
+		}
+
+		public int getNumberOfInterceptors() {
+			return 0;
+		}
+
+		public Interceptor getInterceptor(int i) {
+			return null;
+		}
+
+		public Method getMethod() {
+			return null;
+		}
+
+		public AccessibleObject getStaticPart() {
+			return getMethod();
+		}
+
+		public Object getArgument(int i) {
+			return null;
+		}
+
+		public void setArgument(int i, Object handler) {
+		}
+
+		public int getArgumentCount() {
+			return 0;
+		}
+
+		public Object getThis() {
+			return null;
+		}
+
+		public Object getProxy() {
+			return null;
+		}
+
+		public Invocation cloneInstance() {
+			return null;
+		}
+
+		public void release() {
+		}
+	}
+
+}

org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java

@@ -0,0 +1,787 @@
+/*
+ * Copyright 2002-2005 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.orm.jdo;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.jdo.JDODataStoreException;
+import javax.jdo.JDOException;
+import javax.jdo.JDOFatalDataStoreException;
+import javax.jdo.JDOFatalUserException;
+import javax.jdo.JDOObjectNotFoundException;
+import javax.jdo.JDOOptimisticVerificationException;
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+
+import junit.framework.TestCase;
+import org.easymock.MockControl;
+
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * @author Juergen Hoeller
+ * @since 03.06.2003
+ */
+public class JdoTemplateTests extends TestCase {
+
+	private MockControl pmfControl;
+	private PersistenceManagerFactory pmf;
+	private MockControl pmControl;
+	private PersistenceManager pm;
+
+	protected void setUp() {
+		pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		pmControl = MockControl.createControl(PersistenceManager.class);
+		pm = (PersistenceManager) pmControl.getMock();
+		pmf.getConnectionFactory();
+		pmfControl.setReturnValue(null, 1);
+	}
+
+	protected void tearDown() {
+		try {
+			pmfControl.verify();
+			pmControl.verify();
+		}
+		catch (IllegalStateException ex) {
+			// ignore: test method didn't call replay
+		}
+	}
+
+	public void testTemplateExecuteWithNotAllowCreate() {
+		JdoTemplate jt = new JdoTemplate();
+		jt.setPersistenceManagerFactory(pmf);
+		jt.setAllowCreate(false);
+		try {
+			jt.execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					return null;
+				}
+			});
+			fail("Should have thrown IllegalStateException");
+		}
+		catch (IllegalStateException ex) {
+			// expected
+		}
+	}
+
+	public void testTemplateExecuteWithNotAllowCreateAndThreadBound() {
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.setAllowCreate(false);
+		TransactionSynchronizationManager.bindResource(pmf, new PersistenceManagerHolder(pm));
+		final List l = new ArrayList();
+		l.add("test");
+		List result = (List) jt.execute(new JdoCallback() {
+			public Object doInJdo(PersistenceManager pm) {
+				return l;
+			}
+		});
+		assertTrue("Correct result list", result == l);
+		TransactionSynchronizationManager.unbindResource(pmf);
+	}
+
+	public void testTemplateExecuteWithNewPersistenceManager() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		final List l = new ArrayList();
+		l.add("test");
+		List result = (List) jt.execute(new JdoCallback() {
+			public Object doInJdo(PersistenceManager pm) {
+				return l;
+			}
+		});
+		assertTrue("Correct result list", result == l);
+	}
+
+	public void testTemplateExecuteWithThreadBoundAndFlushEager() {
+		MockControl dialectControl = MockControl.createControl(JdoDialect.class);
+		JdoDialect dialect = (JdoDialect) dialectControl.getMock();
+
+		dialect.flush(pm);
+		dialectControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		dialectControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.setJdoDialect(dialect);
+		jt.setFlushEager(true);
+		jt.setAllowCreate(false);
+		TransactionSynchronizationManager.bindResource(pmf, new PersistenceManagerHolder(pm));
+		final List l = new ArrayList();
+		l.add("test");
+		List result = (List) jt.execute(new JdoCallback() {
+			public Object doInJdo(PersistenceManager pm) {
+				return l;
+			}
+		});
+		assertTrue("Correct result list", result == l);
+		TransactionSynchronizationManager.unbindResource(pmf);
+		dialectControl.verify();
+	}
+
+	public void testGetObjectById() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.getObjectById("0", true);
+		pmControl.setReturnValue("A");
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals("A", jt.getObjectById("0"));
+	}
+
+	public void testGetObjectByIdWithClassAndValue() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.getObjectById(String.class, "0");
+		pmControl.setReturnValue("A");
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals("A", jt.getObjectById(String.class, "0"));
+	}
+
+	public void testEvict() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.evict("0");
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.evict("0");
+	}
+
+	public void testEvictAllWithCollection() {
+		Collection coll = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.evictAll(coll);
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.evictAll(coll);
+	}
+
+	public void testEvictAll() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.evictAll();
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.evictAll();
+	}
+
+	public void testRefresh() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.refresh("0");
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.refresh("0");
+	}
+
+	public void testRefreshAllWithCollection() {
+		Collection coll = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.refreshAll(coll);
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.refreshAll(coll);
+	}
+
+	public void testRefreshAll() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.refreshAll();
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.refreshAll();
+	}
+
+	public void testMakePersistent() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.makePersistent("0");
+		pmControl.setReturnValue(null, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.makePersistent("0");
+	}
+
+	public void testMakePersistentAll() {
+		Collection coll = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.makePersistentAll(coll);
+		pmControl.setReturnValue(null, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.makePersistentAll(coll);
+	}
+
+	public void testDeletePersistent() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.deletePersistent("0");
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.deletePersistent("0");
+	}
+
+	public void testDeletePersistentAll() {
+		Collection coll = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.deletePersistentAll(coll);
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.deletePersistentAll(coll);
+	}
+
+	public void testDetachCopy() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.detachCopy("0");
+		pmControl.setReturnValue("0x", 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals("0x", jt.detachCopy("0"));
+	}
+
+	public void testDetachCopyAll() {
+		Collection attached = new HashSet();
+		Collection detached = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.detachCopyAll(attached);
+		pmControl.setReturnValue(detached, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(detached, jt.detachCopyAll(attached));
+	}
+
+	public void testAttachCopy() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.makePersistent("0x");
+		pmControl.setReturnValue("0", 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals("0", jt.attachCopy("0x"));
+	}
+
+	public void testAttachCopyAll() {
+		Collection detached = new HashSet();
+		Collection attached = new HashSet();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.makePersistentAll(detached);
+		pmControl.setReturnValue(attached, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(attached, jt.attachCopyAll(detached));
+	}
+
+	public void testFlush() {
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.flush();
+		pmControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.flush();
+	}
+
+	public void testFlushWithDialect() {
+		MockControl dialectControl = MockControl.createControl(JdoDialect.class);
+		JdoDialect dialect = (JdoDialect) dialectControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		dialect.flush(pm);
+		dialectControl.setVoidCallable(1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		dialectControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		jt.setJdoDialect(dialect);
+		jt.flush();
+		dialectControl.verify();
+	}
+
+	public void testFind() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class);
+		pmControl.setReturnValue(query);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class));
+		queryControl.verify();
+	}
+
+	public void testFindWithFilter() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b"));
+		queryControl.verify();
+	}
+
+	public void testFindWithFilterAndOrdering() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		query.setOrdering("c asc");
+		queryControl.setVoidCallable(1);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b", "c asc"));
+		queryControl.verify();
+	}
+
+	public void testFindWithParameterArray() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		query.declareParameters("params");
+		queryControl.setVoidCallable(1);
+		Object[] values = new Object[0];
+		Collection coll = new HashSet();
+		query.executeWithArray(values);
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b", "params", values));
+		queryControl.verify();
+	}
+
+	public void testFindWithParameterArrayAndOrdering() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		query.declareParameters("params");
+		queryControl.setVoidCallable(1);
+		query.setOrdering("c asc");
+		queryControl.setVoidCallable(1);
+		Object[] values = new Object[0];
+		Collection coll = new HashSet();
+		query.executeWithArray(values);
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b", "params", values, "c asc"));
+		queryControl.verify();
+	}
+
+	public void testFindWithParameterMap() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		query.declareParameters("params");
+		queryControl.setVoidCallable(1);
+		Map values = new HashMap();
+		Collection coll = new HashSet();
+		query.executeWithMap(values);
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b", "params", values));
+		queryControl.verify();
+	}
+
+	public void testFindWithParameterMapAndOrdering() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(String.class, "a == b");
+		pmControl.setReturnValue(query);
+		query.declareParameters("params");
+		queryControl.setVoidCallable(1);
+		query.setOrdering("c asc");
+		queryControl.setVoidCallable(1);
+		Map values = new HashMap();
+		Collection coll = new HashSet();
+		query.executeWithMap(values);
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(String.class, "a == b", "params", values, "c asc"));
+		queryControl.verify();
+	}
+
+	public void testFindWithLanguageAndQueryObject() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery(Query.SQL, "some SQL");
+		pmControl.setReturnValue(query);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find(Query.SQL, "some SQL"));
+		queryControl.verify();
+	}
+
+	public void testFindWithQueryString() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newQuery("single string query");
+		pmControl.setReturnValue(query);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.find("single string query"));
+		queryControl.verify();
+	}
+
+	public void testFindByNamedQuery() {
+		MockControl queryControl = MockControl.createControl(Query.class);
+		Query query = (Query) queryControl.getMock();
+
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm);
+		pm.newNamedQuery(String.class, "some query name");
+		pmControl.setReturnValue(query);
+		Collection coll = new HashSet();
+		query.execute();
+		queryControl.setReturnValue(coll);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		queryControl.replay();
+
+		JdoTemplate jt = new JdoTemplate(pmf);
+		assertEquals(coll, jt.findByNamedQuery(String.class, "some query name"));
+		queryControl.verify();
+	}
+
+	public void testTemplateExceptions() {
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOObjectNotFoundException();
+				}
+			});
+			fail("Should have thrown JdoObjectRetrievalFailureException");
+		}
+		catch (JdoObjectRetrievalFailureException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOOptimisticVerificationException();
+				}
+			});
+			fail("Should have thrown JdoOptimisticLockingFailureException");
+		}
+		catch (JdoOptimisticLockingFailureException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDODataStoreException();
+				}
+			});
+			fail("Should have thrown JdoResourceFailureException");
+		}
+		catch (JdoResourceFailureException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOFatalDataStoreException();
+				}
+			});
+			fail("Should have thrown JdoResourceFailureException");
+		}
+		catch (JdoResourceFailureException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOUserException();
+				}
+			});
+			fail("Should have thrown JdoUsageException");
+		}
+		catch (JdoUsageException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOFatalUserException();
+				}
+			});
+			fail("Should have thrown JdoUsageException");
+		}
+		catch (JdoUsageException ex) {
+			// expected
+		}
+
+		try {
+			createTemplate().execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw new JDOException();
+				}
+			});
+			fail("Should have thrown JdoSystemException");
+		}
+		catch (JdoSystemException ex) {
+			// expected
+		}
+	}
+
+	public void testTranslateException() {
+		MockControl dialectControl = MockControl.createControl(JdoDialect.class);
+		JdoDialect dialect = (JdoDialect) dialectControl.getMock();
+		final JDOException ex = new JDOException();
+		dialect.translateException(ex);
+		dialectControl.setReturnValue(new DataIntegrityViolationException("test", ex));
+		dialectControl.replay();
+		try {
+			JdoTemplate template = createTemplate();
+			template.setJdoDialect(dialect);
+			template.execute(new JdoCallback() {
+				public Object doInJdo(PersistenceManager pm) {
+					throw ex;
+				}
+			});
+			fail("Should have thrown DataIntegrityViolationException");
+		}
+		catch (DataIntegrityViolationException dive) {
+			// expected
+		}
+		dialectControl.verify();
+	}
+
+	private JdoTemplate createTemplate() {
+		pmfControl.reset();
+		pmControl.reset();
+		pmf.getConnectionFactory();
+		pmfControl.setReturnValue(null, 1);
+		pmf.getPersistenceManager();
+		pmfControl.setReturnValue(pm, 1);
+		pm.close();
+		pmControl.setVoidCallable(1);
+		pmfControl.replay();
+		pmControl.replay();
+		return new JdoTemplate(pmf);
+	}
+
+}

org.springframework.orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java

@@ -0,0 +1,146 @@
+/*
+ * 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.orm.jdo;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.jdo.JDOFatalUserException;
+import javax.jdo.PersistenceManagerFactory;
+
+import junit.framework.TestCase;
+import org.easymock.MockControl;
+
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class LocalPersistenceManagerFactoryTests extends TestCase {
+
+	public void testLocalPersistenceManagerFactoryBean() throws IOException {
+		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
+		final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
+				return pmf;
+			}
+		};
+		pmfb.setJdoProperties(new Properties());
+		pmfb.afterPropertiesSet();
+		assertSame(pmf, pmfb.getObject());
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithInvalidSettings() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean();
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown JDOFatalUserException");
+		}
+		catch (JDOFatalUserException ex) {
+			// expected
+		}
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithIncompleteProperties() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean();
+		Properties props = new Properties();
+		props.setProperty("myKey", "myValue");
+		pmfb.setJdoProperties(props);
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown JDOFatalUserException");
+		}
+		catch (JDOFatalUserException ex) {
+			// expected
+		}
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithInvalidProperty() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
+				throw new IllegalArgumentException((String) props.get("myKey"));
+			}
+		};
+		Properties props = new Properties();
+		props.setProperty("myKey", "myValue");
+		pmfb.setJdoProperties(props);
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+			assertTrue("Correct exception", "myValue".equals(ex.getMessage()));
+		}
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithFile() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
+				throw new IllegalArgumentException((String) props.get("myKey"));
+			}
+		};
+		pmfb.setConfigLocation(new ClassPathResource("test.properties", getClass()));
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+			assertTrue("Correct exception", "myValue".equals(ex.getMessage()));
+		}
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithName() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			protected PersistenceManagerFactory newPersistenceManagerFactory(String name) {
+				throw new IllegalArgumentException(name);
+			}
+		};
+		pmfb.setPersistenceManagerFactoryName("myName");
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+			assertTrue("Correct exception", "myName".equals(ex.getMessage()));
+		}
+	}
+
+	public void testLocalPersistenceManagerFactoryBeanWithNameAndProperties() throws IOException {
+		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			protected PersistenceManagerFactory newPersistenceManagerFactory(String name) {
+				throw new IllegalArgumentException(name);
+			}
+		};
+		pmfb.setPersistenceManagerFactoryName("myName");
+		pmfb.getJdoPropertyMap().put("myKey", "myValue");
+		try {
+			pmfb.afterPropertiesSet();
+			fail("Should have thrown IllegalStateException");
+		}
+		catch (IllegalStateException ex) {
+			// expected
+			assertTrue(ex.getMessage().indexOf("persistenceManagerFactoryName") != -1);
+			assertTrue(ex.getMessage().indexOf("jdoProp") != -1);
+		}
+	}
+
+}

org.springframework.orm/src/test/resources/org/springframework/orm/jdo/test.properties

@@ -0,0 +1 @@
+myKey=myValue