You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/12/29 21:11:50 UTC

incubator-edgent git commit: [Edgent-333] fix FileStreamsTextFileWriterGlobalTest

Repository: incubator-edgent
Updated Branches:
  refs/heads/master 77d7f55db -> c0d090ae8


[Edgent-333] fix FileStreamsTextFileWriterGlobalTest

Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/c0d090ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/c0d090ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/c0d090ae

Branch: refs/heads/master
Commit: c0d090ae83c0c4727d9cd6790df76e49c78aaeec
Parents: 77d7f55
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Dec 29 15:20:10 2016 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Dec 29 15:20:10 2016 -0500

----------------------------------------------------------------------
 .../test/connectors/file/FileStreamsTextFileWriterTest.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/c0d090ae/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
----------------------------------------------------------------------
diff --git a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
index dcacf0f..6b40aac 100644
--- a/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
+++ b/connectors/file/src/test/java/org/apache/edgent/test/connectors/file/FileStreamsTextFileWriterTest.java
@@ -35,6 +35,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -407,7 +408,7 @@ public class FileStreamsTextFileWriterTest extends TopologyAbstractTest implemen
         // net one tuple per file
         List<List<String>> expResults = buildExpResults(lines, tuple -> true);
         // agg size only enough for last two lines
-        long aggregateFileSize = 2 * (("1-"+getStr()).getBytes().length + 1/*eol*/);
+        long aggregateFileSize = 2 * (("1-"+getStr()).getBytes(StandardCharsets.UTF_8).length + 1/*eol*/);
         expResults.remove(0);
         expResults.remove(0);
         assertEquals(2, expResults.size());
@@ -929,7 +930,7 @@ public class FileStreamsTextFileWriterTest extends TopologyAbstractTest implemen
           
           assertEquals(entryName, entry.getName());
 
-          BufferedReader br = new BufferedReader(new InputStreamReader(zin));
+          BufferedReader br = new BufferedReader(new InputStreamReader(zin, StandardCharsets.UTF_8));
           for (String line : lines) {
             ++lineCnt;
             String actLine = br.readLine();