WICKET-5452 Make Wicket-Atmosphere testable - AtmosphereTester Fix a typo in javadoc. Use Hamcrest matchers
(cherry picked from commit 66bff0b1351f6559c6a102250bc5a56bf6cd9069) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/97448b58 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/97448b58 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/97448b58 Branch: refs/heads/master Commit: 97448b58f0813f3f34c4dae97efd0906d9a77282 Parents: 16fca60 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 14 12:13:39 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Aug 15 10:14:55 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/atmosphere/tester/AtmosphereTester.java | 2 +- .../org/apache/wicket/atmosphere/AtmosphereTesterTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/97448b58/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java index eb1cf1b..eee9b19 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java @@ -181,7 +181,7 @@ public class AtmosphereTester } /** - * Sets back the <em>lastResponse</em> with the saved on by {@link #switchOnTestMode()}. + * Sets back the <em>lastResponse</em> with the saved one by {@link #switchOnTestMode()}. * * @return this instance, for chaining */ http://git-wip-us.apache.org/repos/asf/wicket/blob/97448b58/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java index c8f2773..0d24910 100644 --- a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java +++ b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.atmosphere; +import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import java.util.Date; import java.util.concurrent.atomic.AtomicBoolean; @@ -92,8 +94,8 @@ public class AtmosphereTesterTest extends Assert // System.out.println("RES:" + atmosphereResponse); // assert - Assert.assertFalse("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response></ajax-response>" - .equals(atmosphereResponse)); + assertThat(atmosphereResponse, + is(not(equalTo("<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response></ajax-response>")))); waTester.switchOnTestMode(); // now the assertions are against the Atmosphere's suspended response data
