-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MOB-17661] Lifecycle v2 set BCP 47 style language tag for XDM field …
…environment._dc.language (#293) * LifecycleV2 sets langauge code using Locale.toLanguageTag from SDK >=21. Fixes issue where some locale strings fail XDM validation. The failure is due to the use of Locale.toString, which doesn't always produce a valid locale tag. For SDK level 21 and higher, use Locale.toLanguageTag to set Environment._dc.language, and for lower API levels use simple concatenation of Locale.getLanguage and Locale.getCountry. * Add validation for _dc.language string in XDMLifecycleEnvironment class * Remove regex pattern tests from LifecycleUtilLocaleTest, tests moved to XDMLifecycleEnvironmentLanguageTest * refactor LifecycleUtil.formatLocaleXDM for readability * Update comment for LifecycleUtil.formatLocale to clarify the response format * Refactor LifecycleUtil.formatLocaleXDM to conform to checkstyle rules * use DataReader in test case to avoid NPE * fix format * Reduce nesting statements in getlocaleBCPString
- Loading branch information
Showing
5 changed files
with
454 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
218 changes: 218 additions & 0 deletions
218
...e-library/src/test/java/com/adobe/marketing/mobile/lifecycle/LifecycleUtilLocaleTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| /* | ||
| Copyright 2022 Adobe. All rights reserved. | ||
| This file is licensed to you 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 REPRESENTATIONS | ||
| OF ANY KIND, either express or implied. See the License for the specific language | ||
| governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.adobe.marketing.mobile.lifecycle; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| import android.os.Build; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Locale; | ||
| import org.junit.After; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
|
|
||
| @RunWith(Parameterized.class) | ||
| public class LifecycleUtilLocaleTest { | ||
|
|
||
| @After | ||
| public void teardown() { | ||
| // Reset build check version for tests outside this class | ||
| LifecycleUtil.isLollipopOrGreater = | ||
| () -> Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; | ||
| } | ||
|
|
||
| @Parameterized.Parameters(name = "{index}: {0}") | ||
| public static Collection<Object[]> data() { | ||
| // 0: test name, 1: expected result for Android KitKat, 2: expected result for Android | ||
| // Lollipop, 3: Locale object to test with | ||
| return Arrays.asList( | ||
| new Object[][] { | ||
| { | ||
| // Language only | ||
| "Language only", "en", "en", new Locale.Builder().setLanguage("en").build() | ||
| }, | ||
| { | ||
| // Region only | ||
| "Region only", null, "und-US", new Locale.Builder().setRegion("US").build() | ||
| }, | ||
| { | ||
| // Script only | ||
| "Script only", | ||
| null, | ||
| "und-Hant", | ||
| new Locale.Builder().setScript("Hant").build() | ||
| }, | ||
| { | ||
| // Variant only | ||
| "Variant only", | ||
| null, | ||
| "und-POSIX", | ||
| new Locale.Builder().setVariant("POSIX").build() | ||
| }, | ||
| { | ||
| // Undefined | ||
| "Undefined Locale", null, "und", new Locale.Builder().build() | ||
| }, | ||
| { | ||
| // Null | ||
| "Null Locale", null, null, null | ||
| }, | ||
| { | ||
| // Language + Region | ||
| "Language + Region", | ||
| "es-US", | ||
| "es-US", | ||
| new Locale.Builder().setLanguage("es").setRegion("US").build() | ||
| }, | ||
| { | ||
| // Language + Region + Variant | ||
| "Language + Region + Variant", | ||
| "de-DE", | ||
| "de-DE-POSIX", | ||
| new Locale("DE", "DE", "POSIX") | ||
| }, | ||
| { | ||
| // Language + Variant | ||
| "Language + Variant", | ||
| "de", | ||
| "de-POSIX", | ||
| new Locale.Builder().setLanguage("de").setVariant("POSIX").build() | ||
| }, | ||
| { | ||
| // Language + Script + Region + Variant | ||
| "Language + Script + Region + Variant", | ||
| "de-DE", | ||
| "de-Latn-DE-POSIX", | ||
| new Locale.Builder() | ||
| .setLanguage("de") | ||
| .setRegion("DE") | ||
| .setScript("Latn") | ||
| .setVariant("POSIX") | ||
| .build() | ||
| }, | ||
| { | ||
| // Language + Script + Region | ||
| "Chinese Hong Kong", | ||
| "zh-HK", | ||
| "zh-Hant-HK", | ||
| new Locale.Builder() | ||
| .setLanguage("zh") | ||
| .setRegion("HK") | ||
| .setScript("Hant") | ||
| .build() | ||
| }, | ||
| { | ||
| // Language + Script + Region | ||
| "Chinese China", | ||
| "zh-CN", | ||
| "zh-Hans-CN", | ||
| new Locale.Builder() | ||
| .setLanguage("zh") | ||
| .setRegion("CN") | ||
| .setScript("Hans") | ||
| .build() | ||
| }, | ||
| { | ||
| // Language + Script | ||
| "Language + Script", | ||
| "it", | ||
| "it-Latn", | ||
| new Locale.Builder().setLanguage("it").setScript("Latn").build() | ||
| }, | ||
| { | ||
| // Serbian Montenegro | ||
| "Serbian Montenegro", | ||
| "sr-ME", | ||
| "sr-ME-x-lvariant-Latn", | ||
| new Locale("sr", "ME", "Latn") | ||
| }, | ||
| { | ||
| // "no" is treated as Norwegian Nynorsk (nn) | ||
| "Norwegian Nynorsk", "no-NO", "nn-NO", new Locale("no", "NO", "NY") | ||
| }, | ||
| { | ||
| // Special case for Japanese Calendar | ||
| "ja-JP-u-ca-japanese", | ||
| "ja-JP", | ||
| "ja-JP-u-ca-japanese", | ||
| Locale.forLanguageTag("ja-JP-u-ca-japanese") | ||
| }, | ||
| { | ||
| // Special case for Japanese Calendar | ||
| "Special case: ja_JP_JP", | ||
| "ja-JP", | ||
| "ja-JP-u-ca-japanese-x-lvariant-JP", | ||
| new Locale("JA", "JP", "JP") | ||
| }, | ||
| { | ||
| // Special case for Thai Buddhist Calendar | ||
| "Special case: th_TH_TH", | ||
| "th-TH", | ||
| "th-TH-u-nu-thai-x-lvariant-TH", | ||
| new Locale("TH", "TH", "TH") | ||
| }, | ||
| { | ||
| // Special case for Thai Buddhist Calendar | ||
| "th-TH-u-ca-buddhist", | ||
| "th-TH", | ||
| "th-TH-u-ca-buddhist", | ||
| Locale.forLanguageTag("th-TH-u-ca-buddhist") | ||
| }, | ||
| { | ||
| // Special case for Thai Buddhist Calendar | ||
| "th-TH-u-ca-buddhist-nu-thai", | ||
| "th-TH", | ||
| "th-TH-u-ca-buddhist-nu-thai", | ||
| Locale.forLanguageTag("th-TH-u-ca-buddhist-nu-thai") | ||
| }, | ||
| { | ||
| // Grandfathered locale | ||
| "Grandfathered i-klingon", "tlh", "tlh", Locale.forLanguageTag("i-klingon") | ||
| }, | ||
| { | ||
| // English US with Buddhist Calendar | ||
| "en-US-ca-buddhist", | ||
| "en-US", | ||
| "en-US", | ||
| Locale.forLanguageTag("en-US-ca-buddhist") | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Parameterized.Parameter(0) | ||
| public String testName; | ||
|
|
||
| @Parameterized.Parameter(1) | ||
| public String expectedKitKat; | ||
|
|
||
| @Parameterized.Parameter(2) | ||
| public String expectedLollipop; | ||
|
|
||
| @Parameterized.Parameter(3) | ||
| public Locale testLocale; | ||
|
|
||
| @Test | ||
| public void testFormatLocaleXDM_usingLollipopSDK() { | ||
| LifecycleUtil.isLollipopOrGreater = () -> true; | ||
| String result = LifecycleUtil.formatLocaleXDM(testLocale); | ||
| assertEquals(expectedLollipop, result); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFormatLocaleXDM_usingKitKatSDK() { | ||
| LifecycleUtil.isLollipopOrGreater = () -> false; | ||
| String result = LifecycleUtil.formatLocaleXDM(testLocale); | ||
| assertEquals(expectedKitKat, result); | ||
| } | ||
| } |
Oops, something went wrong.