remove auto type conversion on array/object assignment

[jansson.git] / test.cc

diff --git a/test.cc b/test.cc
index daacbea..c6e5362 100644 (file)
--- a/test.cc
+++ b/test.cc
@@ -69,39 +69,43 @@ int main() {
        e3 = jansson::Value::null();
        ASSERT_TRUE(e3.is_null(), "e3 is not null after assignment");
 
-       e3.set(0, jansson::Value::from("foobar"));
+       e3 = jansson::Value::array();
        ASSERT_TRUE(e3.is_array(), "e3 is not an array after index assignment");
+
+       e3.set_at(0, jansson::Value::from("foobar"));
        ASSERT_EQ(e3.size(), 1, "e3 has incorrect number of elements after assignment");
        ASSERT_EQ(e3[0].as_string(), "foobar", "e3[0] has incorrect value after assignment");
 
-       e3.set(1, jansson::Value::from("foobar"));
+       e3.set_at(1, jansson::Value::from("foobar"));
        ASSERT_TRUE(e3.is_array(), "e3 is not an array after index assignment");
        ASSERT_EQ(e3.size(), 2, "e3 has incorrect number of elements after assignment");
        ASSERT_EQ(e3[1].as_string(), "foobar", "e3[0] has incorrect value after assignment");
 
-       e3.set(0, jansson::Value::from("barfoo"));
+       e3.set_at(0, jansson::Value::from("barfoo"));
        ASSERT_TRUE(e3.is_array(), "e3 is not an array after index assignment");
        ASSERT_EQ(e3.size(), 2, "e3 has incorrect number of elements after assignment");
        ASSERT_EQ(e3[0].as_string(), "barfoo", "e3[0] has incorrect value after assignment");
 
-       e3.set(100, jansson::Value::null());
+       e3.set_at(100, jansson::Value::null());
        ASSERT_TRUE(e3.is_array(), "e3 is not an array after index assignment");
        ASSERT_EQ(e3.size(), 2, "e3 has incorrect number of elements after assignment");
 
        e3.clear();
        ASSERT_EQ(e3.size(), 0, "e3 has incorrect number of elements after clear");
 
-       e3.set("foo", jansson::Value::from("test"));
+       e3 = jansson::Value::object();
        ASSERT_TRUE(e3.is_object(), "e3 is not an object after property assignment");
+
+       e3.set_key("foo", jansson::Value::from("test"));
        ASSERT_EQ(e3.size(), 1, "e3 has incorrect number of properties after assignment");
        ASSERT_EQ(e3["foo"].as_string(), "test", "e3.foo has incorrect value after assignment");
 
-       e3.set("foo", jansson::Value::from("again"));
+       e3.set_key("foo", jansson::Value::from("again"));
        ASSERT_TRUE(e3.is_object(), "e3 is not an object after property assignment");
        ASSERT_EQ(e3.size(), 1, "e3 has incorrect number of properties after assignment");
        ASSERT_EQ(e3["foo"].as_string(), "again", "e3.foo has incorrect value after assignment");
 
-       e3.set("bar", jansson::Value::from("test"));
+       e3.set_key("bar", jansson::Value::from("test"));
        ASSERT_TRUE(e3.is_object(), "e3 is not an object after property assignment");
        ASSERT_EQ(e3.size(), 2, "e3 has incorrect number of properties after assignment");
        ASSERT_EQ(e3["bar"].as_string(), "test", "e3.foo has incorrect value after assignment");
@@ -110,12 +114,23 @@ int main() {
        ASSERT_EQ(e3.size(), 0, "e3 has incorrect number of properties after clear");
 
        e3 = jansson::Value::object();
-       e3.set("foo", jansson::Value::from("test"));
-       e3.set("bar", jansson::Value::from(3));
+       e3.set_key("foo", jansson::Value::from("test"));
+       e3.set_key("bar", jansson::Value::from(3));
        char* out_cstr = e3.save_string(0);
        string out(out_cstr);
        free(out_cstr);
        ASSERT_EQ(out, "{\"bar\": 3,\"foo\": \"test\"}\n", "object did not serialize as expected");
 
+       std::istringstream instr(out);
+       instr >> e3;
+       ASSERT_TRUE(e3.is_object(), "e3 is not an object after stream read");
+       ASSERT_EQ(e3.size(), 2, "e3 has wrong size after stream read");
+       ASSERT_EQ(e3.get("bar").as_integer(), 3, "e3.bar has incorrect value after stream read");
+       ASSERT_EQ(e3.get("foo").as_string(), "test", "ee3.test has incorrect value after stream read");
+
+       std::ostringstream outstr;
+       outstr << e3;
+       ASSERT_EQ(instr.str(), "{\"bar\": 3,\"foo\": \"test\"}\n", "object did not serialize as expected");
+
        return 0;
 }