diff options
Diffstat (limited to 'tools/aapt2/util/Util_test.cpp')
-rw-r--r-- | tools/aapt2/util/Util_test.cpp | 172 |
1 files changed, 86 insertions, 86 deletions
diff --git a/tools/aapt2/util/Util_test.cpp b/tools/aapt2/util/Util_test.cpp index 1e0c7fa9152d..0e27213a8d8a 100644 --- a/tools/aapt2/util/Util_test.cpp +++ b/tools/aapt2/util/Util_test.cpp @@ -14,191 +14,191 @@ * limitations under the License. */ -#include "test/Common.h" +#include "test/Test.h" #include "util/StringPiece.h" #include "util/Util.h" -#include <gtest/gtest.h> #include <string> namespace aapt { TEST(UtilTest, TrimOnlyWhitespace) { - const std::u16string full = u"\n "; + const std::string full = "\n "; - StringPiece16 trimmed = util::trimWhitespace(full); + StringPiece trimmed = util::trimWhitespace(full); EXPECT_TRUE(trimmed.empty()); EXPECT_EQ(0u, trimmed.size()); } TEST(UtilTest, StringEndsWith) { - EXPECT_TRUE(util::stringEndsWith<char>("hello.xml", ".xml")); + EXPECT_TRUE(util::stringEndsWith("hello.xml", ".xml")); } TEST(UtilTest, StringStartsWith) { - EXPECT_TRUE(util::stringStartsWith<char>("hello.xml", "he")); + EXPECT_TRUE(util::stringStartsWith("hello.xml", "he")); } TEST(UtilTest, StringBuilderSplitEscapeSequence) { - EXPECT_EQ(StringPiece16(u"this is a new\nline."), - util::StringBuilder().append(u"this is a new\\") - .append(u"nline.") + EXPECT_EQ(StringPiece("this is a new\nline."), + util::StringBuilder().append("this is a new\\") + .append("nline.") .str()); } TEST(UtilTest, StringBuilderWhitespaceRemoval) { - EXPECT_EQ(StringPiece16(u"hey guys this is so cool"), - util::StringBuilder().append(u" hey guys ") - .append(u" this is so cool ") + EXPECT_EQ(StringPiece("hey guys this is so cool"), + util::StringBuilder().append(" hey guys ") + .append(" this is so cool ") .str()); - EXPECT_EQ(StringPiece16(u" wow, so many \t spaces. what?"), - util::StringBuilder().append(u" \" wow, so many \t ") - .append(u"spaces. \"what? ") + EXPECT_EQ(StringPiece(" wow, so many \t spaces. what?"), + util::StringBuilder().append(" \" wow, so many \t ") + .append("spaces. \"what? ") .str()); - EXPECT_EQ(StringPiece16(u"where is the pie?"), - util::StringBuilder().append(u" where \t ") - .append(u" \nis the "" pie?") + EXPECT_EQ(StringPiece("where is the pie?"), + util::StringBuilder().append(" where \t ") + .append(" \nis the "" pie?") .str()); } TEST(UtilTest, StringBuilderEscaping) { - EXPECT_EQ(StringPiece16(u"hey guys\n this \t is so\\ cool"), - util::StringBuilder().append(u" hey guys\\n ") - .append(u" this \\t is so\\\\ cool ") + EXPECT_EQ(StringPiece("hey guys\n this \t is so\\ cool"), + util::StringBuilder().append(" hey guys\\n ") + .append(" this \\t is so\\\\ cool ") .str()); - EXPECT_EQ(StringPiece16(u"@?#\\\'"), - util::StringBuilder().append(u"\\@\\?\\#\\\\\\'") + EXPECT_EQ(StringPiece("@?#\\\'"), + util::StringBuilder().append("\\@\\?\\#\\\\\\'") .str()); } TEST(UtilTest, StringBuilderMisplacedQuote) { util::StringBuilder builder{}; - EXPECT_FALSE(builder.append(u"they're coming!")); + EXPECT_FALSE(builder.append("they're coming!")); } TEST(UtilTest, StringBuilderUnicodeCodes) { - EXPECT_EQ(StringPiece16(u"\u00AF\u0AF0 woah"), - util::StringBuilder().append(u"\\u00AF\\u0AF0 woah") + EXPECT_EQ(std::string("\u00AF\u0AF0 woah"), + util::StringBuilder().append("\\u00AF\\u0AF0 woah") .str()); - EXPECT_FALSE(util::StringBuilder().append(u"\\u00 yo")); + EXPECT_FALSE(util::StringBuilder().append("\\u00 yo")); } TEST(UtilTest, TokenizeInput) { - auto tokenizer = util::tokenize(StringPiece16(u"this| is|the|end"), u'|'); + auto tokenizer = util::tokenize(StringPiece("this| is|the|end"), '|'); auto iter = tokenizer.begin(); - ASSERT_EQ(*iter, StringPiece16(u"this")); + ASSERT_EQ(*iter, StringPiece("this")); ++iter; - ASSERT_EQ(*iter, StringPiece16(u" is")); + ASSERT_EQ(*iter, StringPiece(" is")); ++iter; - ASSERT_EQ(*iter, StringPiece16(u"the")); + ASSERT_EQ(*iter, StringPiece("the")); ++iter; - ASSERT_EQ(*iter, StringPiece16(u"end")); + ASSERT_EQ(*iter, StringPiece("end")); ++iter; ASSERT_EQ(tokenizer.end(), iter); } TEST(UtilTest, TokenizeEmptyString) { - auto tokenizer = util::tokenize(StringPiece16(u""), u'|'); + auto tokenizer = util::tokenize(StringPiece(""), '|'); auto iter = tokenizer.begin(); ASSERT_NE(tokenizer.end(), iter); - ASSERT_EQ(StringPiece16(), *iter); + ASSERT_EQ(StringPiece(), *iter); ++iter; ASSERT_EQ(tokenizer.end(), iter); } TEST(UtilTest, TokenizeAtEnd) { - auto tokenizer = util::tokenize(StringPiece16(u"one."), u'.'); + auto tokenizer = util::tokenize(StringPiece("one."), '.'); auto iter = tokenizer.begin(); - ASSERT_EQ(*iter, StringPiece16(u"one")); + ASSERT_EQ(*iter, StringPiece("one")); ++iter; ASSERT_NE(iter, tokenizer.end()); - ASSERT_EQ(*iter, StringPiece16()); + ASSERT_EQ(*iter, StringPiece()); } TEST(UtilTest, IsJavaClassName) { - EXPECT_TRUE(util::isJavaClassName(u"android.test.Class")); - EXPECT_TRUE(util::isJavaClassName(u"android.test.Class$Inner")); - EXPECT_TRUE(util::isJavaClassName(u"android_test.test.Class")); - EXPECT_TRUE(util::isJavaClassName(u"_android_.test._Class_")); - EXPECT_FALSE(util::isJavaClassName(u"android.test.$Inner")); - EXPECT_FALSE(util::isJavaClassName(u"android.test.Inner$")); - EXPECT_FALSE(util::isJavaClassName(u".test.Class")); - EXPECT_FALSE(util::isJavaClassName(u"android")); + EXPECT_TRUE(util::isJavaClassName("android.test.Class")); + EXPECT_TRUE(util::isJavaClassName("android.test.Class$Inner")); + EXPECT_TRUE(util::isJavaClassName("android_test.test.Class")); + EXPECT_TRUE(util::isJavaClassName("_android_.test._Class_")); + EXPECT_FALSE(util::isJavaClassName("android.test.$Inner")); + EXPECT_FALSE(util::isJavaClassName("android.test.Inner$")); + EXPECT_FALSE(util::isJavaClassName(".test.Class")); + EXPECT_FALSE(util::isJavaClassName("android")); } TEST(UtilTest, IsJavaPackageName) { - EXPECT_TRUE(util::isJavaPackageName(u"android")); - EXPECT_TRUE(util::isJavaPackageName(u"android.test")); - EXPECT_TRUE(util::isJavaPackageName(u"android.test_thing")); - EXPECT_FALSE(util::isJavaPackageName(u"_android")); - EXPECT_FALSE(util::isJavaPackageName(u"android_")); - EXPECT_FALSE(util::isJavaPackageName(u"android.")); - EXPECT_FALSE(util::isJavaPackageName(u".android")); - EXPECT_FALSE(util::isJavaPackageName(u"android._test")); - EXPECT_FALSE(util::isJavaPackageName(u"..")); + EXPECT_TRUE(util::isJavaPackageName("android")); + EXPECT_TRUE(util::isJavaPackageName("android.test")); + EXPECT_TRUE(util::isJavaPackageName("android.test_thing")); + EXPECT_FALSE(util::isJavaPackageName("_android")); + EXPECT_FALSE(util::isJavaPackageName("android_")); + EXPECT_FALSE(util::isJavaPackageName("android.")); + EXPECT_FALSE(util::isJavaPackageName(".android")); + EXPECT_FALSE(util::isJavaPackageName("android._test")); + EXPECT_FALSE(util::isJavaPackageName("..")); } TEST(UtilTest, FullyQualifiedClassName) { - Maybe<std::u16string> res = util::getFullyQualifiedClassName(u"android", u"asdf"); - AAPT_ASSERT_FALSE(res); + Maybe<std::string> res = util::getFullyQualifiedClassName("android", ".asdf"); + AAPT_ASSERT_TRUE(res); + EXPECT_EQ(res.value(), "android.asdf"); - res = util::getFullyQualifiedClassName(u"android", u".asdf"); + res = util::getFullyQualifiedClassName("android", ".a.b"); AAPT_ASSERT_TRUE(res); - EXPECT_EQ(res.value(), u"android.asdf"); + EXPECT_EQ(res.value(), "android.a.b"); - res = util::getFullyQualifiedClassName(u"android", u".a.b"); + res = util::getFullyQualifiedClassName("android", "a.b"); AAPT_ASSERT_TRUE(res); - EXPECT_EQ(res.value(), u"android.a.b"); + EXPECT_EQ(res.value(), "a.b"); - res = util::getFullyQualifiedClassName(u"android", u"a.b"); + res = util::getFullyQualifiedClassName("", "a.b"); AAPT_ASSERT_TRUE(res); - EXPECT_EQ(res.value(), u"a.b"); + EXPECT_EQ(res.value(), "a.b"); - res = util::getFullyQualifiedClassName(u"", u"a.b"); + res = util::getFullyQualifiedClassName("android", "Class"); AAPT_ASSERT_TRUE(res); - EXPECT_EQ(res.value(), u"a.b"); + EXPECT_EQ(res.value(), "android.Class"); - res = util::getFullyQualifiedClassName(u"", u""); + res = util::getFullyQualifiedClassName("", ""); AAPT_ASSERT_FALSE(res); - res = util::getFullyQualifiedClassName(u"android", u"./Apple"); + res = util::getFullyQualifiedClassName("android", "./Apple"); AAPT_ASSERT_FALSE(res); } TEST(UtilTest, ExtractResourcePathComponents) { - StringPiece16 prefix, entry, suffix; - ASSERT_TRUE(util::extractResFilePathParts(u"res/xml-sw600dp/entry.xml", &prefix, &entry, + StringPiece prefix, entry, suffix; + ASSERT_TRUE(util::extractResFilePathParts("res/xml-sw600dp/entry.xml", &prefix, &entry, &suffix)); - EXPECT_EQ(prefix, u"res/xml-sw600dp/"); - EXPECT_EQ(entry, u"entry"); - EXPECT_EQ(suffix, u".xml"); + EXPECT_EQ(prefix, "res/xml-sw600dp/"); + EXPECT_EQ(entry, "entry"); + EXPECT_EQ(suffix, ".xml"); - ASSERT_TRUE(util::extractResFilePathParts(u"res/xml-sw600dp/entry.9.png", &prefix, &entry, + ASSERT_TRUE(util::extractResFilePathParts("res/xml-sw600dp/entry.9.png", &prefix, &entry, &suffix)); - EXPECT_EQ(prefix, u"res/xml-sw600dp/"); - EXPECT_EQ(entry, u"entry"); - EXPECT_EQ(suffix, u".9.png"); + EXPECT_EQ(prefix, "res/xml-sw600dp/"); + EXPECT_EQ(entry, "entry"); + EXPECT_EQ(suffix, ".9.png"); - EXPECT_FALSE(util::extractResFilePathParts(u"AndroidManifest.xml", &prefix, &entry, &suffix)); - EXPECT_FALSE(util::extractResFilePathParts(u"res/.xml", &prefix, &entry, &suffix)); + EXPECT_FALSE(util::extractResFilePathParts("AndroidManifest.xml", &prefix, &entry, &suffix)); + EXPECT_FALSE(util::extractResFilePathParts("res/.xml", &prefix, &entry, &suffix)); - ASSERT_TRUE(util::extractResFilePathParts(u"res//.", &prefix, &entry, &suffix)); - EXPECT_EQ(prefix, u"res//"); - EXPECT_EQ(entry, u""); - EXPECT_EQ(suffix, u"."); + ASSERT_TRUE(util::extractResFilePathParts("res//.", &prefix, &entry, &suffix)); + EXPECT_EQ(prefix, "res//"); + EXPECT_EQ(entry, ""); + EXPECT_EQ(suffix, "."); } TEST(UtilTest, VerifyJavaStringFormat) { - ASSERT_TRUE(util::verifyJavaStringFormat(u"%09.34f")); - ASSERT_TRUE(util::verifyJavaStringFormat(u"%9$.34f %8$")); - ASSERT_TRUE(util::verifyJavaStringFormat(u"%% %%")); - ASSERT_FALSE(util::verifyJavaStringFormat(u"%09$f %f")); - ASSERT_FALSE(util::verifyJavaStringFormat(u"%09f %08s")); + ASSERT_TRUE(util::verifyJavaStringFormat("%09.34f")); + ASSERT_TRUE(util::verifyJavaStringFormat("%9$.34f %8$")); + ASSERT_TRUE(util::verifyJavaStringFormat("%% %%")); + ASSERT_FALSE(util::verifyJavaStringFormat("%09$f %f")); + ASSERT_FALSE(util::verifyJavaStringFormat("%09f %08s")); } } // namespace aapt |