For legacy reasons, we kept around the use of UTF-16 internally in AAPT2. We don't need this and this CL removes all instances of std::u16string and StringPiece16. The only places still needed are when interacting with the ResTable APIs that only operate in UTF16. Change-Id: I492475b84bb9014fa13bf992cff447ee7a5fe588
76 lines
2.7 KiB
C++
76 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "link/Linkers.h"
|
|
#include "test/Test.h"
|
|
|
|
namespace aapt {
|
|
|
|
TEST(PrivateAttributeMoverTest, MovePrivateAttributes) {
|
|
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
|
|
|
|
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
|
|
.addSimple("@android:attr/publicA")
|
|
.addSimple("@android:attr/privateA")
|
|
.addSimple("@android:attr/publicB")
|
|
.addSimple("@android:attr/privateB")
|
|
.setSymbolState("@android:attr/publicA", ResourceId(0x01010000), SymbolState::kPublic)
|
|
.setSymbolState("@android:attr/publicB", ResourceId(0x01010000), SymbolState::kPublic)
|
|
.build();
|
|
|
|
PrivateAttributeMover mover;
|
|
ASSERT_TRUE(mover.consume(context.get(), table.get()));
|
|
|
|
ResourceTablePackage* package = table->findPackage("android");
|
|
ASSERT_NE(package, nullptr);
|
|
|
|
ResourceTableType* type = package->findType(ResourceType::kAttr);
|
|
ASSERT_NE(type, nullptr);
|
|
ASSERT_EQ(type->entries.size(), 2u);
|
|
EXPECT_NE(type->findEntry("publicA"), nullptr);
|
|
EXPECT_NE(type->findEntry("publicB"), nullptr);
|
|
|
|
type = package->findType(ResourceType::kAttrPrivate);
|
|
ASSERT_NE(type, nullptr);
|
|
ASSERT_EQ(type->entries.size(), 2u);
|
|
EXPECT_NE(type->findEntry("privateA"), nullptr);
|
|
EXPECT_NE(type->findEntry("privateB"), nullptr);
|
|
}
|
|
|
|
TEST(PrivateAttributeMoverTest, LeavePrivateAttributesWhenNoPublicAttributesDefined) {
|
|
std::unique_ptr<IAaptContext> context = test::ContextBuilder().build();
|
|
|
|
std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder()
|
|
.addSimple("@android:attr/privateA")
|
|
.addSimple("@android:attr/privateB")
|
|
.build();
|
|
|
|
PrivateAttributeMover mover;
|
|
ASSERT_TRUE(mover.consume(context.get(), table.get()));
|
|
|
|
ResourceTablePackage* package = table->findPackage("android");
|
|
ASSERT_NE(package, nullptr);
|
|
|
|
ResourceTableType* type = package->findType(ResourceType::kAttr);
|
|
ASSERT_NE(type, nullptr);
|
|
ASSERT_EQ(type->entries.size(), 2u);
|
|
|
|
type = package->findType(ResourceType::kAttrPrivate);
|
|
ASSERT_EQ(type, nullptr);
|
|
}
|
|
|
|
} // namespace aapt
|