Skip to content

Commit

Permalink
(#132) TextMatcherEnvelope should call asString() only once at all
Browse files Browse the repository at this point in the history
  • Loading branch information
victornoel committed Sep 24, 2019
1 parent a7efc9e commit f04aa3b
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
package org.llorllale.cactoos.matchers;

import org.cactoos.Text;
import org.cactoos.text.TextOf;
import org.cactoos.text.UncheckedText;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
Expand Down Expand Up @@ -89,10 +90,9 @@ public final void describeTo(final Description desc) {
@Override
protected final boolean matchesSafely(final Text text,
final Description desc) {
desc.appendText(this.actual).appendValue(
new UncheckedText(text).asString()
);
return this.matcher.matches(text);
final String txt = new UncheckedText(text).asString();
desc.appendText(this.actual).appendValue(txt);
return this.matcher.matches(new TextOf(txt));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* The MIT License (MIT)
*
* Copyright (c) for portions of project cactoos-matchers are held by
* Yegor Bugayenko, 2017-2018, as part of project cactoos.
* All other copyright for project cactoos-matchers are held by
* George Aristy, 2018.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.llorllale.cactoos.matchers;

import java.io.StringReader;
import org.cactoos.Text;
import org.cactoos.text.TextOf;
import org.junit.Test;

/**
* Tests for {@link TextMatcherEnvelope}.
* @since 1.0.0
* @checkstyle JavadocMethodCheck (500 lines)
* @checkstyle JavadocTypeCheck (500 lines)
*/
public final class TextMatcherEnvelopeTest {

@Test
public void matchesAReadOnceInput() {
final String input = "aaaa";
new Assertion<>(
"must match on an input that can be read only once",
new TextEquals(input),
new Matches<>(new TextOf(new StringReader(input)))
).affirm();
}

private static final class TextEquals extends TextMatcherEnvelope {
TextEquals(final String txt) {
super(
new MatcherOf<>((Text text) -> txt.equals(text.asString())),
"Text equals to "
);
}
}
}

0 comments on commit f04aa3b

Please sign in to comment.