fix readStringAsSlice in streaming mode

taowen · taowen · commit 692b7b5cc7d0 · 2017-01-17T09:40:30.000+08:00
diff --git a/demo/src/test/java/com/jsoniter/demo/ReadString.java b/demo/src/test/java/com/jsoniter/demo/ReadString.java
@@ -34,7 +34,7 @@ public void test() throws IOException {
     @Setup(Level.Trial)
     public void benchSetup(BenchmarkParams params) {
         jsonIterator = new JsonIterator();
-        input = "\"hello wo\\trld\"".getBytes();
+        input = "\"hello world\"".getBytes();
     }
 
     @Benchmark
diff --git a/src/main/java/com/jsoniter/IterImplForStreaming.java b/src/main/java/com/jsoniter/IterImplForStreaming.java
@@ -195,6 +195,9 @@ final static boolean skipNumber(JsonIterator iter) throws IOException {
 
     // read the bytes between " "
     final static Slice readSlice(JsonIterator iter) throws IOException {
+        if (IterImpl.nextToken(iter) != '"') {
+            throw iter.reportError("readSlice", "expect \" for string");
+        }
         int end = IterImplString.findSliceEnd(iter);
         if (end != -1) {
             // reuse current buffer
diff --git a/src/test/java/com/jsoniter/TestString.java b/src/test/java/com/jsoniter/TestString.java
@@ -17,8 +17,8 @@ public void test_ascii_string() throws IOException {
         assertEquals("hello", iter.readString());
         assertEquals("world", iter.readString());
         iter = JsonIterator.parse("'hello''world'".replace('\'', '"'));
-        assertEquals("hello", iter.readString());
-        assertEquals("world", iter.readString());
+        assertEquals("hello", iter.readStringAsSlice().toString());
+        assertEquals("world", iter.readStringAsSlice().toString());
     }
 
     public void test_ascii_string_with_escape() throws IOException {
@@ -55,6 +55,9 @@ public void test_string_across_buffer() throws IOException {
         JsonIterator iter = JsonIterator.parse(new ByteArrayInputStream("'hello''world'".replace('\'', '"').getBytes()), 2);
         assertEquals("hello", iter.readString());
         assertEquals("world", iter.readString());
+        iter = JsonIterator.parse(new ByteArrayInputStream("'hello''world'".replace('\'', '"').getBytes()), 2);
+        assertEquals("hello", iter.readStringAsSlice().toString());
+        assertEquals("world", iter.readStringAsSlice().toString());
     }
 
     @org.junit.experimental.categories.Category(StreamingCategory.class)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void test() throws IOException {`
`34`	`34`	`@Setup(Level.Trial)`
`35`	`35`	`public void benchSetup(BenchmarkParams params) {`
`36`	`36`	`jsonIterator = new JsonIterator();`
`37`		`- input = "\"hello wo\\trld\"".getBytes();`
	`37`	`+ input = "\"hello world\"".getBytes();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Benchmark`