Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java

Issue 2726003002: Auto convert base javatests in content shell apk to JUnit4 (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java ('k') | base/android/javatests/src/org/chromium/base/ObserverListTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java
diff --git a/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java b/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java
index 3440278022d78ee8c9f1c08d28dce81b1c9648b5..fc37a1f56505eb2ff21cb9019bcaecd7e12ad0bd 100644
--- a/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java
+++ b/base/android/javatests/src/org/chromium/base/LocaleUtilsTest.java
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,8 +8,12 @@ import android.annotation.SuppressLint;
import android.os.Build;
import android.os.LocaleList;
import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import java.util.Locale;
@@ -17,130 +21,137 @@ import java.util.Locale;
/**
* Tests for the LocaleUtils class.
*/
-public class LocaleUtilsTest extends InstrumentationTestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class LocaleUtilsTest {
// This is also a part of test for toLanguageTag when API level is lower than 24
+ @Test
@SmallTest
public void testGetUpdatedLanguageForChromium() {
String language = "en";
String updatedLanguage = LocaleUtils.getUpdatedLanguageForChromium(language);
- assertEquals(language, updatedLanguage);
+ Assert.assertEquals(language, updatedLanguage);
language = "iw";
updatedLanguage = LocaleUtils.getUpdatedLanguageForChromium(language);
- assertEquals("he", updatedLanguage);
+ Assert.assertEquals("he", updatedLanguage);
language = "ji";
updatedLanguage = LocaleUtils.getUpdatedLanguageForChromium(language);
- assertEquals("yi", updatedLanguage);
+ Assert.assertEquals("yi", updatedLanguage);
language = "in";
updatedLanguage = LocaleUtils.getUpdatedLanguageForChromium(language);
- assertEquals("id", updatedLanguage);
+ Assert.assertEquals("id", updatedLanguage);
language = "tl";
updatedLanguage = LocaleUtils.getUpdatedLanguageForChromium(language);
- assertEquals("fil", updatedLanguage);
+ Assert.assertEquals("fil", updatedLanguage);
}
// This is also a part of test for toLanguageTags when API level is 24 or higher
+ @Test
@SmallTest
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testGetUpdatedLocaleForChromium() {
Locale locale = new Locale("jp");
Locale updatedLocale = LocaleUtils.getUpdatedLocaleForChromium(locale);
- assertEquals(locale, updatedLocale);
+ Assert.assertEquals(locale, updatedLocale);
locale = new Locale("iw");
updatedLocale = LocaleUtils.getUpdatedLocaleForChromium(locale);
- assertEquals(new Locale("he"), updatedLocale);
+ Assert.assertEquals(new Locale("he"), updatedLocale);
locale = new Locale("ji");
updatedLocale = LocaleUtils.getUpdatedLocaleForChromium(locale);
- assertEquals(new Locale("yi"), updatedLocale);
+ Assert.assertEquals(new Locale("yi"), updatedLocale);
locale = new Locale("in");
updatedLocale = LocaleUtils.getUpdatedLocaleForChromium(locale);
- assertEquals(new Locale("id"), updatedLocale);
+ Assert.assertEquals(new Locale("id"), updatedLocale);
locale = new Locale("tl");
updatedLocale = LocaleUtils.getUpdatedLocaleForChromium(locale);
- assertEquals(new Locale("fil"), updatedLocale);
+ Assert.assertEquals(new Locale("fil"), updatedLocale);
}
// This is also a part of test for forLanguageTag when API level is lower than 21
+ @Test
@SmallTest
public void testGetUpdatedLanguageForAndroid() {
String language = "en";
String updatedLanguage = LocaleUtils.getUpdatedLanguageForAndroid(language);
- assertEquals(language, updatedLanguage);
+ Assert.assertEquals(language, updatedLanguage);
language = "und";
updatedLanguage = LocaleUtils.getUpdatedLanguageForAndroid(language);
- assertEquals("", updatedLanguage);
+ Assert.assertEquals("", updatedLanguage);
language = "fil";
updatedLanguage = LocaleUtils.getUpdatedLanguageForAndroid(language);
- assertEquals("tl", updatedLanguage);
+ Assert.assertEquals("tl", updatedLanguage);
}
// This is also a part of test for forLanguageTag when API level is 21 or higher
+ @Test
@SmallTest
@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
public void testGetUpdatedLocaleForAndroid() {
Locale locale = new Locale("jp");
Locale updatedLocale = LocaleUtils.getUpdatedLocaleForAndroid(locale);
- assertEquals(locale, updatedLocale);
+ Assert.assertEquals(locale, updatedLocale);
locale = new Locale("und");
updatedLocale = LocaleUtils.getUpdatedLocaleForAndroid(locale);
- assertEquals(new Locale(""), updatedLocale);
+ Assert.assertEquals(new Locale(""), updatedLocale);
locale = new Locale("fil");
updatedLocale = LocaleUtils.getUpdatedLocaleForAndroid(locale);
- assertEquals(new Locale("tl"), updatedLocale);
+ Assert.assertEquals(new Locale("tl"), updatedLocale);
}
// Test for toLanguageTag when API level is lower than 24
+ @Test
@SmallTest
public void testToLanguageTag() {
Locale locale = new Locale("en", "US");
String localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("en-US", localeString);
+ Assert.assertEquals("en-US", localeString);
locale = new Locale("jp");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("jp", localeString);
+ Assert.assertEquals("jp", localeString);
locale = new Locale("mas");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("mas", localeString);
+ Assert.assertEquals("mas", localeString);
locale = new Locale("es", "005");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("es-005", localeString);
+ Assert.assertEquals("es-005", localeString);
locale = new Locale("iw");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("he", localeString);
+ Assert.assertEquals("he", localeString);
locale = new Locale("ji");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("yi", localeString);
+ Assert.assertEquals("yi", localeString);
locale = new Locale("in", "ID");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("id-ID", localeString);
+ Assert.assertEquals("id-ID", localeString);
locale = new Locale("tl", "PH");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("fil-PH", localeString);
+ Assert.assertEquals("fil-PH", localeString);
locale = new Locale("no", "NO", "NY");
localeString = LocaleUtils.toLanguageTag(locale);
- assertEquals("nn-NO", localeString);
+ Assert.assertEquals("nn-NO", localeString);
}
// Test for toLanguageTags when API level is 24 or higher
+ @Test
@SmallTest
@MinAndroidSdkLevel(Build.VERSION_CODES.N)
@SuppressLint("NewApi")
@@ -149,102 +160,103 @@ public class LocaleUtilsTest extends InstrumentationTestCase {
Locale locale2 = new Locale("es", "005");
LocaleList localeList = new LocaleList(locale1, locale2);
String localeString = LocaleUtils.toLanguageTags(localeList);
- assertEquals("en-US,es-005", localeString);
+ Assert.assertEquals("en-US,es-005", localeString);
locale1 = new Locale("jp");
locale2 = new Locale("mas");
localeList = new LocaleList(locale1, locale2);
localeString = LocaleUtils.toLanguageTags(localeList);
- assertEquals("jp,mas", localeString);
+ Assert.assertEquals("jp,mas", localeString);
locale1 = new Locale("iw");
locale2 = new Locale("ji");
localeList = new LocaleList(locale1, locale2);
localeString = LocaleUtils.toLanguageTags(localeList);
- assertEquals("he,yi", localeString);
+ Assert.assertEquals("he,yi", localeString);
locale1 = new Locale("in", "ID");
locale2 = new Locale("tl", "PH");
localeList = new LocaleList(locale1, locale2);
localeString = LocaleUtils.toLanguageTags(localeList);
- assertEquals("id-ID,fil-PH", localeString);
+ Assert.assertEquals("id-ID,fil-PH", localeString);
locale1 = new Locale("no", "NO", "NY");
localeList = new LocaleList(locale1);
localeString = LocaleUtils.toLanguageTags(localeList);
- assertEquals("nn-NO", localeString);
+ Assert.assertEquals("nn-NO", localeString);
}
// Test for forLanguageTag when API level is lower than 21
+ @Test
@SmallTest
public void testForLanguageTagCompat() {
String languageTag = "";
Locale locale = new Locale("");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "und";
locale = new Locale("");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "en";
locale = new Locale("en");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "mas";
locale = new Locale("mas");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "en-GB";
locale = new Locale("en", "GB");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "es-419";
locale = new Locale("es", "419");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
// Tests if updated Chromium language code and deprecated language code
// are pointing to the same Locale Object.
languageTag = "he";
locale = new Locale("iw");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "iw";
locale = new Locale("he");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "ji";
locale = new Locale("yi");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "yi";
locale = new Locale("ji");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "in";
locale = new Locale("id");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "id";
locale = new Locale("in");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
// Tests for Tagalog/Filipino if updated Chromium language code and
// language code are pointing to the same Locale Object.
languageTag = "tl";
locale = new Locale("tl");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "fil";
locale = new Locale("tl");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
// Test with invalid inputs.
languageTag = "notValidLanguage";
locale = new Locale("");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
languageTag = "en-notValidCountry";
locale = new Locale("en");
- assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
+ Assert.assertEquals(locale, LocaleUtils.forLanguageTagCompat(languageTag));
}
}
« no previous file with comments | « base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java ('k') | base/android/javatests/src/org/chromium/base/ObserverListTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698