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

EL container integration; support for contextual objects; removal of deprecated Spring 2.0 functionality; Java 5 code style

Browse Source
This commit is contained in:
Juergen Hoeller
2008-11-20 02:10:53 +00:00
parent 369821dd66
commit 347f34c68a
281 changed files with 6120 additions and 9903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2006 the original author or authors.
* 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.
@@ -79,7 +79,7 @@ public class HibernateInterceptorTests extends TestCase {
sfControl.setReturnValue(session, 1);
session.getSessionFactory();
sessionControl.setReturnValue(sf);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.close();
sessionControl.setReturnValue(null, 1);

8
org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
View File

@@ -55,6 +55,7 @@ import org.hibernate.exception.JDBCConnectionException;
import org.hibernate.exception.LockAcquisitionException;
import org.hibernate.exception.SQLGrammarException;
import org.springframework.beans.TestBean;
import org.springframework.dao.CannotAcquireLockException;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.dao.DataIntegrityViolationException;
@@ -62,7 +63,6 @@ import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.beans.TestBean;
/**
* @author Juergen Hoeller
@@ -112,7 +112,7 @@ public class HibernateTemplateTests extends TestCase {
sfControl.setReturnValue(session, 1);
session.getSessionFactory();
sessionControl.setReturnValue(sf, 1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.close();
sessionControl.setReturnValue(null, 1);
@@ -1266,7 +1266,7 @@ public class HibernateTemplateTests extends TestCase {
session.getSessionFactory();
sessionControl.setReturnValue(sf, 1);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER);
sessionControl.setReturnValue(FlushMode.MANUAL);
session.close();
sessionControl.setReturnValue(null, 1);
sfControl.replay();
@@ -1578,7 +1578,7 @@ public class HibernateTemplateTests extends TestCase {
sfControl.setReturnValue(session, 1);
session.getSessionFactory();
sessionControl.setReturnValue(sf, 1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.flush();
sessionControl.setVoidCallable(1);

22
org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
View File

@@ -323,7 +323,7 @@ public class HibernateTransactionManagerTests extends TestCase {
sessionControl.setReturnValue(FlushMode.AUTO, 1);
session.flush();
sessionControl.setVoidCallable(1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
tx.commit();
txControl.setVoidCallable(1);
@@ -756,15 +756,15 @@ public class HibernateTransactionManagerTests extends TestCase {
session.getSessionFactory();
sessionControl.setReturnValue(sf, 1);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER, 1);
sessionControl.setReturnValue(FlushMode.MANUAL, 1);
session.setFlushMode(FlushMode.AUTO);
sessionControl.setVoidCallable(1);
session.flush();
sessionControl.setVoidCallable(1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER, 1);
sessionControl.setReturnValue(FlushMode.MANUAL, 1);
session.close();
sessionControl.setReturnValue(null, 1);
sfControl.replay();
@@ -1078,7 +1078,7 @@ public class HibernateTransactionManagerTests extends TestCase {
sfControl.setReturnValue(session, 1);
session.beginTransaction();
sessionControl.setReturnValue(tx, 1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.connection();
sessionControl.setReturnValue(con, 2);
@@ -1239,10 +1239,10 @@ public class HibernateTransactionManagerTests extends TestCase {
session.isOpen();
sessionControl.setReturnValue(true, 1);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER, 1);
sessionControl.setReturnValue(FlushMode.MANUAL, 1);
session.setFlushMode(FlushMode.AUTO);
sessionControl.setVoidCallable(1);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(1);
session.connection();
sessionControl.setReturnValue(con, 3);
@@ -1339,10 +1339,10 @@ public class HibernateTransactionManagerTests extends TestCase {
session.isOpen();
sessionControl.setReturnValue(true, 2);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER, 2);
sessionControl.setReturnValue(FlushMode.MANUAL, 2);
session.setFlushMode(FlushMode.AUTO);
sessionControl.setVoidCallable(2);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(2);
session.isConnected();
sessionControl.setReturnValue(true, 2);
@@ -1465,10 +1465,10 @@ public class HibernateTransactionManagerTests extends TestCase {
tx2Control.setVoidCallable(1);
session.getFlushMode();
sessionControl.setReturnValue(FlushMode.NEVER, 2);
sessionControl.setReturnValue(FlushMode.MANUAL, 2);
session.setFlushMode(FlushMode.AUTO);
sessionControl.setVoidCallable(2);
session.setFlushMode(FlushMode.NEVER);
session.setFlushMode(FlushMode.MANUAL);
sessionControl.setVoidCallable(2);
sfControl.replay();

39
org.springframework.orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
View File

@@ -1,12 +1,12 @@
/*
* Copyright 2002-2005 the original author or authors.
*
* 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.
@@ -358,37 +358,6 @@ public class JdoTemplateTests extends TestCase {
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);