34723087fe
The legacy png files have an empty line in the end. And the recovery
used to match any missing locale, e.g. "he" with that line and gets an
empty image.
Since the empty image is barely useful, we should just error out and
fall back to the default locale.
This reversed the unit test check added in d17a688525
Bug: 128934634
Test: run locale test with "he" and legacy images, recovery reports
error and doesn't crash even without default locale fall back
Change-Id: Ibdb7dd0b42348de5e392c834cce67ff02be85c24
33 lines
1.2 KiB
C++
33 lines
1.2 KiB
C++
/*
|
|
* 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-Hans-CN"));
|
|
EXPECT_TRUE(matches_locale("zh", "zh-Hans-CN"));
|
|
EXPECT_FALSE(matches_locale("zh-HK", "zh-Hans-CN"));
|
|
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"));
|
|
EXPECT_FALSE(matches_locale("en-US", ""));
|
|
// Empty locale prefix in the PNG file should not match the input locale.
|
|
EXPECT_FALSE(matches_locale("", "en-US"));
|
|
EXPECT_TRUE(matches_locale("sr-Latn", "sr-Latn-BA"));
|
|
}
|