svn commit: r917114 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: ng/mock/MockSession.java util/tester/BaseWicketTester.java

[ivaynberg]

Author: ivaynberg
Date: Sun Feb 28 04:15:25 2010
New Revision: 917114

URL: http://svn.apache.org/viewvc?rev=917114&view=rev
Log:
removed MockSession

Removed:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockSession.java
Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=917114&r1=917113&r2=917114&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
 Sun Feb 28 04:15:25 2010
@@ -64,7 +64,6 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.ng.ThreadContext;
 import org.apache.wicket.ng.mock.MockApplication;
-import org.apache.wicket.ng.mock.MockSession;
 import org.apache.wicket.ng.mock.MockWebRequest;
 import org.apache.wicket.ng.mock.MockWebResponse;
 import org.apache.wicket.ng.request.IRequestMapper;
@@ -154,7 +153,7 @@
        private MockWebResponse response;
 
        /** current session */
-       private final MockSession session;
+       private Session session;
 
        /** current request cycle */
        private RequestCycle requestCycle;
@@ -242,10 +241,6 @@
                        application.getRequestCycleProvider()));
 
                // prepare session
-               session = new MockSession(new MockWebRequest(Url.parse("/")));
-               getApplication().getSessionStore().bind(null, session);
-               ThreadContext.setSession(session);
-
                setupNextRequestCycle();
        }
 
@@ -253,7 +248,16 @@
        {
                request = new MockWebRequest(Url.parse("/"));
                response = new MockWebResponse();
+
+               if (session == null)
+               {
+                       session = application.newSession(request, response);
+                       application.getSessionStore().bind(null, session);
+                       ThreadContext.setSession(session);
+               }
+
                requestCycle = application.createRequestCycle(request, 
response);
+               requestCycle.setCleanupFeedbackMessagesOnDetach(false);
                ThreadContext.setRequestCycle(requestCycle);
        }