NextableInputStream: better skip() + more tests

diff --git a/src/be/nikiroo/utils/NextableInputStream.java b/src/be/nikiroo/utils/NextableInputStream.java
index 7ced59804b02ce5ccad360cf8c193ef1992765f2..b5374a1329b88ce4944412830f4edb552c818b17 100644 (file)
--- a/src/be/nikiroo/utils/NextableInputStream.java
+++ b/src/be/nikiroo/utils/NextableInputStream.java
@@ -277,8 +277,21 @@ public class NextableInputStream extends InputStream {
 
        @Override
        public long skip(long n) throws IOException {
 
        @Override
        public long skip(long n) throws IOException {

-               // TODO Auto-generated method stub
-               return super.skip(n);
+               if (n <= 0) {
+                       return 0;
+               }
+
+               long skipped = 0;
+               while (hasMoreData() && n > 0) {
+                       preRead();
+
+                       long inBuffer = Math.min(n, available());
+                       pos += inBuffer;
+                       n -= inBuffer;
+                       skipped += inBuffer;
+               }
+
+               return skipped;

        }
 
        @Override
        }
 
        @Override

diff --git a/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java b/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java
index e57da84cf934c0e9bb311afe64988ac7d2511a5d..4664cbf7e161b41e1b85179debbbe95fc2991b42 100644 (file)
--- a/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java
+++ b/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java
@@ -1,6 +1,7 @@
 package be.nikiroo.utils.test_code;
 
 import java.io.ByteArrayInputStream;
 package be.nikiroo.utils.test_code;
 
 import java.io.ByteArrayInputStream;

+import java.io.IOException;

 
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.NextableInputStream;
 
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.NextableInputStream;


@@ -102,9 +103,10 @@ public class NextableInputStreamTest extends TestLauncher {
                                                new NextableInputStreamStep(12));
 
                                checkNext(this, "FIRST", in, new byte[] { 42 });
                                                new NextableInputStreamStep(12));
 
                                checkNext(this, "FIRST", in, new byte[] { 42 });

-                               checkNextAll(this, "REST", in, new byte[] { 0, 127, 12, 51, 11,
-                                               12 });
-                               assertEquals("The stream still has some data", false, in.next());
+                               checkNextAll(this, "REST", in,
+                                               new byte[] { 0, 127, 12, 51, 11, 12 });
+                               assertEquals("The stream still has some data", false,
+                                               in.next());

                        }
                });
 
                        }
                });
 


@@ -136,25 +138,98 @@ public class NextableInputStreamTest extends TestLauncher {
                                checkNext(this, "THIRD", in, new byte[] { 51, 11 });
                        }
                });
                                checkNext(this, "THIRD", in, new byte[] { 51, 11 });
                        }
                });

+
+               addTest(new TestCase("Skip data") {
+                       @Override
+                       public void test() throws Exception {
+                               byte[] data = new byte[] { 42, 12, 0, 127, 12, 51, 11, 12 };
+                               NextableInputStream in = new NextableInputStream(data, null);
+                               in.next();
+
+                               in.skip(4);
+                               checkArrays(this, "ONLY", in, new byte[] { 12, 51, 11, 12 });
+                       }
+               });
+
+               addTest(new TestCase("Starts with") {
+                       @Override
+                       public void test() throws Exception {
+                               byte[] data = new byte[] { 42, 12, 0, 127, 12, 51, 11, 12 };
+                               NextableInputStream in = new NextableInputStream(data, null);
+                               in.next();
+
+                               // yes
+                               assertEquals("It actually starts with that", true,
+                                               in.startsWith(new byte[] { 42 }));
+                               assertEquals("It actually starts with that", true,
+                                               in.startsWith(new byte[] { 42, 12 }));
+                               assertEquals("It actually is the same array", true,
+                                               in.startsWith(data));
+
+                               // no
+                               assertEquals("It actually does not start with that", false,
+                                               in.startsWith(new byte[] { 12 }));
+                               assertEquals("It actually does not start with that", false,
+                                               in.startsWith(
+                                                               new byte[] { 42, 12, 0, 127, 12, 51, 11, 11 }));
+
+                               // too big
+                               try {
+                                       in.startsWith(
+                                                       new byte[] { 42, 12, 0, 127, 12, 51, 11, 12, 0 });
+                                       fail("Searching a prefix bigger than the array should throw an IOException");
+                               } catch (IOException e) {
+                               }
+                       }
+               });
+
+               addTest(new TestCase("Starts with strings") {
+                       @Override
+                       public void test() throws Exception {
+                               String text = "Fanfan et Toto vont à la mer";
+                               byte[] data = text.getBytes("UTF-8");
+                               NextableInputStream in = new NextableInputStream(data, null);
+                               in.next();
+
+                               // yes
+                               assertEquals("It actually starts with that", true,
+                                               in.startsWiths("F"));
+                               assertEquals("It actually starts with that", true,
+                                               in.startsWiths("Fanfan et"));
+                               assertEquals("It actually is the same text", true,
+                                               in.startsWiths(text));
+
+                               // no
+                               assertEquals("It actually does not start with that", false,
+                                               in.startsWiths("Toto"));
+                               assertEquals("It actually does not start with that", false,
+                                               in.startsWiths("Fanfan et Toto vont à la mee"));
+
+                               // too big
+                               try {
+                                       in.startsWiths("Fanfan et Toto vont à la mer.");
+                                       fail("Searching a prefix bigger than the array should throw an IOException");
+                               } catch (IOException e) {
+                               }
+                       }
+               });

        }
 
        static void checkNext(TestCase test, String prefix, NextableInputStream in,
                        byte[] expected) throws Exception {
                test.assertEquals("Cannot get " + prefix + " entry", true, in.next());
        }
 
        static void checkNext(TestCase test, String prefix, NextableInputStream in,
                        byte[] expected) throws Exception {
                test.assertEquals("Cannot get " + prefix + " entry", true, in.next());

-               byte[] actual = IOUtils.toByteArray(in);
-               test.assertEquals("The " + prefix
-                               + " resulting array has not the correct number of items",
-                               expected.length, actual.length);
-               for (int i = 0; i < actual.length; i++) {
-                       test.assertEquals("Item " + i + " (0-based) is not the same",
-                                       expected[i], actual[i]);
-               }
+               checkArrays(test, prefix, in, expected);

        }
 
        static void checkNextAll(TestCase test, String prefix,
                        NextableInputStream in, byte[] expected) throws Exception {
                test.assertEquals("Cannot get " + prefix + " entries", true,
                                in.nextAll());
        }
 
        static void checkNextAll(TestCase test, String prefix,
                        NextableInputStream in, byte[] expected) throws Exception {
                test.assertEquals("Cannot get " + prefix + " entries", true,
                                in.nextAll());

+               checkArrays(test, prefix, in, expected);
+       }
+
+       static void checkArrays(TestCase test, String prefix,
+                       NextableInputStream in, byte[] expected) throws Exception {

                byte[] actual = IOUtils.toByteArray(in);
                test.assertEquals("The " + prefix
                                + " resulting array has not the correct number of items",
                byte[] actual = IOUtils.toByteArray(in);
                test.assertEquals("The " + prefix
                                + " resulting array has not the correct number of items",