Repository: nifi Updated Branches: refs/heads/develop 82a79f197 -> bf84ce660
nifi-715 Fixed LimitedInputStream to reflect the limit in available() method. Corrected name of test class from TestLimitedOutputStream to TestLimitedInputStream and added tests for available, mark, reset, and close methods. Signed-off-by: Mark Payne <marka...@hotmail.com> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3dd6b24c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3dd6b24c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3dd6b24c Branch: refs/heads/develop Commit: 3dd6b24ceb954afabb6e49ae5090e5915813dfd3 Parents: 75ed16c Author: Joe Skora <jsk...@gmail.com> Authored: Mon Jul 27 06:19:37 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Jul 31 09:01:35 2015 -0400 ---------------------------------------------------------------------- .../repository/io/LimitedInputStream.java | 7 +- .../repository/io/TestLimitedInputStream.java | 122 +++++++++++++++++++ .../repository/io/TestLimitedOutputStream.java | 76 ------------ 3 files changed, 127 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3dd6b24c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java index 3e5bd4f..74597ae 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LimitedInputStream.java @@ -22,7 +22,7 @@ import java.io.InputStream; public class LimitedInputStream extends InputStream { private final InputStream in; - private final long limit; + private long limit; private long bytesRead = 0; public LimitedInputStream(final InputStream in, final long limit) { @@ -82,7 +82,7 @@ public class LimitedInputStream extends InputStream { @Override public int available() throws IOException { - return in.available(); + return (int)(limit - bytesRead); } @Override @@ -93,6 +93,8 @@ public class LimitedInputStream extends InputStream { @Override public void mark(int readlimit) { in.mark(readlimit); + limit -= bytesRead; + bytesRead = 0; } @Override @@ -103,5 +105,6 @@ public class LimitedInputStream extends InputStream { @Override public void reset() throws IOException { in.reset(); + bytesRead = 0; } } http://git-wip-us.apache.org/repos/asf/nifi/blob/3dd6b24c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedInputStream.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedInputStream.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedInputStream.java new file mode 100644 index 0000000..ca85dc1 --- /dev/null +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedInputStream.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.controller.repository.io; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.io.InputStream; + +import org.apache.nifi.stream.io.ByteArrayInputStream; + +import org.junit.Test; + +public class TestLimitedInputStream { + + final byte[] data = new byte[]{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6}; + final InputStream bais = new ByteArrayInputStream(data); + final byte[] buffer3 = new byte[3]; + final byte[] buffer10 = new byte[10]; + + @Test + public void testSingleByteRead() throws IOException { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + assertEquals(0, lis.read()); + assertEquals(1, lis.read()); + assertEquals(2, lis.read()); + assertEquals(3, lis.read()); + assertEquals(-1, lis.read()); + } + + @Test + public void testByteArrayRead() throws IOException { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + final int len = lis.read(buffer10); + assertEquals(4, len); + assertEquals(-1, lis.read(buffer10)); + + for (int i = 0; i < 4; i++) { + assertEquals(i, buffer10[i]); + } + } + + @Test + public void testByteArrayReadWithRange() throws IOException { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + final int len = lis.read(buffer10, 4, 12); + assertEquals(4, len); + assertEquals(-1, lis.read(buffer10, 8, 2)); + + for (int i = 0; i < 4; i++) { + assertEquals(i, buffer10[i + 4]); + } + } + + + @Test + public void testSkip() throws Exception { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + assertEquals(3, lis.read(buffer3)); + assertEquals(1, lis.skip(data.length)); + lis.reset(); + assertEquals(4, lis.skip(7)); + lis.reset(); + assertEquals(2, lis.skip(2)); + } + + @Test + public void testClose() { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + try { + lis.close(); + } catch (IOException e) { + fail(); + } + } + + @Test + public void testAvailable() throws Exception { + final LimitedInputStream lis = new LimitedInputStream(bais, 4); + assertNotEquals(data.length, lis.available()); + lis.reset(); + assertEquals(4, lis.available()); + assertEquals(1, lis.read(buffer3, 0, 1)); + assertEquals(3, lis.available()); + } + + @Test + public void testMarkSupported() { + final LimitedInputStream lis = new LimitedInputStream(bais, 6); + assertEquals(bais.markSupported(), lis.markSupported()); + } + + @Test + public void testMark() throws Exception { + final LimitedInputStream lis = new LimitedInputStream(bais, 6); + assertEquals(3, lis.read(buffer3)); + assertEquals(3, lis.read(buffer10)); + lis.reset(); + assertEquals(3, lis.read(buffer3)); + lis.mark(1000); + assertEquals(3, lis.read(buffer10)); + lis.reset(); + assertEquals(3, lis.read(buffer10)); + } + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/3dd6b24c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java deleted file mode 100644 index da0c414..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/io/TestLimitedOutputStream.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.controller.repository.io; - -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.io.InputStream; - -import org.apache.nifi.stream.io.ByteArrayInputStream; - -import org.junit.Test; - -public class TestLimitedOutputStream { - - @Test - public void testSingleByteRead() throws IOException { - final byte[] data = new byte[]{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6}; - final InputStream bais = new ByteArrayInputStream(data); - - final LimitedInputStream lis = new LimitedInputStream(bais, 4); - assertEquals(0, lis.read()); - assertEquals(1, lis.read()); - assertEquals(2, lis.read()); - assertEquals(3, lis.read()); - assertEquals(-1, lis.read()); - } - - @Test - public void testByteArrayRead() throws IOException { - final byte[] data = new byte[]{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6}; - final InputStream bais = new ByteArrayInputStream(data); - - final byte[] buffer = new byte[8]; - - final LimitedInputStream lis = new LimitedInputStream(bais, 4); - final int len = lis.read(buffer); - assertEquals(4, len); - assertEquals(-1, lis.read(buffer)); - - for (int i = 0; i < 4; i++) { - assertEquals(i, buffer[i]); - } - } - - @Test - public void testByteArrayReadWithRange() throws IOException { - final byte[] data = new byte[]{0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6}; - final InputStream bais = new ByteArrayInputStream(data); - - final byte[] buffer = new byte[12]; - - final LimitedInputStream lis = new LimitedInputStream(bais, 4); - final int len = lis.read(buffer, 4, 12); - assertEquals(4, len); - assertEquals(-1, lis.read(buffer)); - - for (int i = 0; i < 4; i++) { - assertEquals(i, buffer[i + 4]); - } - } -}
