Skip to content
This repository has been archived by the owner on Apr 17, 2021. It is now read-only.

Commit

Permalink
Closes #2543: fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Michelle Wong authored and liuche committed Jul 13, 2019
1 parent c9dd1b4 commit efb6a83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion app/src/main/java/org/mozilla/tv/firefox/ext/Locale.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.mozilla.tv.firefox.ext
import org.mozilla.tv.firefox.architecture.KillswitchLocales
import java.util.Locale


/**
* Returns true if the following is true for _any_ of the elements in [allowedLocales]:
* 1) Language == [this] language
Expand Down
8 changes: 3 additions & 5 deletions app/src/test/java/org/mozilla/tv/firefox/ext/LocaleKtTest.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.mozilla.tv.firefox.ext

import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkStatic
import io.mockk.verify
import org.junit.Assert.*
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
import org.mozilla.tv.firefox.architecture.KillswitchLocales
import java.util.*
Expand Down Expand Up @@ -43,7 +42,7 @@ class LocaleKtTest {

assertTrue(Locale.CANADA.languageAndMaybeCountryMatch(arrayOf(allowed)))
}

@Test
fun `WHEN an incorrect country AND an incorrect language are passed THEN should return false`() {
val allowed = Locale.GERMANY
Expand Down Expand Up @@ -107,5 +106,4 @@ class LocaleKtTest {
// Verify that languageAndMaybeCountryMatch is called with an array of locales (i.e., the overload)
locales.forEach { verify(exactly = 1) { it.languageAndMaybeCountryMatch(any<Array<Locale>>()) } }
}

}

0 comments on commit efb6a83

Please sign in to comment.