summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-04-21 00:12:11 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-21 00:12:11 +0200
commit45609d37efe3ced3a599b6eccd6e6dbd184152e6 (patch)
tree71cf320482cb3fc9a4c18cd539457f7160f96152
parentMerge "Remove trailing punctuation from recovery strings." into nyc-dev (diff)
parentMerge "Fix matches_locale function" into nyc-dev (diff)
downloadandroid_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar.gz
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar.bz2
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar.lz
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar.xz
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.tar.zst
android_bootable_recovery-45609d37efe3ced3a599b6eccd6e6dbd184152e6.zip
-rw-r--r--minui/minui.h2
-rw-r--r--minui/resources.cpp21
-rw-r--r--tests/Android.mk6
-rw-r--r--tests/unit/locale_test.cpp29
4 files changed, 44 insertions, 14 deletions
diff --git a/minui/minui.h b/minui/minui.h
index e3bc00548..fb0bbe10c 100644
--- a/minui/minui.h
+++ b/minui/minui.h
@@ -84,6 +84,8 @@ int ev_get_epollfd();
// Resources
//
+bool matches_locale(const char* prefix, const char* locale);
+
// res_create_*_surface() functions return 0 if no error, else
// negative.
//
diff --git a/minui/resources.cpp b/minui/resources.cpp
index cf738a7fb..730b05f13 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -371,21 +371,16 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
return result;
}
-static int matches_locale(const char* loc, const char* locale) {
- if (locale == NULL) return 0;
+// This function tests if a locale string stored in PNG (prefix) matches
+// the locale string provided by the system (locale).
+bool matches_locale(const char* prefix, const char* locale) {
+ if (locale == NULL) return false;
- if (strcmp(loc, locale) == 0) return 1;
+ // Return true if the whole string of prefix matches the top part of
+ // locale. For instance, prefix == "en" matches locale == "en_US";
+ // and prefix == "zh_CN" matches locale == "zh_CN_#Hans".
- // if loc does *not* have an underscore, and it matches the start
- // of locale, and the next character in locale *is* an underscore,
- // that's a match. For instance, loc == "en" matches locale ==
- // "en_US".
-
- int i;
- for (i = 0; loc[i] != 0 && loc[i] != '_'; ++i);
- if (loc[i] == '_') return 0;
-
- return (strncmp(locale, loc, i) == 0 && locale[i] == '_');
+ return (strncmp(prefix, locale, strlen(prefix)) == 0);
}
int res_create_localized_alpha_surface(const char* name,
diff --git a/tests/Android.mk b/tests/Android.mk
index 81435bea4..4509c420f 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -21,9 +21,13 @@ include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := recovery_unit_test
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_STATIC_LIBRARIES := libverifier
+LOCAL_STATIC_LIBRARIES := \
+ libverifier \
+ libminui
+
LOCAL_SRC_FILES := unit/asn1_decoder_test.cpp
LOCAL_SRC_FILES += unit/recovery_test.cpp
+LOCAL_SRC_FILES += unit/locale_test.cpp
LOCAL_C_INCLUDES := bootable/recovery
LOCAL_SHARED_LIBRARIES := liblog
include $(BUILD_NATIVE_TEST)
diff --git a/tests/unit/locale_test.cpp b/tests/unit/locale_test.cpp
new file mode 100644
index 000000000..0e515f8c1
--- /dev/null
+++ b/tests/unit/locale_test.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 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 <gtest/gtest.h>
+
+#include "minui/minui.h"
+
+TEST(LocaleTest, Misc) {
+ EXPECT_TRUE(matches_locale("zh_CN", "zh_CN_#Hans"));
+ EXPECT_TRUE(matches_locale("zh", "zh_CN_#Hans"));
+ EXPECT_FALSE(matches_locale("zh_HK", "zh_CN_#Hans"));
+ EXPECT_TRUE(matches_locale("en_GB", "en_GB"));
+ EXPECT_TRUE(matches_locale("en", "en_GB"));
+ EXPECT_FALSE(matches_locale("en_GB", "en"));
+ EXPECT_FALSE(matches_locale("en_GB", "en_US"));
+}