diff options
Diffstat (limited to 'src/components/rpc_base/test')
-rw-r--r-- | src/components/rpc_base/test/rpc_base_json_test.cc | 2 | ||||
-rw-r--r-- | src/components/rpc_base/test/rpc_base_test.cc | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/components/rpc_base/test/rpc_base_json_test.cc b/src/components/rpc_base/test/rpc_base_json_test.cc index cad9dd3a65..8db1c5549b 100644 --- a/src/components/rpc_base/test/rpc_base_json_test.cc +++ b/src/components/rpc_base/test/rpc_base_json_test.cc @@ -124,7 +124,7 @@ TEST(ValidatedTypesJson, IntegerAbsentValueTest) { } TEST(ValidatedTypesJson, IntegerFromOverflowingJsonTest) { - Value int_val(0xFFFFFFFFFFll); + Value int_val(0xFFFFFFFFFFl); Integer<int32_t, -5, 192> integer(&int_val); ASSERT_TRUE(integer.is_initialized()); ASSERT_FALSE(integer.is_valid()); diff --git a/src/components/rpc_base/test/rpc_base_test.cc b/src/components/rpc_base/test/rpc_base_test.cc index dc0a1df128..7c62fa3fb4 100644 --- a/src/components/rpc_base/test/rpc_base_test.cc +++ b/src/components/rpc_base/test/rpc_base_test.cc @@ -191,18 +191,20 @@ TEST(ValidatedTypes, TestOptionalEmptyArray) { Optional<Array<Integer<int8_t, 0, 10>, 0, 5> > ai; ASSERT_RPCTYPE_VALID(ai); ASSERT_FALSE(ai.is_initialized()); - Json::FastWriter fw; - std::string serialized = fw.write(ai.ToJsonValue()); - ASSERT_EQ(serialized, "[]\n"); + Json::StreamWriterBuilder writer_builder; + const std::string serialized = + Json::writeString(writer_builder, ai.ToJsonValue()); + ASSERT_EQ("[]", serialized); } TEST(ValidatedTypes, TestMandatoryEmptyArray) { Array<Integer<int8_t, 0, 10>, 0, 5> ai; ASSERT_FALSE(ai.is_valid()); ASSERT_FALSE(ai.is_initialized()); - Json::FastWriter fw; - std::string serialized = fw.write(ai.ToJsonValue()); - ASSERT_EQ(serialized, "[]\n"); + Json::StreamWriterBuilder writer_builder; + const std::string serialized = + Json::writeString(writer_builder, ai.ToJsonValue()); + ASSERT_EQ("[]", serialized); } TEST(ValidatedTypes, TestMap) { @@ -230,9 +232,10 @@ TEST(ValidatedTypes, TestEmptyMandatoryMap) { Map<Integer<int8_t, 0, 10>, 0, 5> im; ASSERT_FALSE(im.is_valid()); ASSERT_FALSE(im.is_initialized()); - Json::FastWriter fw; - std::string serialized = fw.write(im.ToJsonValue()); - ASSERT_EQ(serialized, "{}\n"); + Json::StreamWriterBuilder writer_builder; + const std::string serialized = + Json::writeString(writer_builder, im.ToJsonValue()); + ASSERT_EQ("{}", serialized); } TEST(ValidatedTypes, TestEnumConstructor) { |