diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 07:44:17 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 07:44:17 -0800 |
| commit | e8daf0fbda22f0b54f4c9066368ceb511a485311 (patch) | |
| tree | 3d86425a07979b2dc90d68eb6e692bf7793d95b6 | |
| parent | 3faf0373f486dc6a638a5df997ada3baa3588e7e (diff) | |
| download | weaved-e8daf0fbda22f0b54f4c9066368ceb511a485311.tar.gz | |
Fix weaved unit tests
brillo::Any to base::Value conversion code now supports Any containing
raw char* which wasn't before. The unit test hasn't been updated at the
time to express this expectation.
BUG: 26563003
Change-Id: Id69bc18ee70c9dcd88a268b3b90319291c15ef8d
| -rw-r--r-- | common/data_conversion_unittest.cc | 2 |
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{}}})); |