add equality assertions in store-page-returns test cases Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0ebf51e9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0ebf51e9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0ebf51e9
Branch: refs/heads/master Commit: 0ebf51e96cf20886ca4301c8b424a5ab17f9a3ab Parents: 2bae2cb Author: manuelbarzi <[email protected]> Authored: Mon Apr 3 12:05:03 2017 +0200 Committer: manuelbarzi <[email protected]> Committed: Mon Apr 3 12:05:03 2017 +0200 ---------------------------------------------------------------------- .../pageStore/AsynchronousPageStoreTest.java | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0ebf51e9/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java index d437d30..7ade857 100644 --- a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java @@ -1,6 +1,7 @@ package org.apache.wicket.pageStore; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -25,10 +26,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.RandomUtils; import org.apache.wicket.page.IManageablePage; -import org.apache.wicket.pageStore.DefaultPageStore; -import org.apache.wicket.pageStore.DiskDataStore; -import org.apache.wicket.pageStore.IDataStore; -import org.apache.wicket.pageStore.IPageStore; import org.apache.wicket.serialize.ISerializer; import org.apache.wicket.serialize.java.DeflatedJavaSerializer; import org.apache.wicket.util.file.File; @@ -39,6 +36,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Stopwatch; + /** * AsynchronousPageStoreTest * @@ -136,9 +134,9 @@ public class AsynchronousPageStoreTest public String toString() { - return "DummyPage[pageId = " + pageId + ", writeMillis = " + writeMillis - + ", readMillis = " + readMillis + ", sessionId = " + sessionId + ", hashCode = " - + hashCode() + "]"; + return "DummyPage[pageId = " + pageId + ", writeMillis = " + writeMillis + + ", readMillis = " + readMillis + ", sessionId = " + sessionId + ", hashCode = " + + hashCode() + "]"; } } @@ -171,9 +169,11 @@ public class AsynchronousPageStoreTest Thread.sleep(500); - asyncPageStore.getPage(sessionId, pageId); + IManageablePage pageBack = asyncPageStore.getPage(sessionId, pageId); verify(pageStore, never()).getPage(sessionId, pageId); + + assertEquals(page, pageBack); } /** @@ -205,9 +205,11 @@ public class AsynchronousPageStoreTest Thread.sleep(1500); - asyncPageStore.getPage(sessionId, pageId); + IManageablePage pageBack = asyncPageStore.getPage(sessionId, pageId); verify(pageStore, times(1)).getPage(sessionId, pageId); + + assertNotEquals(page, pageBack); } /** @@ -291,9 +293,8 @@ public class AsynchronousPageStoreTest public String toString() { - return "Metrics[storedPage = " + storedPage + ", storingMillis = " + storingMillis - + ", restoredPage = " + restoredPage + ", restoringMillis = " + restoringMillis - + "]"; + return "Metrics[storedPage = " + storedPage + ", storingMillis = " + storingMillis + + ", restoredPage = " + restoredPage + ", restoringMillis = " + restoringMillis + "]"; } }
