Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2015 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 17 | #include "link/TableMerger.h" |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 18 | |
Adam Lesinski | 6a00817 | 2016-02-02 17:02:58 -0800 | [diff] [blame] | 19 | #include "filter/ConfigFilter.h" |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 20 | #include "io/FileSystem.h" |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 21 | #include "test/Test.h" |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 22 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 23 | using ::aapt::test::ValueEq; |
| 24 | using ::testing::Contains; |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 25 | using ::testing::Eq; |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 26 | using ::testing::Field; |
| 27 | using ::testing::NotNull; |
| 28 | using ::testing::Pointee; |
| 29 | using ::testing::StrEq; |
| 30 | using ::testing::UnorderedElementsAreArray; |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 31 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 32 | namespace aapt { |
| 33 | |
| 34 | struct TableMergerTest : public ::testing::Test { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 35 | std::unique_ptr<IAaptContext> context_; |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 36 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 37 | void SetUp() override { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 38 | context_ = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 39 | test::ContextBuilder() |
| 40 | // We are compiling this package. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 41 | .SetCompilationPackage("com.app.a") |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 42 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 43 | // Merge all packages that have this package ID. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 44 | .SetPackageId(0x7f) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 45 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 46 | // Mangle all packages that do not have this package name. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 47 | .SetNameManglerPolicy(NameManglerPolicy{"com.app.a", {"com.app.b"}}) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 48 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 49 | .Build(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 50 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 51 | }; |
| 52 | |
| 53 | TEST_F(TableMergerTest, SimpleMerge) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 54 | std::unique_ptr<ResourceTable> table_a = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 55 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 56 | .SetPackageId("com.app.a", 0x7f) |
| 57 | .AddReference("com.app.a:id/foo", "com.app.a:id/bar") |
| 58 | .AddReference("com.app.a:id/bar", "com.app.b:id/foo") |
| 59 | .AddValue( |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 60 | "com.app.a:styleable/view", |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 61 | test::StyleableBuilder().AddItem("com.app.b:id/foo").Build()) |
| 62 | .Build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 63 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 64 | std::unique_ptr<ResourceTable> table_b = test::ResourceTableBuilder() |
| 65 | .SetPackageId("com.app.b", 0x7f) |
| 66 | .AddSimple("com.app.b:id/foo") |
| 67 | .Build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 68 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 69 | ResourceTable final_table; |
| 70 | TableMerger merger(context_.get(), &final_table, TableMergerOptions{}); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 71 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 72 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 73 | ASSERT_TRUE(merger.MergeAndMangle({}, "com.app.b", table_b.get())); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 74 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 75 | EXPECT_TRUE(merger.merged_packages().count("com.app.b") != 0); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 76 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 77 | // Entries from com.app.a should not be mangled. |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 78 | EXPECT_TRUE(final_table.FindResource(test::ParseNameOrDie("com.app.a:id/foo"))); |
| 79 | EXPECT_TRUE(final_table.FindResource(test::ParseNameOrDie("com.app.a:id/bar"))); |
| 80 | EXPECT_TRUE(final_table.FindResource(test::ParseNameOrDie("com.app.a:styleable/view"))); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 81 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 82 | // The unmangled name should not be present. |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 83 | EXPECT_FALSE(final_table.FindResource(test::ParseNameOrDie("com.app.b:id/foo"))); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 84 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 85 | // Look for the mangled name. |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 86 | EXPECT_TRUE(final_table.FindResource(test::ParseNameOrDie("com.app.a:id/com.app.b$foo"))); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 87 | } |
| 88 | |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 89 | TEST_F(TableMergerTest, MergeFile) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 90 | ResourceTable final_table; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 91 | TableMergerOptions options; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 92 | options.auto_add_overlay = false; |
| 93 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 94 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 95 | ResourceFile file_desc; |
| 96 | file_desc.config = test::ParseConfigOrDie("hdpi-v4"); |
| 97 | file_desc.name = test::ParseNameOrDie("layout/main"); |
| 98 | file_desc.source = Source("res/layout-hdpi/main.xml"); |
| 99 | test::TestFile test_file("path/to/res/layout-hdpi/main.xml.flat"); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 100 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 101 | ASSERT_TRUE(merger.MergeFile(file_desc, false /*overlay*/, &test_file)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 102 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 103 | FileReference* file = test::GetValueForConfig<FileReference>( |
| 104 | &final_table, "com.app.a:layout/main", test::ParseConfigOrDie("hdpi-v4")); |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 105 | ASSERT_THAT(file, NotNull()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 106 | EXPECT_EQ(std::string("res/layout-hdpi-v4/main.xml"), *file->path); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 107 | } |
| 108 | |
| 109 | TEST_F(TableMergerTest, MergeFileOverlay) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 110 | ResourceTable final_table; |
| 111 | TableMergerOptions options; |
| 112 | options.auto_add_overlay = false; |
| 113 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 114 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 115 | ResourceFile file_desc; |
| 116 | file_desc.name = test::ParseNameOrDie("xml/foo"); |
| 117 | test::TestFile file_a("path/to/fileA.xml.flat"); |
| 118 | test::TestFile file_b("path/to/fileB.xml.flat"); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 119 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 120 | ASSERT_TRUE(merger.MergeFile(file_desc, false /*overlay*/, &file_a)); |
| 121 | ASSERT_TRUE(merger.MergeFile(file_desc, true /*overlay*/, &file_b)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 122 | } |
| 123 | |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 124 | TEST_F(TableMergerTest, MergeFileReferences) { |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 125 | test::TestFile file_a("res/xml/file.xml"); |
| 126 | test::TestFile file_b("res/xml/file.xml"); |
| 127 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 128 | std::unique_ptr<ResourceTable> table_a = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 129 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 130 | .SetPackageId("com.app.a", 0x7f) |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 131 | .AddFileReference("com.app.a:xml/file", "res/xml/file.xml", &file_a) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 132 | .Build(); |
| 133 | std::unique_ptr<ResourceTable> table_b = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 134 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 135 | .SetPackageId("com.app.b", 0x7f) |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 136 | .AddFileReference("com.app.b:xml/file", "res/xml/file.xml", &file_b) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 137 | .Build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 138 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 139 | ResourceTable final_table; |
| 140 | TableMerger merger(context_.get(), &final_table, TableMergerOptions{}); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 141 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 142 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 143 | ASSERT_TRUE(merger.MergeAndMangle({}, "com.app.b", table_b.get())); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 144 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 145 | FileReference* f = test::GetValue<FileReference>(&final_table, "com.app.a:xml/file"); |
| 146 | ASSERT_THAT(f, NotNull()); |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 147 | EXPECT_THAT(*f->path, StrEq("res/xml/file.xml")); |
| 148 | EXPECT_THAT(f->file, Eq(&file_a)); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 149 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 150 | f = test::GetValue<FileReference>(&final_table, "com.app.a:xml/com.app.b$file"); |
| 151 | ASSERT_THAT(f, NotNull()); |
Adam Lesinski | 8780eb6 | 2017-10-31 17:44:39 -0700 | [diff] [blame] | 152 | EXPECT_THAT(*f->path, StrEq("res/xml/com.app.b$file.xml")); |
| 153 | EXPECT_THAT(f->file, Eq(&file_b)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 154 | } |
| 155 | |
| 156 | TEST_F(TableMergerTest, OverrideResourceWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 157 | std::unique_ptr<ResourceTable> base = |
| 158 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 159 | .SetPackageId("", 0x00) |
| 160 | .AddValue("bool/foo", ResourceUtils::TryParseBool("true")) |
| 161 | .Build(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 162 | std::unique_ptr<ResourceTable> overlay = |
| 163 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 164 | .SetPackageId("", 0x00) |
| 165 | .AddValue("bool/foo", ResourceUtils::TryParseBool("false")) |
| 166 | .Build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 167 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 168 | ResourceTable final_table; |
| 169 | TableMergerOptions options; |
| 170 | options.auto_add_overlay = false; |
| 171 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 172 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 173 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 174 | ASSERT_TRUE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 175 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 176 | BinaryPrimitive* foo = test::GetValue<BinaryPrimitive>(&final_table, "com.app.a:bool/foo"); |
| 177 | ASSERT_THAT(foo, |
| 178 | Pointee(Field(&BinaryPrimitive::value, Field(&android::Res_value::data, Eq(0u))))); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 179 | } |
| 180 | |
Ryan Mitchell | a9e3160 | 2018-06-28 16:41:38 -0700 | [diff] [blame] | 181 | TEST_F(TableMergerTest, DoNotOverrideResourceComment) { |
| 182 | std::unique_ptr<Value> foo_original = ResourceUtils::TryParseBool("true"); |
| 183 | foo_original->SetComment(android::StringPiece("Original foo comment")); |
| 184 | std::unique_ptr<Value> bar_original = ResourceUtils::TryParseBool("true"); |
| 185 | |
| 186 | std::unique_ptr<Value> foo_overlay = ResourceUtils::TryParseBool("false"); |
| 187 | foo_overlay->SetComment(android::StringPiece("Overlay foo comment")); |
| 188 | std::unique_ptr<Value> bar_overlay = ResourceUtils::TryParseBool("false"); |
| 189 | bar_overlay->SetComment(android::StringPiece("Overlay bar comment")); |
| 190 | std::unique_ptr<Value> baz_overlay = ResourceUtils::TryParseBool("false"); |
| 191 | baz_overlay->SetComment(android::StringPiece("Overlay baz comment")); |
| 192 | |
| 193 | std::unique_ptr<ResourceTable> base = |
| 194 | test::ResourceTableBuilder() |
| 195 | .SetPackageId("", 0x00) |
| 196 | .AddValue("bool/foo", std::move(foo_original)) |
| 197 | .AddValue("bool/bar", std::move(bar_original)) |
| 198 | .Build(); |
| 199 | |
| 200 | std::unique_ptr<ResourceTable> overlay = |
| 201 | test::ResourceTableBuilder() |
| 202 | .SetPackageId("", 0x00) |
| 203 | .AddValue("bool/foo", std::move(foo_overlay)) |
| 204 | .AddValue("bool/bar", std::move(bar_overlay)) |
| 205 | .AddValue("bool/baz", std::move(baz_overlay)) |
| 206 | .Build(); |
| 207 | |
| 208 | ResourceTable final_table; |
| 209 | TableMergerOptions options; |
| 210 | options.auto_add_overlay = true; |
| 211 | TableMerger merger(context_.get(), &final_table, options); |
| 212 | |
| 213 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 214 | ASSERT_TRUE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
| 215 | |
| 216 | BinaryPrimitive* foo = test::GetValue<BinaryPrimitive>(&final_table, "com.app.a:bool/foo"); |
| 217 | EXPECT_THAT(foo, Pointee(Property(&BinaryPrimitive::GetComment, StrEq("Original foo comment")))); |
| 218 | BinaryPrimitive* bar = test::GetValue<BinaryPrimitive>(&final_table, "com.app.a:bool/bar"); |
| 219 | EXPECT_THAT(bar, Pointee(Property(&BinaryPrimitive::GetComment, StrEq("")))); |
| 220 | BinaryPrimitive* baz = test::GetValue<BinaryPrimitive>(&final_table, "com.app.a:bool/baz"); |
| 221 | EXPECT_THAT(baz, Pointee(Property(&BinaryPrimitive::GetComment, StrEq("Overlay baz comment")))); |
| 222 | } |
| 223 | |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 224 | TEST_F(TableMergerTest, OverrideSameResourceIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 225 | std::unique_ptr<ResourceTable> base = |
| 226 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 227 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 228 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 229 | .Build(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 230 | std::unique_ptr<ResourceTable> overlay = |
| 231 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 232 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 233 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 234 | .Build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 235 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 236 | ResourceTable final_table; |
| 237 | TableMergerOptions options; |
| 238 | options.auto_add_overlay = false; |
| 239 | TableMerger merger(context_.get(), &final_table, options); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 240 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 241 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 242 | ASSERT_TRUE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 243 | } |
| 244 | |
| 245 | TEST_F(TableMergerTest, FailToOverrideConflictingTypeIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 246 | std::unique_ptr<ResourceTable> base = |
| 247 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 248 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 249 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 250 | .Build(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 251 | std::unique_ptr<ResourceTable> overlay = |
| 252 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 253 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 254 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x02, 0x0001), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 255 | .Build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 256 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 257 | ResourceTable final_table; |
| 258 | TableMergerOptions options; |
| 259 | options.auto_add_overlay = false; |
| 260 | TableMerger merger(context_.get(), &final_table, options); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 261 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 262 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 263 | ASSERT_FALSE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 264 | } |
| 265 | |
| 266 | TEST_F(TableMergerTest, FailToOverrideConflictingEntryIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 267 | std::unique_ptr<ResourceTable> base = |
| 268 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 269 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 270 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 271 | .Build(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 272 | std::unique_ptr<ResourceTable> overlay = |
| 273 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 274 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 275 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0002), Visibility::Level::kPublic) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 276 | .Build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 277 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 278 | ResourceTable final_table; |
| 279 | TableMergerOptions options; |
| 280 | options.auto_add_overlay = false; |
| 281 | TableMerger merger(context_.get(), &final_table, options); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 282 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 283 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 284 | ASSERT_FALSE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 285 | } |
| 286 | |
Izabela Orlowska | d51efe8 | 2018-04-24 18:18:29 +0100 | [diff] [blame] | 287 | TEST_F(TableMergerTest, FailConflictingVisibility) { |
| 288 | std::unique_ptr<ResourceTable> base = |
| 289 | test::ResourceTableBuilder() |
| 290 | .SetPackageId("", 0x7f) |
| 291 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPublic) |
| 292 | .Build(); |
| 293 | std::unique_ptr<ResourceTable> overlay = |
| 294 | test::ResourceTableBuilder() |
| 295 | .SetPackageId("", 0x7f) |
| 296 | .SetSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), Visibility::Level::kPrivate) |
| 297 | .Build(); |
| 298 | |
| 299 | // It should fail if the "--strict-visibility" flag is set. |
| 300 | ResourceTable final_table; |
| 301 | TableMergerOptions options; |
| 302 | options.auto_add_overlay = false; |
| 303 | options.strict_visibility = true; |
| 304 | TableMerger merger(context_.get(), &final_table, options); |
| 305 | |
| 306 | ASSERT_TRUE(merger.Merge({}, base.get(), false /*overlay*/)); |
| 307 | ASSERT_FALSE(merger.Merge({}, overlay.get(), true /*overlay*/)); |
| 308 | |
| 309 | // But it should still pass if the flag is not set. |
| 310 | ResourceTable final_table2; |
| 311 | options.strict_visibility = false; |
| 312 | TableMerger merger2(context_.get(), &final_table2, options); |
| 313 | |
| 314 | ASSERT_TRUE(merger2.Merge({}, base.get(), false /*overlay*/)); |
| 315 | ASSERT_TRUE(merger2.Merge({}, overlay.get(), true /*overlay*/)); |
| 316 | } |
| 317 | |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 318 | TEST_F(TableMergerTest, MergeAddResourceFromOverlay) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 319 | std::unique_ptr<ResourceTable> table_a = |
Adam Lesinski | 4488f1c | 2017-05-26 17:33:38 -0700 | [diff] [blame] | 320 | test::ResourceTableBuilder().SetPackageId("", 0x7f).Build(); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 321 | std::unique_ptr<ResourceTable> table_b = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 322 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 323 | .SetPackageId("", 0x7f) |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 324 | .SetSymbolState("bool/foo", {}, Visibility::Level::kUndefined, true /*allow new overlay*/) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 325 | .AddValue("bool/foo", ResourceUtils::TryParseBool("true")) |
| 326 | .Build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 327 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 328 | ResourceTable final_table; |
Adam Lesinski | 4488f1c | 2017-05-26 17:33:38 -0700 | [diff] [blame] | 329 | TableMergerOptions options; |
| 330 | options.auto_add_overlay = false; |
| 331 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 332 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 333 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 334 | ASSERT_TRUE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 335 | } |
| 336 | |
| 337 | TEST_F(TableMergerTest, MergeAddResourceFromOverlayWithAutoAddOverlay) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 338 | std::unique_ptr<ResourceTable> table_a = |
| 339 | test::ResourceTableBuilder().SetPackageId("", 0x7f).Build(); |
| 340 | std::unique_ptr<ResourceTable> table_b = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 341 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 342 | .SetPackageId("", 0x7f) |
| 343 | .AddValue("bool/foo", ResourceUtils::TryParseBool("true")) |
| 344 | .Build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 345 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 346 | ResourceTable final_table; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 347 | TableMergerOptions options; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 348 | options.auto_add_overlay = true; |
| 349 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 350 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 351 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 352 | ASSERT_TRUE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 353 | } |
| 354 | |
| 355 | TEST_F(TableMergerTest, FailToMergeNewResourceWithoutAutoAddOverlay) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 356 | std::unique_ptr<ResourceTable> table_a = |
| 357 | test::ResourceTableBuilder().SetPackageId("", 0x7f).Build(); |
| 358 | std::unique_ptr<ResourceTable> table_b = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 359 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 360 | .SetPackageId("", 0x7f) |
| 361 | .AddValue("bool/foo", ResourceUtils::TryParseBool("true")) |
| 362 | .Build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 363 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 364 | ResourceTable final_table; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 365 | TableMergerOptions options; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 366 | options.auto_add_overlay = false; |
| 367 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 368 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 369 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 370 | ASSERT_FALSE(merger.Merge({}, table_b.get(), true /*overlay*/)); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 371 | } |
| 372 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 373 | TEST_F(TableMergerTest, OverlaidStyleablesAndStylesShouldBeMerged) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 374 | std::unique_ptr<ResourceTable> table_a = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 375 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 376 | .SetPackageId("com.app.a", 0x7f) |
| 377 | .AddValue("com.app.a:styleable/Foo", |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 378 | test::StyleableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 379 | .AddItem("com.app.a:attr/bar") |
| 380 | .AddItem("com.app.a:attr/foo", ResourceId(0x01010000)) |
| 381 | .Build()) |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 382 | .AddValue("com.app.a:style/Theme", |
| 383 | test::StyleBuilder() |
| 384 | .SetParent("com.app.a:style/Parent") |
| 385 | .AddItem("com.app.a:attr/bar", util::make_unique<Id>()) |
| 386 | .AddItem("com.app.a:attr/foo", ResourceUtils::MakeBool(false)) |
| 387 | .Build()) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 388 | .Build(); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 389 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 390 | std::unique_ptr<ResourceTable> table_b = |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 391 | test::ResourceTableBuilder() |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 392 | .SetPackageId("com.app.a", 0x7f) |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 393 | .AddValue("com.app.a:styleable/Foo", test::StyleableBuilder() |
| 394 | .AddItem("com.app.a:attr/bat") |
| 395 | .AddItem("com.app.a:attr/foo") |
| 396 | .Build()) |
| 397 | .AddValue("com.app.a:style/Theme", |
| 398 | test::StyleBuilder() |
| 399 | .SetParent("com.app.a:style/OverlayParent") |
| 400 | .AddItem("com.app.a:attr/bat", util::make_unique<Id>()) |
| 401 | .AddItem("com.app.a:attr/foo", ResourceId(0x01010000), |
| 402 | ResourceUtils::MakeBool(true)) |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 403 | .Build()) |
| 404 | .Build(); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 405 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 406 | ResourceTable final_table; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 407 | TableMergerOptions options; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 408 | options.auto_add_overlay = true; |
| 409 | TableMerger merger(context_.get(), &final_table, options); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 410 | |
Adam Lesinski | 0045116 | 2017-10-03 07:44:08 -0700 | [diff] [blame] | 411 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 412 | ASSERT_TRUE(merger.Merge({}, table_b.get(), true /*overlay*/)); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 413 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 414 | Styleable* styleable = test::GetValue<Styleable>(&final_table, "com.app.a:styleable/Foo"); |
| 415 | ASSERT_THAT(styleable, NotNull()); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 416 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 417 | std::vector<Reference> expected_refs = { |
| 418 | Reference(test::ParseNameOrDie("com.app.a:attr/bar")), |
| 419 | Reference(test::ParseNameOrDie("com.app.a:attr/bat")), |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 420 | Reference(test::ParseNameOrDie("com.app.a:attr/foo"), ResourceId(0x01010000)), |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 421 | }; |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 422 | EXPECT_THAT(styleable->entries, UnorderedElementsAreArray(expected_refs)); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 423 | |
Adam Lesinski | 5924d8c | 2017-05-30 15:15:58 -0700 | [diff] [blame] | 424 | Style* style = test::GetValue<Style>(&final_table, "com.app.a:style/Theme"); |
| 425 | ASSERT_THAT(style, NotNull()); |
| 426 | |
| 427 | std::vector<Reference> extracted_refs; |
| 428 | for (const auto& entry : style->entries) { |
| 429 | extracted_refs.push_back(entry.key); |
| 430 | } |
| 431 | EXPECT_THAT(extracted_refs, UnorderedElementsAreArray(expected_refs)); |
| 432 | |
| 433 | const auto expected = ResourceUtils::MakeBool(true); |
| 434 | EXPECT_THAT(style->entries, Contains(Field(&Style::Entry::value, Pointee(ValueEq(*expected))))); |
| 435 | EXPECT_THAT(style->parent, |
| 436 | Eq(make_value(Reference(test::ParseNameOrDie("com.app.a:style/OverlayParent"))))); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 437 | } |
| 438 | |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 439 | TEST_F(TableMergerTest, SetOverlayable) { |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 440 | auto overlayable = std::make_shared<Overlayable>("CustomizableResources", |
| 441 | "overlay://customization"); |
| 442 | OverlayableItem overlayable_item(overlayable); |
| 443 | overlayable_item.policies |= OverlayableItem::Policy::kProduct; |
| 444 | overlayable_item.policies |= OverlayableItem::Policy::kVendor; |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 445 | |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 446 | std::unique_ptr<ResourceTable> table_a = |
| 447 | test::ResourceTableBuilder() |
| 448 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 449 | .SetOverlayable("bool/foo", overlayable_item) |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 450 | .Build(); |
| 451 | |
| 452 | std::unique_ptr<ResourceTable> table_b = |
| 453 | test::ResourceTableBuilder() |
| 454 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 455 | .AddSimple("bool/foo") |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 456 | .Build(); |
| 457 | |
| 458 | ResourceTable final_table; |
| 459 | TableMergerOptions options; |
| 460 | options.auto_add_overlay = true; |
| 461 | TableMerger merger(context_.get(), &final_table, options); |
| 462 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 463 | ASSERT_TRUE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
| 464 | |
| 465 | const ResourceName name = test::ParseNameOrDie("com.app.a:bool/foo"); |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 466 | Maybe<ResourceTable::SearchResult> search_result = final_table.FindResource(name); |
| 467 | ASSERT_TRUE(search_result); |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 468 | ASSERT_TRUE(search_result.value().entry->overlayable_item); |
| 469 | OverlayableItem& result_overlayable_item = search_result.value().entry->overlayable_item.value(); |
| 470 | EXPECT_THAT(result_overlayable_item.overlayable->name, Eq("CustomizableResources")); |
| 471 | EXPECT_THAT(result_overlayable_item.overlayable->actor, Eq("overlay://customization")); |
| 472 | EXPECT_THAT(result_overlayable_item.policies, Eq(OverlayableItem::Policy::kProduct |
| 473 | | OverlayableItem::Policy::kVendor)); |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 474 | } |
| 475 | |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 476 | TEST_F(TableMergerTest, SetOverlayableLater) { |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 477 | auto overlayable = std::make_shared<Overlayable>("CustomizableResources", |
| 478 | "overlay://customization"); |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 479 | std::unique_ptr<ResourceTable> table_a = |
| 480 | test::ResourceTableBuilder() |
| 481 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 482 | .AddSimple("bool/foo") |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 483 | .Build(); |
| 484 | |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 485 | OverlayableItem overlayable_item(overlayable); |
| 486 | overlayable_item.policies |= OverlayableItem::Policy::kPublic; |
Ryan Mitchell | 02d9c1e | 2019-01-11 16:36:58 -0800 | [diff] [blame] | 487 | overlayable_item.policies |= OverlayableItem::Policy::kSystem; |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 488 | std::unique_ptr<ResourceTable> table_b = |
| 489 | test::ResourceTableBuilder() |
| 490 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 491 | .SetOverlayable("bool/foo", overlayable_item) |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 492 | .Build(); |
| 493 | |
| 494 | ResourceTable final_table; |
| 495 | TableMergerOptions options; |
| 496 | options.auto_add_overlay = true; |
| 497 | TableMerger merger(context_.get(), &final_table, options); |
| 498 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 499 | ASSERT_TRUE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
| 500 | |
| 501 | const ResourceName name = test::ParseNameOrDie("com.app.a:bool/foo"); |
| 502 | Maybe<ResourceTable::SearchResult> search_result = final_table.FindResource(name); |
| 503 | ASSERT_TRUE(search_result); |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 504 | ASSERT_TRUE(search_result.value().entry->overlayable_item); |
| 505 | OverlayableItem& result_overlayable_item = search_result.value().entry->overlayable_item.value(); |
| 506 | EXPECT_THAT(result_overlayable_item.overlayable->name, Eq("CustomizableResources")); |
| 507 | EXPECT_THAT(result_overlayable_item.overlayable->actor, Eq("overlay://customization")); |
| 508 | EXPECT_THAT(result_overlayable_item.policies, Eq(OverlayableItem::Policy::kPublic |
Ryan Mitchell | 02d9c1e | 2019-01-11 16:36:58 -0800 | [diff] [blame] | 509 | | OverlayableItem::Policy::kSystem)); |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 510 | } |
| 511 | |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 512 | TEST_F(TableMergerTest, SameResourceDifferentNameFail) { |
| 513 | auto overlayable_first = std::make_shared<Overlayable>("CustomizableResources", |
| 514 | "overlay://customization"); |
| 515 | OverlayableItem overlayable_item_first(overlayable_first); |
| 516 | overlayable_item_first.policies |= OverlayableItem::Policy::kProduct; |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 517 | std::unique_ptr<ResourceTable> table_a = |
| 518 | test::ResourceTableBuilder() |
| 519 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 520 | .SetOverlayable("bool/foo", overlayable_item_first) |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 521 | .Build(); |
| 522 | |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 523 | auto overlayable_second = std::make_shared<Overlayable>("ThemeResources", |
| 524 | "overlay://theme"); |
| 525 | OverlayableItem overlayable_item_second(overlayable_second); |
| 526 | overlayable_item_second.policies |= OverlayableItem::Policy::kProduct; |
Ryan Mitchell | 1bb1fe0 | 2018-11-16 11:21:41 -0800 | [diff] [blame] | 527 | std::unique_ptr<ResourceTable> table_b = |
| 528 | test::ResourceTableBuilder() |
| 529 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 530 | .SetOverlayable("bool/foo", overlayable_item_second) |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 531 | .Build(); |
| 532 | |
| 533 | ResourceTable final_table; |
| 534 | TableMergerOptions options; |
| 535 | options.auto_add_overlay = true; |
| 536 | TableMerger merger(context_.get(), &final_table, options); |
| 537 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 538 | ASSERT_FALSE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
| 539 | } |
| 540 | |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 541 | TEST_F(TableMergerTest, SameResourceSameNameFail) { |
| 542 | auto overlayable = std::make_shared<Overlayable>("CustomizableResources", |
| 543 | "overlay://customization"); |
| 544 | |
| 545 | OverlayableItem overlayable_item_first(overlayable); |
| 546 | overlayable_item_first.policies |= OverlayableItem::Policy::kProduct; |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 547 | std::unique_ptr<ResourceTable> table_a = |
| 548 | test::ResourceTableBuilder() |
| 549 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 550 | .SetOverlayable("bool/foo", overlayable_item_first) |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 551 | .Build(); |
| 552 | |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 553 | OverlayableItem overlayable_item_second(overlayable); |
| 554 | overlayable_item_second.policies |= OverlayableItem::Policy::kSystem; |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 555 | std::unique_ptr<ResourceTable> table_b = |
| 556 | test::ResourceTableBuilder() |
| 557 | .SetPackageId("com.app.a", 0x7f) |
Ryan Mitchell | 54237ff | 2018-12-13 15:44:29 -0800 | [diff] [blame] | 558 | .SetOverlayable("bool/foo", overlayable_item_second) |
Ryan Mitchell | e4e989c | 2018-10-29 02:21:50 -0700 | [diff] [blame] | 559 | .Build(); |
| 560 | |
| 561 | ResourceTable final_table; |
| 562 | TableMergerOptions options; |
| 563 | options.auto_add_overlay = true; |
| 564 | TableMerger merger(context_.get(), &final_table, options); |
| 565 | ASSERT_TRUE(merger.Merge({}, table_a.get(), false /*overlay*/)); |
| 566 | ASSERT_FALSE(merger.Merge({}, table_b.get(), false /*overlay*/)); |
| 567 | } |
| 568 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 569 | } // namespace aapt |