Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-613 just needed to check for line of length 0. Added unit test to prove fail and fix

This commit is contained in:
joewitt 2015-06-04 23:22:23 -04:00
parent 819b65f7e0
commit 1fb6aa49ba
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
View File

@ -261,7 +261,7 @@ public class ScanContent extends AbstractProcessor {
@Override
public SearchTerm<byte[]> nextTerm() throws IOException {
final String nextLine = reader.readLine();
if (nextLine == null) {
if (nextLine == null || nextLine.isEmpty()) {
return null;
}
return new SearchTerm<>(nextLine.getBytes("UTF-8"));

19
nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
View File

@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@ -34,6 +35,24 @@ import org.junit.Test;
public class TestScanContent {
@Test
public void testBlankLineInDictionaryTextEncoding() throws IOException {
final String dictionaryWithBlankLine = "Line1\n\nLine3";
final byte[] dictionaryBytes = dictionaryWithBlankLine.getBytes(ScanContent.UTF8);
final Path dictionaryPath = Paths.get("target/dictionary");
Files.write(dictionaryPath, dictionaryBytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
final TestRunner runner = TestRunners.newTestRunner(new ScanContent());
runner.setThreadCount(1);
runner.setProperty(ScanContent.DICTIONARY, dictionaryPath.toString());
runner.setProperty(ScanContent.DICTIONARY_ENCODING, ScanContent.TEXT_ENCODING);
runner.enqueue(new byte[0]);
runner.run();
runner.assertTransferCount(ScanContent.REL_NO_MATCH, 1);
}
@Ignore("This test has a race condition/ordering problem")
@Test
public void testBinaryScan() throws IOException {