svn commit: r917112 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java

[ivaynberg]

Author: ivaynberg
Date: Sun Feb 28 04:14:58 2010
New Revision: 917112

URL: http://svn.apache.org/viewvc?rev=917112&view=rev
Log:
wicket tester cleanup

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=917112&r1=917111&r2=917112&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:14:58 2010
@@ -158,7 +158,6 @@
 
        /** current request cycle */
        private RequestCycle requestCycle;
-       private RequestCycle lastRequestCycle;
 
        private Page lastRenderedPage;
 
@@ -355,8 +354,6 @@
                }
 
                forcedHandler = forcedRequestHandler;
-               requestCycle = application.createRequestCycle(request, 
response);
-               ThreadContext.setRequestCycle(requestCycle);
 
                try
                {
@@ -380,6 +377,8 @@
                                }
                        }
 
+                       requestCycle.setRequest(request);
+
                        if (!requestCycle.processRequestAndDetach())
                        {
                                return false;
@@ -389,12 +388,6 @@
                        setupNextRequestCycle();
 
 
-                       // reattach request cycle to thread after it removed 
itself in detach
-                       lastRequestCycle = requestCycle;
-                       requestCycle = application.createRequestCycle(request, 
response);
-                       ThreadContext.setRequestCycle(requestCycle);
-
-
                        if (followRedirects && lastResponse.isRedirect())
                        {
                                if (redirectCount == 100)
@@ -429,13 +422,6 @@
 
        }
 
-
-       public RequestCycle getLastRequestCycle()
-       {
-               return lastRequestCycle;
-       }
-
-
        private void recordRequestResponse()
        {
                lastRequest = request;
@@ -1688,8 +1674,7 @@
 
                public RequestCycle get(RequestCycleContext context)
                {
-                       context.setRequestMapper(new 
TestRequestMapper(context.getRequestMapper(),
-                               forcedHandler));
+                       context.setRequestMapper(new 
TestRequestMapper(context.getRequestMapper()));
                        forcedHandler = null;
                        context.setExceptionMapper(new 
TestExceptionMapper(context.getExceptionMapper()));
                        return delegate.get(context);
@@ -1697,15 +1682,13 @@
 
        }
 
-       private static class TestRequestMapper implements IRequestMapper
+       private class TestRequestMapper implements IRequestMapper
        {
                private final IRequestMapper delegate;
-               private final IRequestHandler forcedHandler;
 
-               public TestRequestMapper(IRequestMapper delegate, 
IRequestHandler forced)
+               public TestRequestMapper(IRequestMapper delegate)
                {
                        this.delegate = delegate;
-                       forcedHandler = forced;
                }
 
                public int getCompatibilityScore(Request request)
@@ -1722,7 +1705,9 @@
                {
                        if (forcedHandler != null)
                        {
-                               return forcedHandler;
+                               IRequestHandler handler = forcedHandler;
+                               forcedHandler = null;
+                               return handler;
                        }
                        else
                        {