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

moved OpenSessionInViewTests back to orm module

3.0.x
Juergen Hoeller 15 years ago
parent
80def4b695
commit
a4f62bb863
5 changed files with 66 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 146
      org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
  2. 1
      org.springframework.web.servlet/.classpath
  3. 3
      org.springframework.web.servlet/ivy.xml
  4. 7
      org.springframework.web.servlet/pom.xml
  5. 9
      org.springframework.web.servlet/web-servlet.iml

146
org.springframework.web.servlet/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java → org.springframework.orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
Unescape View File

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2011 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,25 +16,21 @@ @@ -16,25 +16,21 @@
package org.springframework.orm.hibernate3.support;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.hibernate.classic.Session;
import org.hibernate.SessionFactory;
import java.io.IOException;
import java.sql.Connection;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.transaction.TransactionManager;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.classic.Session;
import org.hibernate.engine.SessionFactoryImplementor;
import org.springframework.mock.web.MockFilterConfig;
@ -50,9 +46,8 @@ import org.springframework.transaction.TransactionStatus; @@ -50,9 +46,8 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapter;
/**
* @author Juergen Hoeller
@ -70,15 +65,11 @@ public class OpenSessionInViewTests extends TestCase { @@ -70,15 +65,11 @@ public class OpenSessionInViewTests extends TestCase {
MockControl sessionControl = MockControl.createControl(Session.class);
Session session = (Session) sessionControl.getMock();
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
MockServletContext sc = new MockServletContext();
MockHttpServletRequest request = new MockHttpServletRequest(sc);
MockHttpServletResponse response = new MockHttpServletResponse();
//expect(mockStorage.size()).andReturn(expectedValue);
@ -93,24 +84,24 @@ public class OpenSessionInViewTests extends TestCase { @@ -93,24 +84,24 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setVoidCallable(1);
sfControl.replay();
sessionControl.replay();
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
assertTrue(TransactionSynchronizationManager.hasResource(sf));
// check that further invocations simply participate
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
assertEquals(session, SessionFactoryUtils.getSession(sf, false));
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();
@ -119,7 +110,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -119,7 +110,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.reset();
sfControl.replay();
sessionControl.replay();
interceptor.postHandle(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
assertTrue(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -130,7 +121,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -130,7 +121,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setReturnValue(null, 1);
sfControl.replay();
sessionControl.replay();
interceptor.afterCompletion(request, response, "handler", null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
assertFalse(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -147,9 +138,8 @@ public class OpenSessionInViewTests extends TestCase { @@ -147,9 +138,8 @@ public class OpenSessionInViewTests extends TestCase {
tm.getTransaction();
tmControl.setReturnValue(null, 2);
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
MockServletContext sc = new MockServletContext();
MockHttpServletRequest request = new MockHttpServletRequest(sc);
@ -168,24 +158,24 @@ public class OpenSessionInViewTests extends TestCase { @@ -168,24 +158,24 @@ public class OpenSessionInViewTests extends TestCase {
sfControl.replay();
sessionControl.replay();
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
assertTrue(TransactionSynchronizationManager.hasResource(sf));
// check that further invocations simply participate
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
assertEquals(session, SessionFactoryUtils.getSession(sf, false));
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();
@ -194,7 +184,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -194,7 +184,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.reset();
sfControl.replay();
sessionControl.replay();
interceptor.postHandle(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
assertTrue(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -205,7 +195,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -205,7 +195,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setReturnValue(null, 1);
sfControl.replay();
sessionControl.replay();
interceptor.afterCompletion(request, response, "handler", null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
assertFalse(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -217,10 +207,9 @@ public class OpenSessionInViewTests extends TestCase { @@ -217,10 +207,9 @@ public class OpenSessionInViewTests extends TestCase {
MockControl sessionControl = MockControl.createControl(Session.class);
Session session = (Session) sessionControl.getMock();
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
rawInterceptor.setFlushMode(HibernateAccessor.FLUSH_AUTO);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
interceptor.setFlushMode(HibernateAccessor.FLUSH_AUTO);
MockServletContext sc = new MockServletContext();
MockHttpServletRequest request = new MockHttpServletRequest(sc);
@ -232,7 +221,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -232,7 +221,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setReturnValue(sf);
sfControl.replay();
sessionControl.replay();
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
assertTrue(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -243,7 +232,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -243,7 +232,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setVoidCallable(1);
sfControl.replay();
sessionControl.replay();
interceptor.postHandle(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
assertTrue(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -254,7 +243,7 @@ public class OpenSessionInViewTests extends TestCase { @@ -254,7 +243,7 @@ public class OpenSessionInViewTests extends TestCase {
sessionControl.setReturnValue(null, 1);
sfControl.replay();
sessionControl.replay();
interceptor.afterCompletion(request, response, "handler", null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
assertFalse(TransactionSynchronizationManager.hasResource(sf));
sfControl.verify();
sessionControl.verify();
@ -266,10 +255,9 @@ public class OpenSessionInViewTests extends TestCase { @@ -266,10 +255,9 @@ public class OpenSessionInViewTests extends TestCase {
MockControl sessionControl = MockControl.createControl(Session.class);
Session session = (Session) sessionControl.getMock();
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
rawInterceptor.setSingleSession(false);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
interceptor.setSingleSession(false);
MockServletContext sc = new MockServletContext();
MockHttpServletRequest request = new MockHttpServletRequest(sc);
@ -284,23 +272,23 @@ public class OpenSessionInViewTests extends TestCase { @@ -284,23 +272,23 @@ public class OpenSessionInViewTests extends TestCase {
sfControl.replay();
sessionControl.replay();
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
org.hibernate.Session sess = SessionFactoryUtils.getSession(sf, true);
SessionFactoryUtils.releaseSession(sess, sf);
// check that further invocations simply participate
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
interceptor.preHandle(request, response, "handler");
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.preHandle(new ServletWebRequest(request));
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();
@ -312,8 +300,8 @@ public class OpenSessionInViewTests extends TestCase { @@ -312,8 +300,8 @@ public class OpenSessionInViewTests extends TestCase {
sfControl.replay();
sessionControl.replay();
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();
}
@ -433,11 +421,10 @@ public class OpenSessionInViewTests extends TestCase { @@ -433,11 +421,10 @@ public class OpenSessionInViewTests extends TestCase {
MockFilterConfig filterConfig2 = new MockFilterConfig(wac.getServletContext(), "filter2");
filterConfig2.addInitParameter("sessionFactoryBeanName", "mySessionFactory");
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
final OpenSessionInViewFilter filter = new OpenSessionInViewFilter();
filter.init(filterConfig);
@ -454,8 +441,8 @@ public class OpenSessionInViewTests extends TestCase { @@ -454,8 +441,8 @@ public class OpenSessionInViewTests extends TestCase {
assertTrue(TransactionSynchronizationManager.hasResource(sf));
assertNotNull(request.getAttribute("invoked"));
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();
@ -616,12 +603,11 @@ public class OpenSessionInViewTests extends TestCase { @@ -616,12 +603,11 @@ public class OpenSessionInViewTests extends TestCase {
filterConfig2.addInitParameter("singleSession", "false");
filterConfig2.addInitParameter("sessionFactoryBeanName", "mySessionFactory");
OpenSessionInViewInterceptor rawInterceptor = new OpenSessionInViewInterceptor();
rawInterceptor.setSessionFactory(sf);
rawInterceptor.setSingleSession(false);
HandlerInterceptor interceptor = new WebRequestHandlerInterceptorAdapter(rawInterceptor);
OpenSessionInViewInterceptor interceptor = new OpenSessionInViewInterceptor();
interceptor.setSessionFactory(sf);
interceptor.setSingleSession(false);
interceptor.preHandle(request, response, "handler");
interceptor.preHandle(new ServletWebRequest(request));
final OpenSessionInViewFilter filter = new OpenSessionInViewFilter();
filter.init(filterConfig);
@ -661,8 +647,8 @@ public class OpenSessionInViewTests extends TestCase { @@ -661,8 +647,8 @@ public class OpenSessionInViewTests extends TestCase {
filter.doFilter(request, response, filterChain2);
assertNotNull(request.getAttribute("invoked"));
interceptor.postHandle(request, response, "handler", null);
interceptor.afterCompletion(request, response, "handler", null);
interceptor.postHandle(new ServletWebRequest(request), null);
interceptor.afterCompletion(new ServletWebRequest(request), null);
sfControl.verify();
sessionControl.verify();

1
org.springframework.web.servlet/.classpath
Unescape View File

@ -41,7 +41,6 @@ @@ -41,7 +41,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.jdom/com.springsource.org.jdom/1.0.0/com.springsource.org.jdom-1.0.0.jar" sourcepath="/IVY_CACHE/org.jdom/com.springsource.org.jdom/1.0.0/com.springsource.org.jdom-1.0.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.6.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.mozilla.javascript/com.springsource.org.mozilla.javascript/1.7.0.R2/com.springsource.org.mozilla.javascript-1.7.0.R2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.hibernate/com.springsource.org.hibernate/3.3.1.GA/com.springsource.org.hibernate-3.3.1.GA.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/com.springsource.org.apache.tiles/2.1.2.osgi/com.springsource.org.apache.tiles-2.1.2.osgi.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.tiles/com.springsource.org.apache.tiles.core/2.1.2.osgi/com.springsource.org.apache.tiles.core-2.1.2.osgi.jar"/>

3
org.springframework.web.servlet/ivy.xml
Unescape View File

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
<conf name="poi" extends="runtime" description="JARs needed to create beans for Poi"/>
<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
<conf name="velocity" extends="runtime" description="JARs needed to create beans for Velocity"/>
<conf name="hibernate" extends="runtime" description="JARs needed to use Hibernate"/>
</configurations>
<publications>
@ -98,8 +97,6 @@ @@ -98,8 +97,6 @@
conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration"
conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
conf="test->compile"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="test->runtime"/>

7
org.springframework.web.servlet/pom.xml
Unescape View File

@ -279,13 +279,6 @@ @@ -279,13 +279,6 @@
<version>1.0.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.3.1.GA</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>

9
org.springframework.web.servlet/web-servlet.iml
Unescape View File

@ -300,15 +300,6 @@ @@ -300,15 +300,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$IVY_CACHE$/org.hibernate/com.springsource.org.hibernate/3.3.1.GA/com.springsource.org.hibernate-3.3.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>

Write Preview
Loading…
Cancel
Save