X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=wicket%2Fcomponents%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fwicket%2Fpage%2FWebApplicationBasePageTest.java;h=ec7b9e3bfe73fa536d8b4b4890a8a84af09f0494;hb=bf7cf948dada07a921408454e45105c466e375ea;hp=8d97be9b4b21a11b6403c01cfc4a9ddbf85df542;hpb=5bf95a97c8dfb6335417eb9d8bb20a087cd5c29b;p=utils

diff --git a/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java b/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
index 8d97be9b..ec7b9e3b 100644
--- a/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
+++ b/wicket/components/src/test/java/org/wamblee/wicket/page/WebApplicationBasePageTest.java
@@ -22,23 +22,16 @@ import static org.mockito.Mockito.*;
 import java.lang.reflect.Field;
 
 import javax.persistence.EntityManager;
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
 
 import org.apache.wicket.IPageMap;
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.protocol.http.WebResponse;
 import org.apache.wicket.util.tester.WicketTester;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.wamblee.wicket.page.CompositePageBehavior;
-import org.wamblee.wicket.page.DisableCachingBehavior;
-import org.wamblee.wicket.page.ExpirePageImmediatelyBehavior;
-import org.wamblee.wicket.page.FlushEntityManagerBehavior;
-import org.wamblee.wicket.page.PageBehavior;
-import org.wamblee.wicket.page.WebApplicationBasePage;
 
 public class WebApplicationBasePageTest {
     private WicketTester wicket;
@@ -136,6 +129,10 @@ public class WebApplicationBasePageTest {
         public void callBeforeRender() {
             onBeforeRender();
         }
+
+        public void callOnDetach() {
+            onDetach();
+        }
     }
 
     @Test
@@ -159,10 +156,15 @@ public class WebApplicationBasePageTest {
         page.callSetHeaders();
         verify(behavior).setHeaders(same(page), same(response));
         verifyNoMoreInteractions(behavior);
+
+        reset(behavior);
+        page.callOnDetach();
+        verify(behavior).onDetach(same(page));
+        verifyNoMoreInteractions(behavior);
     }
 
     @Test
-    public void testSmokeBehaviorViewOnlyOnce() throws Exception {
+    public void testSmokeExpirePageImmediatelyBehavior() throws Exception {
         WebApplicationBasePage page = new WebApplicationBasePage(
             mock(IPageMap.class), new PageParameters());
         page.addBehavior(new ExpirePageImmediatelyBehavior());
@@ -170,6 +172,20 @@ public class WebApplicationBasePageTest {
         wicket.assertRenderedPage(WebApplicationBasePage.class);
     }
 
+    @Test
+    public void testSmokeExpireBehavior() throws Exception {
+        WebApplicationBasePage page = new WebApplicationBasePage(
+            mock(IPageMap.class), new PageParameters());
+        page.addBehavior(new ExpireBehavior() {
+            @Override
+            protected boolean isExpired(WebPage aPage) {
+                return true;
+            }
+        });
+        wicket.startPage(page);
+        wicket.assertRenderedPage(WebApplicationBasePage.class);
+    }
+
     @Test
     public void testSmokeBehaviorDisableCaching() throws Exception {
         WebApplicationBasePage page = new WebApplicationBasePage(