svn commit: r909255 - /wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java

[ivaynberg]

Author: ivaynberg
Date: Fri Feb 12 06:31:27 2010
New Revision: 909255

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

Modified:
    
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java

Modified: 
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java?rev=909255&r1=909254&r2=909255&view=diff
==============================================================================
--- 
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
 (original)
+++ 
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
 Fri Feb 12 06:31:27 2010
@@ -21,12 +21,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.wicket.Application;
-import org.apache.wicket.Page;
-import org.apache.wicket.protocol.http.MockWebApplication;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.session.HttpSessionStore;
-import org.apache.wicket.session.ISessionStore;
+import org.apache.wicket.Session;
+import org.apache.wicket.ng.ThreadContext;
+import org.apache.wicket.ng.mock.MockApplication;
+import org.apache.wicket.ng.mock.MockWebRequest;
+import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.util.lang.Objects;
 
 import com.google.inject.Binder;
@@ -38,36 +38,18 @@
 {
        public void testInjectionAndSerialization()
        {
-               MockWebApplication mockApp = new MockWebApplication(new 
WebApplication()
+               MockApplication app = new MockApplication();
+               try
                {
-                       @Override
-                       protected void outputDevelopmentModeWarning()
-                       {
-                               // Do nothing.
-                       }
+                       ThreadContext.setApplication(app);
 
-                       @Override
-                       public Class< ? extends Page> getHomePage()
-                       {
-                               return null;
-                       }
+                       app.setName(getClass().getName());
+                       app.initApplication();
 
-                       @Override
-                       protected ISessionStore newSessionStore()
-                       {
-                               // Don't use a filestore, or we spawn lots of 
threads, which
-                               // makes things slow.
-                               return new HttpSessionStore();
-                       }
-               }, null);
-
-               // Make a new webapp and injector, and register the injector 
with the
-               // webapp as a component instantiation listener.
-               Application app = mockApp.getApplication();
+                       Session session = new WebSession(new 
MockWebRequest(Url.parse("/")));
+                       app.getSessionStore().bind(null, session);
+                       ThreadContext.setSession(session);
 
-               try
-               {
-                       Application.set(app);
                        GuiceComponentInjector injector = new 
GuiceComponentInjector(app, new Module()
                        {
 
@@ -108,7 +90,8 @@
                }
                finally
                {
-                       Application.unset();
+                       app.destroy();
+                       ThreadContext.detach();
                }
        }