diff options
Diffstat (limited to 'src/components/rpc_base/test/rpc_base_json_test.cc')
| -rw-r--r-- | src/components/rpc_base/test/rpc_base_json_test.cc | 39 |
1 files changed, 17 insertions, 22 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 3a536937ba..07ac0418e0 100644 --- a/src/components/rpc_base/test/rpc_base_json_test.cc +++ b/src/components/rpc_base/test/rpc_base_json_test.cc @@ -39,11 +39,7 @@ using namespace rpc; using Json::Value; namespace { -enum TestEnum { - kValue0, - kValue1, - kInvalidValue -}; +enum TestEnum { kValue0, kValue1, kInvalidValue }; bool EnumFromJsonString(const std::string& value, TestEnum* enm) { if (value == "kValue0") { @@ -58,10 +54,13 @@ bool EnumFromJsonString(const std::string& value, TestEnum* enm) { } const char* EnumToJsonString(TestEnum enm) { - switch(enm) { - case kValue0: return "kValue0"; - case kValue1: return "kValue1"; - default: return "UNKNOWN"; + switch (enm) { + case kValue0: + return "kValue0"; + case kValue1: + return "kValue1"; + default: + return "UNKNOWN"; } } @@ -272,7 +271,7 @@ TEST(ValidatedTypesJson, MandatoryMapNullTest) { TEST(ValidatedTypesJson, OptionalMapAbsentValueTest) { Value* novalue = NULL; - Optional< Map<String<1, 32>, 0, 5> > map(novalue); + Optional<Map<String<1, 32>, 0, 5> > map(novalue); ASSERT_FALSE(map.is_initialized()); ASSERT_TRUE(map.is_valid()); } @@ -305,7 +304,7 @@ TEST(ValidatedTypesJson, MapFromNonArrayJsonTest) { TEST(ValidatedTypesJson, OptionalBoolFromJsonTest) { Value bool_value(true); - Optional< Boolean > optional_bool; + Optional<Boolean> optional_bool; *optional_bool = Boolean(&bool_value); ASSERT_TRUE(optional_bool.is_initialized()); ASSERT_TRUE(optional_bool.is_valid()); @@ -316,7 +315,7 @@ TEST(ValidatedTypesJson, OptionalBoolFromJsonTest) { TEST(ValidatedTypesJson, OptionalBoolFromAbsentValueTest) { Value* none = NULL; - Optional< Boolean > optional_bool; + Optional<Boolean> optional_bool; *optional_bool = Boolean(none); ASSERT_FALSE(optional_bool.is_initialized()); // It is ok for Optional value to be absent @@ -324,7 +323,7 @@ TEST(ValidatedTypesJson, OptionalBoolFromAbsentValueTest) { } TEST(ValidatedTypesJson, OptionalBoolFromNullValueTest) { - Optional< Boolean > optional_bool; + Optional<Boolean> optional_bool; *optional_bool = Boolean(&Value::null); ASSERT_TRUE(optional_bool.is_initialized()); // Optional values should not be absent @@ -332,7 +331,7 @@ TEST(ValidatedTypesJson, OptionalBoolFromNullValueTest) { } TEST(ValidatedTypesJson, NullableIntFromNullValueTest) { - Nullable< Integer<int8_t, 1, 15> > nullable_int(&Value::null); + Nullable<Integer<int8_t, 1, 15> > nullable_int(&Value::null); ASSERT_TRUE(nullable_int.is_initialized()); ASSERT_TRUE(nullable_int.is_valid()); ASSERT_TRUE(nullable_int.is_null()); @@ -340,7 +339,7 @@ TEST(ValidatedTypesJson, NullableIntFromNullValueTest) { TEST(ValidatedTypesJson, NullableIntFromNonNullValueTest) { Value json(3); - Nullable< Integer<int8_t, 1, 15> > nullable_int(&json); + Nullable<Integer<int8_t, 1, 15> > nullable_int(&json); ASSERT_TRUE(nullable_int.is_initialized()); ASSERT_TRUE(nullable_int.is_valid()); ASSERT_FALSE(nullable_int.is_null()); @@ -349,7 +348,7 @@ TEST(ValidatedTypesJson, NullableIntFromNonNullValueTest) { TEST(ValidatedTypesJson, NullableIntFromAbsentValueTest) { Value* noval = NULL; - Nullable< Integer<int8_t, 1, 15> > nullable_int(noval); + Nullable<Integer<int8_t, 1, 15> > nullable_int(noval); ASSERT_FALSE(nullable_int.is_initialized()); ASSERT_FALSE(nullable_int.is_valid()); ASSERT_FALSE(nullable_int.is_null()); @@ -357,8 +356,8 @@ TEST(ValidatedTypesJson, NullableIntFromAbsentValueTest) { TEST(ValidatedTypesJson, OptionalIntFromJsonTest) { Value int_value(42); - Optional< Integer<int64_t, 42, 43> > optional_int; - *optional_int = Integer<int64_t, 42, 43> (&int_value); + Optional<Integer<int64_t, 42, 43> > optional_int; + *optional_int = Integer<int64_t, 42, 43>(&int_value); ASSERT_TRUE(optional_int.is_initialized()); ASSERT_TRUE(optional_int.is_valid()); Value readback = optional_int->ToJsonValue(); @@ -366,8 +365,4 @@ TEST(ValidatedTypesJson, OptionalIntFromJsonTest) { ASSERT_EQ(readback.asInt(), 42); } - } // namespace test - - - |