Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Mar 20, 2018
2 parents 7f35a2c + 7860883 commit 63f3b7f
Show file tree
Hide file tree
Showing 4 changed files with 316 additions and 67 deletions.
142 changes: 142 additions & 0 deletions src/main/java/org/cactoos/matchers/TeeInputHasResult.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017-2018 Yegor Bugayenko
*
* 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.cactoos.matchers;

import java.io.File;
import org.cactoos.Text;
import org.cactoos.io.TeeInput;
import org.cactoos.scalar.And;
import org.cactoos.scalar.Equals;
import org.cactoos.scalar.UncheckedScalar;
import org.cactoos.text.ComparableText;
import org.cactoos.text.FormattedText;
import org.cactoos.text.TextOf;
import org.cactoos.text.UncheckedText;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;

/**
* Matcher for the {@link TeeInput}'s results.
*
* @author Roman Proshin (roman@proshin.org)
* @version $Id$
* @since 1.0
*/
public final class TeeInputHasResult extends TypeSafeMatcher<TeeInput> {

/**
* Value that is expected to be returned from the given TeeInput.
*/
private final ComparableText expected;
/**
* Value that is expected to be copied into the output of TeeInput.
*/
private final ComparableText copied;
/**
* Actual value returned from the given TeeInput.
*/
private ComparableText actual;

/**
* Ctor.
* @param expected Value that is expected to be returned from the TeeInput
* @param file Value that is expected to be copied into the output of
* the TeeInput
*/
public TeeInputHasResult(
final String expected,
final File file) {
this(
new TextOf(expected),
new TextOf(file)
);
}

/**
* Ctor.
* @param expected Value that is expected to be returned from the TeeInput
* @param copied Value that is expected to be copied into the output of
* the TeeInput
*/
public TeeInputHasResult(
final String expected,
final Text copied) {
this(
new TextOf(expected),
copied
);
}

/**
* Ctor.
* @param expected Value that is expected to be returned from the TeeInput
* @param copied Value that is expected to be copied into the output of
* the TeeInput
*/
public TeeInputHasResult(
final Text expected,
final Text copied) {
super();
this.expected = new ComparableText(expected);
this.copied = new ComparableText(copied);
this.actual = new ComparableText(new TextOf(""));
}

@Override
public boolean matchesSafely(final TeeInput item) {
this.actual = new ComparableText(new TextOf(item));
return
new UncheckedScalar<>(
new And(
new Equals<>(
this.expected::asString,
this.actual::asString
),
new Equals<>(
this.expected::asString,
this.copied::asString
)
)
).value();
}

@Override
public void describeTo(final Description description) {
description.appendText(
new UncheckedText(
new FormattedText(
"TeeInput with result \"%1$s\" and copied value \"%1$s\"",
new UncheckedText(this.expected).asString()
)
).asString()
);
}

@Override
public void describeMismatchSafely(
final TeeInput item,
final Description description) {
this.describeTo(description);
}
}
57 changes: 25 additions & 32 deletions src/test/java/org/cactoos/io/TeeInputFromByteArrayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@

import java.io.File;
import java.nio.charset.StandardCharsets;
import org.cactoos.text.TextOf;
import org.cactoos.matchers.TeeInputHasResult;
import org.hamcrest.MatcherAssert;
import org.hamcrest.core.IsEqual;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Expand All @@ -54,17 +53,15 @@ public void copiesFromByteArrayToPath() throws Exception {
final String message =
"Hello, товарищ path äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
output.toPath()
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
output.toPath()
),
new TeeInputHasResult(
message,
output
)
);
}

Expand All @@ -73,17 +70,15 @@ public void copiesFromByteArrayToFile() throws Exception {
final String message =
"Hello, товарищ file äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
output
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
output
),
new TeeInputHasResult(
message,
output
)
);
}

Expand All @@ -92,17 +87,15 @@ public void copiesFromByteArrayToOutput() throws Exception {
final String message =
"Hello, товарищ output äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
new OutputTo(output)
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
message.getBytes(StandardCharsets.UTF_8),
new OutputTo(output)
),
new TeeInputHasResult(
message,
output
)
);
}
}
60 changes: 25 additions & 35 deletions src/test/java/org/cactoos/io/TeeInputFromBytesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@

import java.io.File;
import java.io.IOException;
import org.cactoos.text.TextOf;
import org.cactoos.matchers.TeeInputHasResult;
import org.hamcrest.MatcherAssert;
import org.hamcrest.core.IsEqual;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Expand All @@ -38,9 +37,6 @@
* @author Roman Proshin (roman@proshin.org)
* @version $Id$
* @since 1.0
* @todo #631:30min Create a new Matcher that will compare results of TeeInput
* as well as copied content to the original message. Apply this new matcher
* for this test and for {@link TeeInputFromByteArrayTest}.
* @checkstyle JavadocMethodCheck (100 lines)
* @checkstyle ClassDataAbstractionCouplingCheck (100 lines)
*/
Expand All @@ -57,17 +53,15 @@ public void copiesFromBytesToPath() throws IOException {
final String message =
"Hello, товарищ path äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
new BytesOf(message),
output.toPath()
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
new BytesOf(message),
output.toPath()
),
new TeeInputHasResult(
message,
output
)
);
}

Expand All @@ -76,17 +70,15 @@ public void copiesFromBytesToFile() throws IOException {
final String message =
"Hello, товарищ file äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
new BytesOf(message),
output
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
new BytesOf(message),
output
),
new TeeInputHasResult(
message,
output
)
);
}

Expand All @@ -95,17 +87,15 @@ public void copiesFromBytesToOutput() throws IOException {
final String message =
"Hello, товарищ output äÄ üÜ öÖ and ß";
final File output = this.folder.newFile();
final TeeInput input = new TeeInput(
new BytesOf(message),
new OutputTo(output)
);
MatcherAssert.assertThat(
new TextOf(input).asString(),
new IsEqual<>(message)
);
MatcherAssert.assertThat(
new TextOf(output).asString(),
new IsEqual<>(message)
new TeeInput(
new BytesOf(message),
new OutputTo(output)
),
new TeeInputHasResult(
message,
output
)
);
}
}
Loading

1 comment on commit 63f3b7f

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 63f3b7f Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 631-845093d4 disappeared from src/test/java/org/cactoos/io/TeeInputFromBytesTest.java, that's why I closed #721. Please, remember that the puzzle was not necessarily removed in this particular commit. Maybe it happened earlier, but we discovered this fact only now.

Please sign in to comment.