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