AAPT2: Rename to match new style
Use Google3 naming style to match new
projects' and open source google projects' style.
Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.
Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87
diff --git a/tools/aapt2/Locale_test.cpp b/tools/aapt2/Locale_test.cpp
index b82d2b9..68b4cae 100644
--- a/tools/aapt2/Locale_test.cpp
+++ b/tools/aapt2/Locale_test.cpp
@@ -15,18 +15,20 @@
*/
#include "Locale.h"
-#include "util/Util.h"
-#include <gtest/gtest.h>
#include <string>
+#include "gtest/gtest.h"
+
+#include "util/Util.h"
+
namespace aapt {
static ::testing::AssertionResult TestLanguage(const char* input,
const char* lang) {
- std::vector<std::string> parts = util::splitAndLowercase(input, '-');
+ std::vector<std::string> parts = util::SplitAndLowercase(input, '-');
LocaleValue lv;
- ssize_t count = lv.initFromParts(std::begin(parts), std::end(parts));
+ ssize_t count = lv.InitFromParts(std::begin(parts), std::end(parts));
if (count < 0) {
return ::testing::AssertionFailure() << " failed to parse '" << input
<< "'.";
@@ -51,9 +53,9 @@
static ::testing::AssertionResult TestLanguageRegion(const char* input,
const char* lang,
const char* region) {
- std::vector<std::string> parts = util::splitAndLowercase(input, '-');
+ std::vector<std::string> parts = util::SplitAndLowercase(input, '-');
LocaleValue lv;
- ssize_t count = lv.initFromParts(std::begin(parts), std::end(parts));
+ ssize_t count = lv.InitFromParts(std::begin(parts), std::end(parts));
if (count < 0) {
return ::testing::AssertionFailure() << " failed to parse '" << input
<< "'.";