You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ew...@apache.org on 2015/12/23 02:07:32 UTC

kafka git commit: MINOR: Use "new line" delimeters in a portable way in a unit test

Repository: kafka
Updated Branches:
  refs/heads/trunk 976fa192d -> bde49e371


MINOR: Use "new line" delimeters in a portable way in a unit test

This fixes failure of the FileStreamSinkTaskTest unit test on Windows

Signed-off-by: glikson <gliksonil.ibm.com>

Author: glikson <gl...@il.ibm.com>

Reviewers: Guozhang Wang <wa...@gmail.com>, Ewen Cheslack-Postava <ew...@confluent.io>

Closes #708 from glikson/file-ut-newline


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

Branch: refs/heads/trunk
Commit: bde49e3711a45721a0d1df9acf3ce2e5a8f990e9
Parents: 976fa19
Author: glikson <gl...@il.ibm.com>
Authored: Tue Dec 22 17:07:15 2015 -0800
Committer: Ewen Cheslack-Postava <me...@ewencp.org>
Committed: Tue Dec 22 17:07:15 2015 -0800

----------------------------------------------------------------------
 .../org/apache/kafka/connect/file/FileStreamSinkTaskTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/bde49e37/connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java
----------------------------------------------------------------------
diff --git a/connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java b/connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java
index 754e7f5..8a21c74 100644
--- a/connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java
+++ b/connect/file/src/test/java/org/apache/kafka/connect/file/FileStreamSinkTaskTest.java
@@ -47,6 +47,7 @@ public class FileStreamSinkTaskTest {
     @Test
     public void testPutFlush() {
         HashMap<TopicPartition, OffsetAndMetadata> offsets = new HashMap<>();
+        final String newLine = System.getProperty("line.separator"); 
 
         // We do not call task.start() since it would override the output stream
 
@@ -55,7 +56,7 @@ public class FileStreamSinkTaskTest {
         ));
         offsets.put(new TopicPartition("topic1", 0), new OffsetAndMetadata(1L));
         task.flush(offsets);
-        assertEquals("line1\n", os.toString());
+        assertEquals("line1" + newLine, os.toString());
 
         task.put(Arrays.asList(
                 new SinkRecord("topic1", 0, null, null, Schema.STRING_SCHEMA, "line2", 2),
@@ -64,6 +65,6 @@ public class FileStreamSinkTaskTest {
         offsets.put(new TopicPartition("topic1", 0), new OffsetAndMetadata(2L));
         offsets.put(new TopicPartition("topic2", 0), new OffsetAndMetadata(1L));
         task.flush(offsets);
-        assertEquals("line1\nline2\nline3\n", os.toString());
+        assertEquals("line1" + newLine + "line2" + newLine + "line3" + newLine, os.toString());
     }
 }