aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2016-01-20 17:50:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-20 17:50:11 +0000
commitc78336dd2df91f7ba33c38d77aaf8a577cd1a71a (patch)
tree3d86425a07979b2dc90d68eb6e692bf7793d95b6
parent8fa122832e0553feaeb8bacb4efcc95660b293cf (diff)
parente8daf0fbda22f0b54f4c9066368ceb511a485311 (diff)
downloadweaved-c78336dd2df91f7ba33c38d77aaf8a577cd1a71a.tar.gz
Fix weaved unit tests
am: e8daf0fbda * commit 'e8daf0fbda22f0b54f4c9066368ceb511a485311': Fix weaved unit tests
-rw-r--r--common/data_conversion_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/data_conversion_unittest.cc b/common/data_conversion_unittest.cc
index 832fffb..7f84cdb 100644
--- a/common/data_conversion_unittest.cc
+++ b/common/data_conversion_unittest.cc
@@ -162,6 +162,7 @@ TEST(DBusConversionTest, VariantDictionaryToDictionaryValue) {
EXPECT_JSON_EQ("{'bool': true}", *FromVariant({{"bool", true}}));
EXPECT_JSON_EQ("{'int': 5}", *FromVariant({{"int", 5}}));
EXPECT_JSON_EQ("{'double': 6.7}", *FromVariant({{"double", 6.7}}));
+ EXPECT_JSON_EQ("{'cString': 'abc'}", *FromVariant({{"cString", "abc"}}));
EXPECT_JSON_EQ("{'string': 'abc'}",
*FromVariant({{"string", std::string{"abc"}}}));
EXPECT_JSON_EQ("{'object': {'bool': true}}",
@@ -183,7 +184,6 @@ TEST(DBusConversionTest, VariantDictionaryToDictionaryValue) {
}
TEST(DBusConversionTest, VariantDictionaryToDictionaryValueErrors) {
- EXPECT_FALSE(FromVariant({{"cString", "abc"}}));
EXPECT_FALSE(FromVariant({{"float", 1.0f}}));
EXPECT_FALSE(FromVariant({{"listList", std::vector<std::vector<int>>{}}}));
EXPECT_FALSE(FromVariant({{"any", Any{}}}));