summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceUtils_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/aapt2/ResourceUtils_test.cpp')
-rw-r--r--tools/aapt2/ResourceUtils_test.cpp121
1 files changed, 53 insertions, 68 deletions
diff --git a/tools/aapt2/ResourceUtils_test.cpp b/tools/aapt2/ResourceUtils_test.cpp
index 7425f97ef8de..894cfcf72144 100644
--- a/tools/aapt2/ResourceUtils_test.cpp
+++ b/tools/aapt2/ResourceUtils_test.cpp
@@ -16,69 +16,54 @@
#include "Resource.h"
#include "ResourceUtils.h"
-#include "test/Builders.h"
-#include "test/Common.h"
-
-#include <gtest/gtest.h>
+#include "test/Test.h"
namespace aapt {
TEST(ResourceUtilsTest, ParseBool) {
- bool val = false;
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"true", &val));
- EXPECT_TRUE(val);
-
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"TRUE", &val));
- EXPECT_TRUE(val);
-
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"True", &val));
- EXPECT_TRUE(val);
-
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"false", &val));
- EXPECT_FALSE(val);
-
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"FALSE", &val));
- EXPECT_FALSE(val);
-
- EXPECT_TRUE(ResourceUtils::tryParseBool(u"False", &val));
- EXPECT_FALSE(val);
+ EXPECT_EQ(Maybe<bool>(true), ResourceUtils::parseBool("true"));
+ EXPECT_EQ(Maybe<bool>(true), ResourceUtils::parseBool("TRUE"));
+ EXPECT_EQ(Maybe<bool>(true), ResourceUtils::parseBool("True"));
+ EXPECT_EQ(Maybe<bool>(false), ResourceUtils::parseBool("false"));
+ EXPECT_EQ(Maybe<bool>(false), ResourceUtils::parseBool("FALSE"));
+ EXPECT_EQ(Maybe<bool>(false), ResourceUtils::parseBool("False"));
}
TEST(ResourceUtilsTest, ParseResourceName) {
ResourceNameRef actual;
bool actualPriv = false;
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"android:color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef("android", ResourceType::kColor, "foo"), actual);
EXPECT_FALSE(actualPriv);
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef({}, ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef({}, ResourceType::kColor, "foo"), actual);
EXPECT_FALSE(actualPriv);
- EXPECT_TRUE(ResourceUtils::parseResourceName(u"*android:color/foo", &actual, &actualPriv));
- EXPECT_EQ(ResourceNameRef(u"android", ResourceType::kColor, u"foo"), actual);
+ EXPECT_TRUE(ResourceUtils::parseResourceName("*android:color/foo", &actual, &actualPriv));
+ EXPECT_EQ(ResourceNameRef("android", ResourceType::kColor, "foo"), actual);
EXPECT_TRUE(actualPriv);
- EXPECT_FALSE(ResourceUtils::parseResourceName(StringPiece16(), &actual, &actualPriv));
+ EXPECT_FALSE(ResourceUtils::parseResourceName(StringPiece(), &actual, &actualPriv));
}
TEST(ResourceUtilsTest, ParseReferenceWithNoPackage) {
- ResourceNameRef expected({}, ResourceType::kColor, u"foo");
+ ResourceNameRef expected({}, ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@color/foo", &actual, &create, &privateRef));
+ EXPECT_TRUE(ResourceUtils::parseReference("@color/foo", &actual, &create, &privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
EXPECT_FALSE(privateRef);
}
TEST(ResourceUtilsTest, ParseReferenceWithPackage) {
- ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
+ ResourceNameRef expected("android", ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@android:color/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::parseReference("@android:color/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -86,11 +71,11 @@ TEST(ResourceUtilsTest, ParseReferenceWithPackage) {
}
TEST(ResourceUtilsTest, ParseReferenceWithSurroundingWhitespace) {
- ResourceNameRef expected(u"android", ResourceType::kColor, u"foo");
+ ResourceNameRef expected("android", ResourceType::kColor, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"\t @android:color/foo\n \n\t", &actual,
+ EXPECT_TRUE(ResourceUtils::parseReference("\t @android:color/foo\n \n\t", &actual,
&create, &privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -98,11 +83,11 @@ TEST(ResourceUtilsTest, ParseReferenceWithSurroundingWhitespace) {
}
TEST(ResourceUtilsTest, ParseAutoCreateIdReference) {
- ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
+ ResourceNameRef expected("android", ResourceType::kId, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@+android:id/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::parseReference("@+android:id/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_TRUE(create);
@@ -110,11 +95,11 @@ TEST(ResourceUtilsTest, ParseAutoCreateIdReference) {
}
TEST(ResourceUtilsTest, ParsePrivateReference) {
- ResourceNameRef expected(u"android", ResourceType::kId, u"foo");
+ ResourceNameRef expected("android", ResourceType::kId, "foo");
ResourceNameRef actual;
bool create = false;
bool privateRef = false;
- EXPECT_TRUE(ResourceUtils::tryParseReference(u"@*android:id/foo", &actual, &create,
+ EXPECT_TRUE(ResourceUtils::parseReference("@*android:id/foo", &actual, &create,
&privateRef));
EXPECT_EQ(expected, actual);
EXPECT_FALSE(create);
@@ -125,68 +110,68 @@ TEST(ResourceUtilsTest, FailToParseAutoCreateNonIdReference) {
bool create = false;
bool privateRef = false;
ResourceNameRef actual;
- EXPECT_FALSE(ResourceUtils::tryParseReference(u"@+android:color/foo", &actual, &create,
+ EXPECT_FALSE(ResourceUtils::parseReference("@+android:color/foo", &actual, &create,
&privateRef));
}
TEST(ResourceUtilsTest, ParseAttributeReferences) {
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:foo"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?attr/foo"));
- EXPECT_TRUE(ResourceUtils::isAttributeReference(u"?android:attr/foo"));
+ 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(u"?style/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:style/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?android:attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:attr/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?:/foo"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?attr/"));
- EXPECT_FALSE(ResourceUtils::isAttributeReference(u"?/foo"));
+ 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(u"android", ResourceType::kStyle, u"foo");
- const ResourceName kStyleFooName({}, ResourceType::kStyle, u"foo");
+ const ResourceName kAndroidStyleFooName("android", ResourceType::kStyle, "foo");
+ const ResourceName kStyleFooName({}, ResourceType::kStyle, "foo");
std::string errStr;
- Maybe<Reference> ref = ResourceUtils::parseStyleParentReference(u"@android:style/foo", &errStr);
+ Maybe<Reference> ref = ResourceUtils::parseStyleParentReference("@android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"@style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("@style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"?android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("?android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"?style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("?style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"android:foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("android:foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"@android:foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("@android:foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kStyleFooName);
- ref = ResourceUtils::parseStyleParentReference(u"*android:style/foo", &errStr);
+ ref = ResourceUtils::parseStyleParentReference("*android:style/foo", &errStr);
AAPT_ASSERT_TRUE(ref);
EXPECT_EQ(ref.value().name.value(), kAndroidStyleFooName);
EXPECT_TRUE(ref.value().privateReference);
@@ -195,11 +180,11 @@ TEST(ResourceUtilsTest, ParseStyleParentReference) {
TEST(ResourceUtilsTest, ParseEmptyFlag) {
std::unique_ptr<Attribute> attr = test::AttributeBuilder(false)
.setTypeMask(android::ResTable_map::TYPE_FLAGS)
- .addItem(u"one", 0x01)
- .addItem(u"two", 0x02)
+ .addItem("one", 0x01)
+ .addItem("two", 0x02)
.build();
- std::unique_ptr<BinaryPrimitive> result = ResourceUtils::tryParseFlagSymbol(attr.get(), u"");
+ std::unique_ptr<BinaryPrimitive> result = ResourceUtils::tryParseFlagSymbol(attr.get(), "");
ASSERT_NE(nullptr, result);
EXPECT_EQ(0u, result->value.data);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 09:28:37 +0000