Improve language list prioritization #3293
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
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,82 @@ | ||
| package com.keylesspalace.tusky.util | ||
|
|
||
| import androidx.appcompat.app.AppCompatDelegate | ||
| import androidx.core.os.LocaleListCompat | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import com.keylesspalace.tusky.db.AccountEntity | ||
| import org.junit.Assert | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.Mockito | ||
| import org.robolectric.annotation.Config | ||
|
|
||
| @Config(sdk = [28]) | ||
| @RunWith(AndroidJUnit4::class) | ||
| class LocaleUtilsTest { | ||
| @Test | ||
| fun initialLanguagesContainReplySelectedAppAndSystem() { | ||
| val expectedLanguages = arrayOf<String?>("yi", "tok", "da", "fr", "sv", "kab") | ||
| val languages = getMockedInitialLanguages(expectedLanguages) | ||
| Assert.assertArrayEquals(expectedLanguages, languages.subList(0, expectedLanguages.size).toTypedArray()) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenReplyLanguageIsNull_DefaultLanguageIsFirst() { | ||
| val defaultLanguage = "tok" | ||
| val languages = getMockedInitialLanguages(arrayOf(null, defaultLanguage, "da", "fr", "sv", "kab")) | ||
| Assert.assertEquals(defaultLanguage, languages[0]) | ||
| } | ||
|
|
||
| @Test | ||
| fun initialLanguagesAreDistinct() { | ||
| val defaultLanguage = "da" | ||
| val languages = getMockedInitialLanguages(arrayOf(defaultLanguage, defaultLanguage, "fr", defaultLanguage, "kab", defaultLanguage)) | ||
| Assert.assertEquals(1, languages.count { it == defaultLanguage }) | ||
| } | ||
|
|
||
| @Test | ||
| fun initialLanguageDeduplicationDoesNotReorder() { | ||
| val defaultLanguage = "da" | ||
|
|
||
| Assert.assertEquals( | ||
| defaultLanguage, | ||
| getMockedInitialLanguages(arrayOf(defaultLanguage, defaultLanguage, "fr", defaultLanguage, "kab", defaultLanguage))[0] | ||
| ) | ||
| Assert.assertEquals( | ||
| defaultLanguage, | ||
| getMockedInitialLanguages(arrayOf(null, defaultLanguage, "fr", defaultLanguage, "kab", defaultLanguage))[0] | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun emptyInitialLanguagesAreDropped() { | ||
| val languages = getMockedInitialLanguages(arrayOf("", "", "fr", "", "kab", "")) | ||
|
There was a problem hiding this comment. (curiosity) Why are there empty languages? Or I have seen null checks for locales in lists? There was a problem hiding this comment. The default post language and reply language can both be empty in normal usage |
||
| Assert.assertFalse(languages.any { it.isEmpty() }) | ||
| } | ||
|
|
||
| private fun getMockedInitialLanguages(configuredLanguages: Array<String?>): List<String> { | ||
| val appLanguages = LocaleListCompat.forLanguageTags(configuredLanguages.slice(2 until 4).joinToString(",")) | ||
| val systemLanguages = LocaleListCompat.forLanguageTags(configuredLanguages.slice(4 until configuredLanguages.size).joinToString(",")) | ||
|
|
||
| Mockito.mockStatic(AppCompatDelegate::class.java).use { appCompatDelegate -> | ||
| appCompatDelegate.`when`<LocaleListCompat> { AppCompatDelegate.getApplicationLocales() }.thenReturn(appLanguages) | ||
|
|
||
| Mockito.mockStatic(LocaleListCompat::class.java).use { localeListCompat -> | ||
| localeListCompat.`when`<LocaleListCompat> { LocaleListCompat.getDefault() }.thenReturn(systemLanguages) | ||
|
|
||
| return getInitialLanguages( | ||
| configuredLanguages[0], | ||
| AccountEntity( | ||
| id = 0, | ||
| domain = "foo.bar", | ||
| accessToken = "", | ||
| clientId = null, | ||
| clientSecret = null, | ||
| isActive = true, | ||
| defaultPostLanguage = configuredLanguages[1] ?: "", | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't a test simply call the normal method with some test data?
(One wonders what is tested about a mocked list.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function is a wrapper that mocks the response for querying the configured app and system languages, so that: