3 files changed, 70 insertions, 3 deletions

diff --git a/vespalib/src/tests/data/input_reader/input_reader_test.cpp b/vespalib/src/tests/data/input_reader/input_reader_test.cpp
index e8098b7e3ea..535c188d01e 100644
--- a/vespalib/src/tests/data/input_reader/input_reader_test.cpp
+++ b/vespalib/src/tests/data/input_reader/input_reader_test.cpp
@@ -112,4 +112,47 @@ TEST("expect that obtain does not set failure state on input reader") {
     }
 }
 
+TEST("require that bytes can be unread when appropriate") {
+    const char *data = "12345";
+    MemoryInput memory_input(data);
+    ChunkedInput input(memory_input, 3);
+    InputReader src(input);
+    EXPECT_TRUE(!src.try_unread());
+    EXPECT_EQUAL(src.read(), '1');
+    EXPECT_EQUAL(src.read(), '2');
+    EXPECT_EQUAL(src.read(), '3');
+    EXPECT_TRUE(src.try_unread());
+    EXPECT_TRUE(src.try_unread());
+    EXPECT_TRUE(src.try_unread());
+    EXPECT_TRUE(!src.try_unread());
+    EXPECT_EQUAL(src.read(), '1');
+    EXPECT_EQUAL(src.read(), '2');
+    EXPECT_EQUAL(src.read(), '3');
+    EXPECT_EQUAL(src.read(), '4');
+    EXPECT_TRUE(src.try_unread());
+    EXPECT_TRUE(!src.try_unread());
+    EXPECT_EQUAL(src.read(), '4');
+    EXPECT_EQUAL(src.read(), '5');
+    EXPECT_EQUAL(src.obtain(), 0u);
+    EXPECT_TRUE(!src.try_unread());
+    EXPECT_TRUE(!src.failed());
+}
+
+TEST("require that try read finds eof without failing the reader") {
+    const char *data = "12345";
+    MemoryInput memory_input(data);
+    ChunkedInput input(memory_input, 3);
+    InputReader src(input);
+    EXPECT_EQUAL(src.try_read(), '1');
+    EXPECT_EQUAL(src.try_read(), '2');
+    EXPECT_EQUAL(src.try_read(), '3');
+    EXPECT_EQUAL(src.try_read(), '4');
+    EXPECT_EQUAL(src.try_read(), '5');
+    EXPECT_TRUE(src.try_unread());
+    EXPECT_EQUAL(src.try_read(), '5');
+    EXPECT_EQUAL(src.try_read(), '\0');
+    EXPECT_TRUE(!src.try_unread());
+    EXPECT_TRUE(!src.failed());
+}
+
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/vespalib/src/tests/slime/slime_binary_format_test.cpp b/vespalib/src/tests/slime/slime_binary_format_test.cpp
index 371a843a445..e6661cbf554 100644
--- a/vespalib/src/tests/slime/slime_binary_format_test.cpp
+++ b/vespalib/src/tests/slime/slime_binary_format_test.cpp
@@ -632,8 +632,7 @@ TEST("testOptionalDecodeOrder") {
 
 Slime from_json(const vespalib::string &json) {
     Slime slime;
-    size_t size = vespalib::slime::JsonFormat::decode(json, slime);
-    EXPECT_EQUAL(size, json.size());
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(json, slime) > 0);
     return slime;
 }
 
diff --git a/vespalib/src/tests/slime/slime_json_format_test.cpp b/vespalib/src/tests/slime/slime_json_format_test.cpp
index 52e293f4a5e..d1f77f09af1 100644
--- a/vespalib/src/tests/slime/slime_json_format_test.cpp
+++ b/vespalib/src/tests/slime/slime_json_format_test.cpp
@@ -1,10 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <vespa/vespalib/data/input.h>
+#include <vespa/vespalib/data/memory_input.h>
 #include <iostream>
 #include <fstream>
 
 using namespace vespalib::slime::convenience;
+using vespalib::Input;
+using vespalib::MemoryInput;
 
 std::string make_json(const Slime &slime, bool compact) {
     vespalib::SimpleBuffer buf;
@@ -60,7 +64,13 @@ std::string json_string(const std::string &str) {
 
 std::string normalize(const std::string &json) {
     Slime slime;
-    EXPECT_GREATER(vespalib::slime::JsonFormat::decode(json, slime), 0u);
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(json, slime) > 0);
+    return make_json(slime, true);
+}
+
+std::string normalize(Input &input) {
+    Slime slime;
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(input, slime) > 0);
     return make_json(slime, true);
 }
 
@@ -359,4 +369,19 @@ TEST_F("decode bytes not null-terminated", Slime) {
     EXPECT_TRUE(parse_json_bytes(mem, f));
 }
 
+TEST("require that multiple adjacent values can be decoded from a single input") {
+    vespalib::string data("true{}false[]null\"foo\"'bar'1.5null");
+    MemoryInput input(data);
+    EXPECT_EQUAL(std::string("true"), normalize(input));
+    EXPECT_EQUAL(std::string("{}"), normalize(input));
+    EXPECT_EQUAL(std::string("false"), normalize(input));
+    EXPECT_EQUAL(std::string("[]"), normalize(input));
+    EXPECT_EQUAL(std::string("null"), normalize(input));
+    EXPECT_EQUAL(std::string("\"foo\""), normalize(input));
+    EXPECT_EQUAL(std::string("\"bar\""), normalize(input));
+    EXPECT_EQUAL(std::string("1.5"), normalize(input));
+    EXPECT_EQUAL(std::string("null"), normalize(input));
+    EXPECT_EQUAL(input.obtain().size, 0u);
+}
+
 TEST_MAIN() { TEST_RUN_ALL(); }