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 | 6a00817 | 2016-02-02 17:02:58 -0800 | [diff] [blame] | 18 | #include "filter/ConfigFilter.h" |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 19 | #include "io/FileSystem.h" |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 20 | #include "test/Builders.h" |
| 21 | #include "test/Context.h" |
| 22 | |
| 23 | #include <gtest/gtest.h> |
| 24 | |
| 25 | namespace aapt { |
| 26 | |
| 27 | struct TableMergerTest : public ::testing::Test { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 28 | std::unique_ptr<IAaptContext> mContext; |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 29 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 30 | void SetUp() override { |
| 31 | mContext = |
| 32 | test::ContextBuilder() |
| 33 | // We are compiling this package. |
| 34 | .setCompilationPackage("com.app.a") |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 35 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 36 | // Merge all packages that have this package ID. |
| 37 | .setPackageId(0x7f) |
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 | // Mangle all packages that do not have this package name. |
| 40 | .setNameManglerPolicy(NameManglerPolicy{"com.app.a", {"com.app.b"}}) |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 41 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 42 | .build(); |
| 43 | } |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 44 | }; |
| 45 | |
| 46 | TEST_F(TableMergerTest, SimpleMerge) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 47 | std::unique_ptr<ResourceTable> tableA = |
| 48 | test::ResourceTableBuilder() |
| 49 | .setPackageId("com.app.a", 0x7f) |
| 50 | .addReference("com.app.a:id/foo", "com.app.a:id/bar") |
| 51 | .addReference("com.app.a:id/bar", "com.app.b:id/foo") |
| 52 | .addValue( |
| 53 | "com.app.a:styleable/view", |
| 54 | test::StyleableBuilder().addItem("com.app.b:id/foo").build()) |
| 55 | .build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 56 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 57 | std::unique_ptr<ResourceTable> tableB = test::ResourceTableBuilder() |
| 58 | .setPackageId("com.app.b", 0x7f) |
| 59 | .addSimple("com.app.b:id/foo") |
| 60 | .build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 61 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 62 | ResourceTable finalTable; |
| 63 | TableMerger merger(mContext.get(), &finalTable, TableMergerOptions{}); |
| 64 | io::FileCollection collection; |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 65 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 66 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 67 | ASSERT_TRUE( |
| 68 | merger.mergeAndMangle({}, "com.app.b", tableB.get(), &collection)); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 69 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 70 | EXPECT_TRUE(merger.getMergedPackages().count("com.app.b") != 0); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 71 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 72 | // Entries from com.app.a should not be mangled. |
| 73 | AAPT_EXPECT_TRUE( |
| 74 | finalTable.findResource(test::parseNameOrDie("com.app.a:id/foo"))); |
| 75 | AAPT_EXPECT_TRUE( |
| 76 | finalTable.findResource(test::parseNameOrDie("com.app.a:id/bar"))); |
| 77 | AAPT_EXPECT_TRUE(finalTable.findResource( |
| 78 | test::parseNameOrDie("com.app.a:styleable/view"))); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 79 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 80 | // The unmangled name should not be present. |
| 81 | AAPT_EXPECT_FALSE( |
| 82 | finalTable.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. |
| 85 | AAPT_EXPECT_TRUE(finalTable.findResource( |
| 86 | 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 | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 90 | ResourceTable finalTable; |
| 91 | TableMergerOptions options; |
| 92 | options.autoAddOverlay = false; |
| 93 | TableMerger merger(mContext.get(), &finalTable, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 94 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 95 | ResourceFile fileDesc; |
| 96 | fileDesc.config = test::parseConfigOrDie("hdpi-v4"); |
| 97 | fileDesc.name = test::parseNameOrDie("layout/main"); |
| 98 | fileDesc.source = Source("res/layout-hdpi/main.xml"); |
| 99 | test::TestFile testFile("path/to/res/layout-hdpi/main.xml.flat"); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 100 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 101 | ASSERT_TRUE(merger.mergeFile(fileDesc, &testFile)); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 102 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 103 | FileReference* file = test::getValueForConfig<FileReference>( |
| 104 | &finalTable, "com.app.a:layout/main", test::parseConfigOrDie("hdpi-v4")); |
| 105 | ASSERT_NE(nullptr, file); |
| 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 | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 110 | ResourceTable finalTable; |
| 111 | TableMergerOptions tableMergerOptions; |
| 112 | tableMergerOptions.autoAddOverlay = false; |
| 113 | TableMerger merger(mContext.get(), &finalTable, tableMergerOptions); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 114 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 115 | ResourceFile fileDesc; |
| 116 | fileDesc.name = test::parseNameOrDie("xml/foo"); |
| 117 | test::TestFile fileA("path/to/fileA.xml.flat"); |
| 118 | test::TestFile fileB("path/to/fileB.xml.flat"); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 119 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 120 | ASSERT_TRUE(merger.mergeFile(fileDesc, &fileA)); |
| 121 | ASSERT_TRUE(merger.mergeFileOverlay(fileDesc, &fileB)); |
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 | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 125 | std::unique_ptr<ResourceTable> tableA = |
| 126 | test::ResourceTableBuilder() |
| 127 | .setPackageId("com.app.a", 0x7f) |
| 128 | .addFileReference("com.app.a:xml/file", "res/xml/file.xml") |
| 129 | .build(); |
| 130 | std::unique_ptr<ResourceTable> tableB = |
| 131 | test::ResourceTableBuilder() |
| 132 | .setPackageId("com.app.b", 0x7f) |
| 133 | .addFileReference("com.app.b:xml/file", "res/xml/file.xml") |
| 134 | .build(); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 135 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 136 | ResourceTable finalTable; |
| 137 | TableMerger merger(mContext.get(), &finalTable, TableMergerOptions{}); |
| 138 | io::FileCollection collection; |
| 139 | collection.insertFile("res/xml/file.xml"); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 140 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 141 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 142 | ASSERT_TRUE( |
| 143 | merger.mergeAndMangle({}, "com.app.b", tableB.get(), &collection)); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 144 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 145 | FileReference* f = |
| 146 | test::getValue<FileReference>(&finalTable, "com.app.a:xml/file"); |
| 147 | ASSERT_NE(f, nullptr); |
| 148 | EXPECT_EQ(std::string("res/xml/file.xml"), *f->path); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 149 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 150 | f = test::getValue<FileReference>(&finalTable, |
| 151 | "com.app.a:xml/com.app.b$file"); |
| 152 | ASSERT_NE(f, nullptr); |
| 153 | EXPECT_EQ(std::string("res/xml/com.app.b$file.xml"), *f->path); |
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() |
| 159 | .setPackageId("", 0x00) |
| 160 | .addValue("bool/foo", ResourceUtils::tryParseBool("true")) |
| 161 | .build(); |
| 162 | std::unique_ptr<ResourceTable> overlay = |
| 163 | test::ResourceTableBuilder() |
| 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 | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 168 | ResourceTable finalTable; |
| 169 | TableMergerOptions tableMergerOptions; |
| 170 | tableMergerOptions.autoAddOverlay = false; |
| 171 | TableMerger merger(mContext.get(), &finalTable, tableMergerOptions); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 172 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 173 | ASSERT_TRUE(merger.merge({}, base.get())); |
| 174 | ASSERT_TRUE(merger.mergeOverlay({}, overlay.get())); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 175 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 176 | BinaryPrimitive* foo = |
| 177 | test::getValue<BinaryPrimitive>(&finalTable, "com.app.a:bool/foo"); |
| 178 | ASSERT_NE(nullptr, foo); |
| 179 | EXPECT_EQ(0x0u, foo->value.data); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 180 | } |
| 181 | |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 182 | TEST_F(TableMergerTest, OverrideSameResourceIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 183 | std::unique_ptr<ResourceTable> base = |
| 184 | test::ResourceTableBuilder() |
| 185 | .setPackageId("", 0x7f) |
| 186 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), |
| 187 | SymbolState::kPublic) |
| 188 | .build(); |
| 189 | std::unique_ptr<ResourceTable> overlay = |
| 190 | test::ResourceTableBuilder() |
| 191 | .setPackageId("", 0x7f) |
| 192 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), |
| 193 | SymbolState::kPublic) |
| 194 | .build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 195 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 196 | ResourceTable finalTable; |
| 197 | TableMergerOptions tableMergerOptions; |
| 198 | tableMergerOptions.autoAddOverlay = false; |
| 199 | TableMerger merger(mContext.get(), &finalTable, tableMergerOptions); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 200 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 201 | ASSERT_TRUE(merger.merge({}, base.get())); |
| 202 | ASSERT_TRUE(merger.mergeOverlay({}, overlay.get())); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 203 | } |
| 204 | |
| 205 | TEST_F(TableMergerTest, FailToOverrideConflictingTypeIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 206 | std::unique_ptr<ResourceTable> base = |
| 207 | test::ResourceTableBuilder() |
| 208 | .setPackageId("", 0x7f) |
| 209 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), |
| 210 | SymbolState::kPublic) |
| 211 | .build(); |
| 212 | std::unique_ptr<ResourceTable> overlay = |
| 213 | test::ResourceTableBuilder() |
| 214 | .setPackageId("", 0x7f) |
| 215 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x02, 0x0001), |
| 216 | SymbolState::kPublic) |
| 217 | .build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 218 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 219 | ResourceTable finalTable; |
| 220 | TableMergerOptions tableMergerOptions; |
| 221 | tableMergerOptions.autoAddOverlay = false; |
| 222 | TableMerger merger(mContext.get(), &finalTable, tableMergerOptions); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 223 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 224 | ASSERT_TRUE(merger.merge({}, base.get())); |
| 225 | ASSERT_FALSE(merger.mergeOverlay({}, overlay.get())); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 226 | } |
| 227 | |
| 228 | TEST_F(TableMergerTest, FailToOverrideConflictingEntryIdsWithOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 229 | std::unique_ptr<ResourceTable> base = |
| 230 | test::ResourceTableBuilder() |
| 231 | .setPackageId("", 0x7f) |
| 232 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0001), |
| 233 | SymbolState::kPublic) |
| 234 | .build(); |
| 235 | std::unique_ptr<ResourceTable> overlay = |
| 236 | test::ResourceTableBuilder() |
| 237 | .setPackageId("", 0x7f) |
| 238 | .setSymbolState("bool/foo", ResourceId(0x7f, 0x01, 0x0002), |
| 239 | SymbolState::kPublic) |
| 240 | .build(); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 241 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 242 | ResourceTable finalTable; |
| 243 | TableMergerOptions tableMergerOptions; |
| 244 | tableMergerOptions.autoAddOverlay = false; |
| 245 | TableMerger merger(mContext.get(), &finalTable, tableMergerOptions); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 246 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 247 | ASSERT_TRUE(merger.merge({}, base.get())); |
| 248 | ASSERT_FALSE(merger.mergeOverlay({}, overlay.get())); |
Alexandria Cornwall | 6a1f8db | 2016-08-11 13:49:44 -0700 | [diff] [blame] | 249 | } |
| 250 | |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 251 | TEST_F(TableMergerTest, MergeAddResourceFromOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 252 | std::unique_ptr<ResourceTable> tableA = |
| 253 | test::ResourceTableBuilder() |
| 254 | .setPackageId("", 0x7f) |
| 255 | .setSymbolState("bool/foo", {}, SymbolState::kUndefined) |
| 256 | .build(); |
| 257 | std::unique_ptr<ResourceTable> tableB = |
| 258 | test::ResourceTableBuilder() |
| 259 | .setPackageId("", 0x7f) |
| 260 | .addValue("bool/foo", ResourceUtils::tryParseBool("true")) |
| 261 | .build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 262 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 263 | ResourceTable finalTable; |
| 264 | TableMerger merger(mContext.get(), &finalTable, TableMergerOptions{}); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 265 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 266 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 267 | ASSERT_TRUE(merger.mergeOverlay({}, tableB.get())); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 268 | } |
| 269 | |
| 270 | TEST_F(TableMergerTest, MergeAddResourceFromOverlayWithAutoAddOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 271 | std::unique_ptr<ResourceTable> tableA = |
| 272 | test::ResourceTableBuilder().setPackageId("", 0x7f).build(); |
| 273 | std::unique_ptr<ResourceTable> tableB = |
| 274 | test::ResourceTableBuilder() |
| 275 | .setPackageId("", 0x7f) |
| 276 | .addValue("bool/foo", ResourceUtils::tryParseBool("true")) |
| 277 | .build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 278 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 279 | ResourceTable finalTable; |
| 280 | TableMergerOptions options; |
| 281 | options.autoAddOverlay = true; |
| 282 | TableMerger merger(mContext.get(), &finalTable, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 283 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 284 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 285 | ASSERT_TRUE(merger.mergeOverlay({}, tableB.get())); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 286 | } |
| 287 | |
| 288 | TEST_F(TableMergerTest, FailToMergeNewResourceWithoutAutoAddOverlay) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 289 | std::unique_ptr<ResourceTable> tableA = |
| 290 | test::ResourceTableBuilder().setPackageId("", 0x7f).build(); |
| 291 | std::unique_ptr<ResourceTable> tableB = |
| 292 | test::ResourceTableBuilder() |
| 293 | .setPackageId("", 0x7f) |
| 294 | .addValue("bool/foo", ResourceUtils::tryParseBool("true")) |
| 295 | .build(); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 296 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 297 | ResourceTable finalTable; |
| 298 | TableMergerOptions options; |
| 299 | options.autoAddOverlay = false; |
| 300 | TableMerger merger(mContext.get(), &finalTable, options); |
Adam Lesinski | a6fe345 | 2015-12-09 15:20:52 -0800 | [diff] [blame] | 301 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 302 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 303 | ASSERT_FALSE(merger.mergeOverlay({}, tableB.get())); |
Adam Lesinski | 1ab598f | 2015-08-14 14:26:04 -0700 | [diff] [blame] | 304 | } |
| 305 | |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 306 | TEST_F(TableMergerTest, OverlaidStyleablesShouldBeMerged) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 307 | std::unique_ptr<ResourceTable> tableA = |
| 308 | test::ResourceTableBuilder() |
| 309 | .setPackageId("com.app.a", 0x7f) |
| 310 | .addValue("com.app.a:styleable/Foo", |
| 311 | test::StyleableBuilder() |
| 312 | .addItem("com.app.a:attr/bar") |
| 313 | .addItem("com.app.a:attr/foo", ResourceId(0x01010000)) |
| 314 | .build()) |
| 315 | .build(); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 316 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 317 | std::unique_ptr<ResourceTable> tableB = |
| 318 | test::ResourceTableBuilder() |
| 319 | .setPackageId("com.app.a", 0x7f) |
| 320 | .addValue("com.app.a:styleable/Foo", |
| 321 | test::StyleableBuilder() |
| 322 | .addItem("com.app.a:attr/bat") |
| 323 | .addItem("com.app.a:attr/foo") |
| 324 | .build()) |
| 325 | .build(); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 326 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 327 | ResourceTable finalTable; |
| 328 | TableMergerOptions options; |
| 329 | options.autoAddOverlay = true; |
| 330 | TableMerger merger(mContext.get(), &finalTable, options); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 331 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 332 | ASSERT_TRUE(merger.merge({}, tableA.get())); |
| 333 | ASSERT_TRUE(merger.mergeOverlay({}, tableB.get())); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 334 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 335 | Debug::printTable(&finalTable, {}); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 336 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 337 | Styleable* styleable = |
| 338 | test::getValue<Styleable>(&finalTable, "com.app.a:styleable/Foo"); |
| 339 | ASSERT_NE(nullptr, styleable); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 340 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 341 | std::vector<Reference> expectedRefs = { |
| 342 | Reference(test::parseNameOrDie("com.app.a:attr/bar")), |
| 343 | Reference(test::parseNameOrDie("com.app.a:attr/bat")), |
| 344 | Reference(test::parseNameOrDie("com.app.a:attr/foo"), |
| 345 | ResourceId(0x01010000)), |
| 346 | }; |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 347 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 348 | EXPECT_EQ(expectedRefs, styleable->entries); |
Adam Lesinski | 5c3464c | 2016-08-24 16:03:48 -0700 | [diff] [blame] | 349 | } |
| 350 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame^] | 351 | } // namespace aapt |