| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/json/json_reader.h" | 5 #include "base/json/json_reader.h" |
| 6 #include "base/json/json_writer.h" | 6 #include "base/json/json_writer.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "extensions/browser/value_store/value_store_change.h" | 9 #include "extensions/browser/value_store/value_store_change.h" |
| 10 #include "extensions/common/value_builder.h" | 10 #include "extensions/common/value_builder.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 12 |
| 13 using base::DictionaryValue; | 13 using base::DictionaryValue; |
| 14 using base::Value; | 14 using base::Value; |
| 15 using extensions::DictionaryBuilder; | 15 using extensions::DictionaryBuilder; |
| 16 using extensions::ListBuilder; | 16 using extensions::ListBuilder; |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 TEST(ValueStoreChangeTest, NullOldValue) { | 20 TEST(ValueStoreChangeTest, NullOldValue) { |
| 21 ValueStoreChange change("key", NULL, new base::StringValue("value")); | 21 ValueStoreChange change("key", NULL, new base::StringValue("value")); |
| 22 | 22 |
| 23 EXPECT_EQ("key", change.key()); | 23 EXPECT_EQ("key", change.key()); |
| 24 EXPECT_EQ(NULL, change.old_value()); | 24 EXPECT_EQ(NULL, change.old_value()); |
| 25 { | 25 { |
| 26 scoped_ptr<base::Value> expected(new base::StringValue("value")); | 26 std::unique_ptr<base::Value> expected(new base::StringValue("value")); |
| 27 EXPECT_TRUE(change.new_value()->Equals(expected.get())); | 27 EXPECT_TRUE(change.new_value()->Equals(expected.get())); |
| 28 } | 28 } |
| 29 } | 29 } |
| 30 | 30 |
| 31 TEST(ValueStoreChangeTest, NullNewValue) { | 31 TEST(ValueStoreChangeTest, NullNewValue) { |
| 32 ValueStoreChange change("key", new base::StringValue("value"), NULL); | 32 ValueStoreChange change("key", new base::StringValue("value"), NULL); |
| 33 | 33 |
| 34 EXPECT_EQ("key", change.key()); | 34 EXPECT_EQ("key", change.key()); |
| 35 { | 35 { |
| 36 scoped_ptr<base::Value> expected(new base::StringValue("value")); | 36 std::unique_ptr<base::Value> expected(new base::StringValue("value")); |
| 37 EXPECT_TRUE(change.old_value()->Equals(expected.get())); | 37 EXPECT_TRUE(change.old_value()->Equals(expected.get())); |
| 38 } | 38 } |
| 39 EXPECT_EQ(NULL, change.new_value()); | 39 EXPECT_EQ(NULL, change.new_value()); |
| 40 } | 40 } |
| 41 | 41 |
| 42 TEST(ValueStoreChangeTest, NonNullValues) { | 42 TEST(ValueStoreChangeTest, NonNullValues) { |
| 43 ValueStoreChange change("key", | 43 ValueStoreChange change("key", |
| 44 new base::StringValue("old_value"), | 44 new base::StringValue("old_value"), |
| 45 new base::StringValue("new_value")); | 45 new base::StringValue("new_value")); |
| 46 | 46 |
| 47 EXPECT_EQ("key", change.key()); | 47 EXPECT_EQ("key", change.key()); |
| 48 { | 48 { |
| 49 scoped_ptr<base::Value> expected(new base::StringValue("old_value")); | 49 std::unique_ptr<base::Value> expected(new base::StringValue("old_value")); |
| 50 EXPECT_TRUE(change.old_value()->Equals(expected.get())); | 50 EXPECT_TRUE(change.old_value()->Equals(expected.get())); |
| 51 } | 51 } |
| 52 { | 52 { |
| 53 scoped_ptr<base::Value> expected(new base::StringValue("new_value")); | 53 std::unique_ptr<base::Value> expected(new base::StringValue("new_value")); |
| 54 EXPECT_TRUE(change.new_value()->Equals(expected.get())); | 54 EXPECT_TRUE(change.new_value()->Equals(expected.get())); |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 | 57 |
| 58 TEST(ValueStoreChangeTest, ToJson) { | 58 TEST(ValueStoreChangeTest, ToJson) { |
| 59 // Create a mildly complicated structure that has dots in it. | 59 // Create a mildly complicated structure that has dots in it. |
| 60 scoped_ptr<base::DictionaryValue> value = | 60 std::unique_ptr<base::DictionaryValue> value = |
| 61 DictionaryBuilder() | 61 DictionaryBuilder() |
| 62 .Set("key", "value") | 62 .Set("key", "value") |
| 63 .Set("key.with.dots", "value.with.dots") | 63 .Set("key.with.dots", "value.with.dots") |
| 64 .Set("tricked", DictionaryBuilder().Set("you", "nodots").Build()) | 64 .Set("tricked", DictionaryBuilder().Set("you", "nodots").Build()) |
| 65 .Set("tricked.you", "with.dots") | 65 .Set("tricked.you", "with.dots") |
| 66 .Build(); | 66 .Build(); |
| 67 | 67 |
| 68 ValueStoreChangeList change_list; | 68 ValueStoreChangeList change_list; |
| 69 change_list.push_back( | 69 change_list.push_back( |
| 70 ValueStoreChange("key", value->DeepCopy(), value->DeepCopy())); | 70 ValueStoreChange("key", value->DeepCopy(), value->DeepCopy())); |
| 71 change_list.push_back( | 71 change_list.push_back( |
| 72 ValueStoreChange("key.with.dots", value->DeepCopy(), value->DeepCopy())); | 72 ValueStoreChange("key.with.dots", value->DeepCopy(), value->DeepCopy())); |
| 73 | 73 |
| 74 std::string json = ValueStoreChange::ToJson(change_list); | 74 std::string json = ValueStoreChange::ToJson(change_list); |
| 75 scoped_ptr<base::Value> from_json(base::JSONReader::Read(json)); | 75 std::unique_ptr<base::Value> from_json(base::JSONReader::Read(json)); |
| 76 ASSERT_TRUE(from_json.get()); | 76 ASSERT_TRUE(from_json.get()); |
| 77 | 77 |
| 78 DictionaryBuilder v1(*value); | 78 DictionaryBuilder v1(*value); |
| 79 DictionaryBuilder v2(*value); | 79 DictionaryBuilder v2(*value); |
| 80 DictionaryBuilder v3(*value); | 80 DictionaryBuilder v3(*value); |
| 81 DictionaryBuilder v4(*value); | 81 DictionaryBuilder v4(*value); |
| 82 scoped_ptr<base::DictionaryValue> expected_from_json = | 82 std::unique_ptr<base::DictionaryValue> expected_from_json = |
| 83 DictionaryBuilder() | 83 DictionaryBuilder() |
| 84 .Set("key", DictionaryBuilder() | 84 .Set("key", DictionaryBuilder() |
| 85 .Set("oldValue", v1.Build()) | 85 .Set("oldValue", v1.Build()) |
| 86 .Set("newValue", v2.Build()) | 86 .Set("newValue", v2.Build()) |
| 87 .Build()) | 87 .Build()) |
| 88 .Set("key.with.dots", DictionaryBuilder() | 88 .Set("key.with.dots", DictionaryBuilder() |
| 89 .Set("oldValue", v3.Build()) | 89 .Set("oldValue", v3.Build()) |
| 90 .Set("newValue", v4.Build()) | 90 .Set("newValue", v4.Build()) |
| 91 .Build()) | 91 .Build()) |
| 92 .Build(); | 92 .Build(); |
| 93 | 93 |
| 94 EXPECT_TRUE(from_json->Equals(expected_from_json.get())); | 94 EXPECT_TRUE(from_json->Equals(expected_from_json.get())); |
| 95 } | 95 } |
| 96 | 96 |
| 97 } // namespace | 97 } // namespace |
| OLD | NEW |