From a39db8b07847a9b0ae657cb9dcddfaaad3ae598c Mon Sep 17 00:00:00 2001 From: Izbassar Tolegen Date: Sat, 3 Mar 2018 20:06:46 +0100 Subject: [PATCH] #794 Replace containsString with equalTo --- .../java/org/takes/facets/hamcrest/HmRqTextBody.java | 4 ++-- .../java/org/takes/facets/hamcrest/HmRsTextBody.java | 4 ++-- .../java/org/takes/facets/hamcrest/HmRqTextBodyTest.java | 9 +++++---- .../java/org/takes/facets/hamcrest/HmRsTextBodyTest.java | 9 +++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/takes/facets/hamcrest/HmRqTextBody.java b/src/main/java/org/takes/facets/hamcrest/HmRqTextBody.java index a44635009..c912f6290 100644 --- a/src/main/java/org/takes/facets/hamcrest/HmRqTextBody.java +++ b/src/main/java/org/takes/facets/hamcrest/HmRqTextBody.java @@ -44,11 +44,11 @@ public final class HmRqTextBody extends AbstractHmTextBody { /** - * Ctor with containsString matcher and default charset. + * Ctor with equalTo matcher and default charset. * @param expected String to test against */ public HmRqTextBody(final String expected) { - this(Matchers.containsString(expected)); + this(Matchers.equalTo(expected)); } /** diff --git a/src/main/java/org/takes/facets/hamcrest/HmRsTextBody.java b/src/main/java/org/takes/facets/hamcrest/HmRsTextBody.java index 8ce26b75c..1e45fc1b2 100644 --- a/src/main/java/org/takes/facets/hamcrest/HmRsTextBody.java +++ b/src/main/java/org/takes/facets/hamcrest/HmRsTextBody.java @@ -44,11 +44,11 @@ public final class HmRsTextBody extends AbstractHmTextBody { /** - * Ctor with containsString matcher and default charset. + * Ctor with equalTo matcher and default charset. * @param expected String to test against */ public HmRsTextBody(final String expected) { - this(Matchers.containsString(expected)); + this(Matchers.equalTo(expected)); } /** diff --git a/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java b/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java index fe9622463..ebca1a0d5 100644 --- a/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java +++ b/src/test/java/org/takes/facets/hamcrest/HmRqTextBodyTest.java @@ -39,21 +39,22 @@ public final class HmRqTextBodyTest { /** - * HmRqTextBody can test if body contains text. + * HmRqTextBody can test if body equals text. */ @Test public void testsBodyValueContainsText() { + final String same = "Same text"; MatcherAssert.assertThat( new RqFake( Collections.emptyList(), - "Some text" + same ), - new HmRqTextBody("text") + new HmRqTextBody(same) ); } /** - * HmRqTextBody can test if body doesn't contains text. + * HmRqTextBody can test if body doesn't equal to text. */ @Test public void testsBodyValueDoesNotContainsText() { diff --git a/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java b/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java index 1e35e1ef6..0a1996fc3 100644 --- a/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java +++ b/src/test/java/org/takes/facets/hamcrest/HmRsTextBodyTest.java @@ -38,18 +38,19 @@ public final class HmRsTextBodyTest { /** - * HmRsTextBody can test if body contains text. + * HmRsTextBody can test if body equals text. */ @Test public void testsBodyValueContainsText() { + final String same = "

Hello

"; MatcherAssert.assertThat( - new RsWithBody("

Hello

"), - new HmRsTextBody("

Hello

") + new RsWithBody(same), + new HmRsTextBody(same) ); } /** - * HmRsTextBody can test if body doesn't contains text. + * HmRsTextBody can test if body doesn't equal to text. */ @Test public void testsBodyValueDoesNotContainsText() {