Repository: beam Updated Branches: refs/heads/master f33039bfd -> 0d19d3cb2
[BEAM-59] FileChecksumMatcherTest: switch from IOChannelUtils to java file API These are unit tests always running on local filesystem. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fb9ebb67 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fb9ebb67 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fb9ebb67 Branch: refs/heads/master Commit: fb9ebb678b9c2d2bba1d00baedbfa0f5360927db Parents: f33039b Author: Dan Halperin <dhalp...@google.com> Authored: Wed May 3 08:43:51 2017 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Wed May 3 10:43:44 2017 -0700 ---------------------------------------------------------------------- .../org/apache/beam/sdk/testing/FileChecksumMatcherTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/fb9ebb67/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/FileChecksumMatcherTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/FileChecksumMatcherTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/FileChecksumMatcherTest.java index 5438479..4ee6750 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/FileChecksumMatcherTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/FileChecksumMatcherTest.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.regex.Pattern; import org.apache.beam.sdk.PipelineResult; -import org.apache.beam.sdk.util.IOChannelUtils; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -111,7 +110,7 @@ public class FileChecksumMatcherTest { FileChecksumMatcher matcher = new FileChecksumMatcher( "90552392c28396935fe4f123bd0b5c2d0f6260c8", - IOChannelUtils.resolve(tmpFolder.getRoot().getPath(), "result-*")); + tmpFolder.getRoot().toPath().resolve("result-*").toString()); assertThat(pResult, matcher); } @@ -123,7 +122,7 @@ public class FileChecksumMatcherTest { FileChecksumMatcher matcher = new FileChecksumMatcher( "da39a3ee5e6b4b0d3255bfef95601890afd80709", - IOChannelUtils.resolve(tmpFolder.getRoot().getPath(), "*")); + tmpFolder.getRoot().toPath().resolve("*").toString()); assertThat(pResult, matcher); } @@ -140,7 +139,7 @@ public class FileChecksumMatcherTest { Pattern.compile("(?x) result (?<shardnum>\\d+) - total (?<numshards>\\d+)"); FileChecksumMatcher matcher = new FileChecksumMatcher( "90552392c28396935fe4f123bd0b5c2d0f6260c8", - IOChannelUtils.resolve(tmpFolder.getRoot().getPath(), "*"), + tmpFolder.getRoot().toPath().resolve("*").toString(), customizedTemplate); assertThat(pResult, matcher);