cb76d734fe
This change adds support for resources that have CDATA blocks within their values. The blocks should allow any character to occur without being escaped. It also should not effect the current state of quote processing. Bug: 80326349 Test: Created tests in aapt2_tests Change-Id: Ie1a00e50cffc877e2eb5f788f8d7a1bda839c0cf
283 lines
12 KiB
C++
283 lines
12 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 "ResourceUtils.h"
|
|
|
|
#include "Resource.h"
|
|
#include "test/Test.h"
|
|
|
|
using ::aapt::test::ValueEq;
|
|
using ::android::Res_value;
|
|
using ::android::ResTable_map;
|
|
using ::testing::Eq;
|
|
using ::testing::NotNull;
|
|
using ::testing::Pointee;
|
|
|
|
namespace aapt {
|
|
|
|
TEST(ResourceUtilsTest, ParseBool) {
|
|
EXPECT_THAT(ResourceUtils::ParseBool("true"), Eq(Maybe<bool>(true)));
|
|
EXPECT_THAT(ResourceUtils::ParseBool("TRUE"), Eq(Maybe<bool>(true)));
|
|
EXPECT_THAT(ResourceUtils::ParseBool("True"), Eq(Maybe<bool>(true)));
|
|
|
|
EXPECT_THAT(ResourceUtils::ParseBool("false"), Eq(Maybe<bool>(false)));
|
|
EXPECT_THAT(ResourceUtils::ParseBool("FALSE"), Eq(Maybe<bool>(false)));
|
|
EXPECT_THAT(ResourceUtils::ParseBool("False"), Eq(Maybe<bool>(false)));
|
|
|
|
EXPECT_THAT(ResourceUtils::ParseBool(" False\n "), Eq(Maybe<bool>(false)));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseResourceName) {
|
|
ResourceNameRef actual;
|
|
bool actual_priv = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseResourceName("android:color/foo", &actual, &actual_priv));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kColor, "foo")));
|
|
EXPECT_FALSE(actual_priv);
|
|
|
|
EXPECT_TRUE(ResourceUtils::ParseResourceName("color/foo", &actual, &actual_priv));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef({}, ResourceType::kColor, "foo")));
|
|
EXPECT_FALSE(actual_priv);
|
|
|
|
EXPECT_TRUE(ResourceUtils::ParseResourceName("*android:color/foo", &actual, &actual_priv));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kColor, "foo")));
|
|
EXPECT_TRUE(actual_priv);
|
|
|
|
EXPECT_FALSE(ResourceUtils::ParseResourceName(android::StringPiece(), &actual, &actual_priv));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseReferenceWithNoPackage) {
|
|
ResourceNameRef actual;
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseReference("@color/foo", &actual, &create, &private_ref));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef({}, ResourceType::kColor, "foo")));
|
|
EXPECT_FALSE(create);
|
|
EXPECT_FALSE(private_ref);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseReferenceWithPackage) {
|
|
ResourceNameRef actual;
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseReference("@android:color/foo", &actual, &create, &private_ref));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kColor, "foo")));
|
|
EXPECT_FALSE(create);
|
|
EXPECT_FALSE(private_ref);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseReferenceWithSurroundingWhitespace) {
|
|
ResourceNameRef actual;
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseReference("\t @android:color/foo\n \n\t", &actual, &create, &private_ref));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kColor, "foo")));
|
|
EXPECT_FALSE(create);
|
|
EXPECT_FALSE(private_ref);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseAutoCreateIdReference) {
|
|
ResourceNameRef actual;
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseReference("@+android:id/foo", &actual, &create, &private_ref));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kId, "foo")));
|
|
EXPECT_TRUE(create);
|
|
EXPECT_FALSE(private_ref);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParsePrivateReference) {
|
|
ResourceNameRef actual;
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
EXPECT_TRUE(ResourceUtils::ParseReference("@*android:id/foo", &actual, &create, &private_ref));
|
|
EXPECT_THAT(actual, Eq(ResourceNameRef("android", ResourceType::kId, "foo")));
|
|
EXPECT_FALSE(create);
|
|
EXPECT_TRUE(private_ref);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, FailToParseAutoCreateNonIdReference) {
|
|
bool create = false;
|
|
bool private_ref = false;
|
|
ResourceNameRef actual;
|
|
EXPECT_FALSE(ResourceUtils::ParseReference("@+android:color/foo", &actual, &create, &private_ref));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseAttributeReferences) {
|
|
EXPECT_TRUE(ResourceUtils::IsAttributeReference("?android"));
|
|
EXPECT_TRUE(ResourceUtils::IsAttributeReference("?android:foo"));
|
|
EXPECT_TRUE(ResourceUtils::IsAttributeReference("?attr/foo"));
|
|
EXPECT_TRUE(ResourceUtils::IsAttributeReference("?android:attr/foo"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, FailParseIncompleteReference) {
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?style/foo"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?android:style/foo"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?android:"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?android:attr/"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?:attr/"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?:attr/foo"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?:/"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?:/foo"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?attr/"));
|
|
EXPECT_FALSE(ResourceUtils::IsAttributeReference("?/foo"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseStyleParentReference) {
|
|
const ResourceName kAndroidStyleFooName("android", ResourceType::kStyle, "foo");
|
|
const ResourceName kStyleFooName({}, ResourceType::kStyle, "foo");
|
|
|
|
std::string err_str;
|
|
Maybe<Reference> ref = ResourceUtils::ParseStyleParentReference("@android:style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("@style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("?android:style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("?style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("android:style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("android:foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("@android:foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kStyleFooName)));
|
|
|
|
ref = ResourceUtils::ParseStyleParentReference("*android:style/foo", &err_str);
|
|
ASSERT_TRUE(ref);
|
|
EXPECT_THAT(ref.value().name, Eq(make_value(kAndroidStyleFooName)));
|
|
EXPECT_TRUE(ref.value().private_reference);
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ParseEmptyFlag) {
|
|
std::unique_ptr<Attribute> attr = test::AttributeBuilder()
|
|
.SetTypeMask(ResTable_map::TYPE_FLAGS)
|
|
.AddItem("one", 0x01)
|
|
.AddItem("two", 0x02)
|
|
.Build();
|
|
|
|
std::unique_ptr<BinaryPrimitive> result = ResourceUtils::TryParseFlagSymbol(attr.get(), "");
|
|
ASSERT_THAT(result, NotNull());
|
|
EXPECT_THAT(result->value.data, Eq(0u));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, NullIsEmptyReference) {
|
|
ASSERT_THAT(ResourceUtils::MakeNull(), Pointee(ValueEq(Reference())));
|
|
ASSERT_THAT(ResourceUtils::TryParseNullOrEmpty("@null"), Pointee(ValueEq(Reference())));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, EmptyIsBinaryPrimitive) {
|
|
ASSERT_THAT(ResourceUtils::MakeEmpty(), Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_NULL, Res_value::DATA_NULL_EMPTY))));
|
|
ASSERT_THAT(ResourceUtils::TryParseNullOrEmpty("@empty"), Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_NULL, Res_value::DATA_NULL_EMPTY))));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, ItemsWithWhitespaceAreParsedCorrectly) {
|
|
EXPECT_THAT(ResourceUtils::TryParseItemForAttribute(" 12\n ", ResTable_map::TYPE_INTEGER),
|
|
Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_INT_DEC, 12u))));
|
|
EXPECT_THAT(ResourceUtils::TryParseItemForAttribute(" true\n ", ResTable_map::TYPE_BOOLEAN),
|
|
Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_INT_BOOLEAN, 0xffffffffu))));
|
|
|
|
const float expected_float = 12.0f;
|
|
const uint32_t expected_float_flattened = *(uint32_t*)&expected_float;
|
|
EXPECT_THAT(ResourceUtils::TryParseItemForAttribute(" 12.0\n ", ResTable_map::TYPE_FLOAT),
|
|
Pointee(ValueEq(BinaryPrimitive(Res_value::TYPE_FLOAT, expected_float_flattened))));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, StringBuilderWhitespaceRemoval) {
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" hey guys ")
|
|
.AppendText(" this is so cool ")
|
|
.to_string(),
|
|
Eq(" hey guys this is so cool "));
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" \" wow, so many \t ")
|
|
.AppendText("spaces. \"what? ")
|
|
.to_string(),
|
|
Eq(" wow, so many \t spaces. what? "));
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" where \t ")
|
|
.AppendText(" \nis the pie?")
|
|
.to_string(),
|
|
Eq(" where is the pie?"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, StringBuilderEscaping) {
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText("hey guys\\n ")
|
|
.AppendText(" this \\t is so\\\\ cool")
|
|
.to_string(),
|
|
Eq("hey guys\n this \t is so\\ cool"));
|
|
EXPECT_THAT(ResourceUtils::StringBuilder().AppendText("\\@\\?\\#\\\\\\'").to_string(),
|
|
Eq("@?#\\\'"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, StringBuilderMisplacedQuote) {
|
|
ResourceUtils::StringBuilder builder;
|
|
EXPECT_FALSE(builder.AppendText("they're coming!"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, StringBuilderUnicodeCodes) {
|
|
EXPECT_THAT(ResourceUtils::StringBuilder().AppendText("\\u00AF\\u0AF0 woah").to_string(),
|
|
Eq("\u00AF\u0AF0 woah"));
|
|
EXPECT_FALSE(ResourceUtils::StringBuilder().AppendText("\\u00 yo"));
|
|
}
|
|
|
|
TEST(ResourceUtilsTest, StringBuilderPreserveSpaces) {
|
|
EXPECT_THAT(ResourceUtils::StringBuilder(true /*preserve_spaces*/).AppendText("\"").to_string(),
|
|
Eq("\""));
|
|
|
|
// Single quotes should be able to be used without escaping them when preserving spaces and the
|
|
// spaces should not be trimmed
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" hey guys ")
|
|
.AppendText(" 'this is so cool' ", /* preserve_spaces */ true)
|
|
.AppendText(" wow ")
|
|
.to_string(),
|
|
Eq(" hey guys 'this is so cool' wow "));
|
|
|
|
// Reading a double quote while preserving spaces should not change the quote state
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" hey guys ")
|
|
.AppendText(" \"this is so cool' ", /* preserve_spaces */ true)
|
|
.AppendText(" wow ")
|
|
.to_string(),
|
|
Eq(" hey guys \"this is so cool' wow "));
|
|
EXPECT_THAT(ResourceUtils::StringBuilder()
|
|
.AppendText(" hey guys\" ")
|
|
.AppendText(" \"this is so cool' ", /* preserve_spaces */ true)
|
|
.AppendText(" wow \" ")
|
|
.to_string(),
|
|
Eq(" hey guys \"this is so cool' wow "));
|
|
}
|
|
|
|
} // namespace aapt
|