diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt index 1d818a273238..b3ab1f5160f9 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt @@ -23,7 +23,14 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.hasItem +import org.hamcrest.Matchers.lessThan +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.startsWith import org.junit.After import org.junit.Assume.assumeThat import org.junit.Before diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt index 8f0d7c73c453..6d279411c62b 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutocompleteTest.kt @@ -9,7 +9,10 @@ import android.os.Looper import android.view.KeyEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.Autocomplete.Address diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt index 6f4dc8bec72f..f3da84e2fff4 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AutofillDelegateTest.kt @@ -9,7 +9,11 @@ import android.util.SparseArray import android.view.KeyEvent import android.view.View import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThanOrEqualTo +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue import org.junit.Assume.assumeThat import org.junit.Before import org.junit.Ignore @@ -19,7 +23,9 @@ import org.junit.runners.Parameterized import org.mozilla.geckoview.Autofill import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.TextInputDelegate -import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.ShouldContinue +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay @RunWith(Parameterized::class) @MediumTest diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt index 9ee942f935cb..5ddfc6781490 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentBlockingControllerTest.kt @@ -9,7 +9,11 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.startsWith import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.ContentBlocking @@ -18,6 +22,7 @@ import org.mozilla.geckoview.ContentBlocking.CookieBannerMode import org.mozilla.geckoview.ContentBlockingController import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled + @RunWith(AndroidJUnit4::class) @MediumTest class ContentBlockingControllerTest : BaseSessionTest() { diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt index 65f76b3010a0..8ae9b8ec8cd8 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateChildTest.kt @@ -11,16 +11,20 @@ import android.content.ClipboardManager import android.content.Context import android.os.Build import android.os.SystemClock -import android.view.* +import android.view.InputDevice +import android.view.MotionEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* +import org.hamcrest.Matchers.arrayContainingInAnyOrder +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.startsWith import org.junit.Assert.assertNull import org.junit.Assume.assumeThat import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.GeckoSession.ContentDelegate.ContextElement import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt index c85e57eb813f..7d278208d367 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateMultipleSessionsTest.kt @@ -7,11 +7,11 @@ package org.mozilla.geckoview.test import androidx.annotation.AnyThread import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt index 77837cb079cb..6311697ea441 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ContentDelegateTest.kt @@ -11,18 +11,29 @@ import androidx.annotation.AnyThread import androidx.core.net.toUri import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.startsWith import org.json.JSONObject import org.junit.Assume.assumeThat import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.AllowOrDeny import org.mozilla.geckoview.ContentBlocking.CookieBannerMode import org.mozilla.geckoview.GeckoDisplay.SurfaceInfo +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.GeckoSession.NavigationDelegate import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest import org.mozilla.geckoview.GeckoSession.ProgressDelegate +import org.mozilla.geckoview.GeckoSessionSettings +import org.mozilla.geckoview.SlowScriptResponse +import org.mozilla.geckoview.WebResponse import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DisplayTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DisplayTest.kt index 86c8e9cac6e6..8db7d9c3b579 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DisplayTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DisplayTest.kt @@ -2,7 +2,7 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.notNullValue import org.junit.Test import org.junit.runner.RunWith diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt index 3143eb8ae277..982689820c74 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/DynamicToolbarTest.kt @@ -4,14 +4,15 @@ package org.mozilla.geckoview.test -import android.graphics.* // ktlint-disable no-wildcard-imports import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint import android.os.SystemClock import android.view.MotionEvent import androidx.core.graphics.createBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports import org.hamcrest.Matchers.closeTo import org.hamcrest.Matchers.equalTo import org.junit.Assume.assumeThat diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt index beff344ef703..a52e67b76036 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/FinderTest.kt @@ -6,7 +6,7 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.GeckoSession diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt index 4c12f03dabc5..df069c1ad5ed 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoAppShellTest.kt @@ -12,7 +12,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoResultTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoResultTest.kt index 41602d94935f..7a77188cbe9a 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoResultTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoResultTest.kt @@ -4,7 +4,7 @@ package org.mozilla.geckoview.test import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.Test import org.mozilla.geckoview.GeckoResult import org.mozilla.geckoview.test.util.Environment diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt index def4ba39ea54..83882705b8d4 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeckoSessionTestRuleTest.kt @@ -2,8 +2,6 @@ * Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -@file:Suppress("ktlint:standard:no-wildcard-imports") - package org.mozilla.geckoview.test import android.os.Handler @@ -12,7 +10,10 @@ import android.os.SystemClock import android.view.MotionEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.nullValue import org.json.JSONArray import org.json.JSONObject import org.junit.Assume.assumeThat @@ -30,7 +31,16 @@ import org.mozilla.geckoview.GeckoSession.ScrollDelegate import org.mozilla.geckoview.GeckoSession.SessionState import org.mozilla.geckoview.GeckoSessionSettings import org.mozilla.geckoview.WebRequestError -import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.ChildCrashedException +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.ClosedSessionAtStart +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.IgnoreCrash +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.RejectedPromiseException +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.Setting +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.ShouldContinue +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.TimeoutMillis +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.UiThreadUtils /** @@ -1952,6 +1962,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) { sessionRule.performTestEndCheck() } + @Suppress("ktlint:standard:annotation") @Test fun addExternalDelegateDuringNextWait() { mainSession.loadTestPath(HELLO_HTML_PATH) sessionRule.waitForPageStop() @@ -1970,7 +1981,7 @@ class GeckoSessionTestRuleTest : BaseSessionTest(noErrorCollector = true) { mainSession.reload() mainSession.waitForPageStop() - mainSession.forCallbacksDuringWait(Runnable @AssertCalled(count = 1) {}) // ktlint-disable annotation + mainSession.forCallbacksDuringWait(Runnable @AssertCalled(count = 1) {}) assertThat("Delegate should be unregistered after wait", delegate, nullValue()) } diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt index 4deac5fb66fa..26e61add772f 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/GeolocationTest.kt @@ -8,7 +8,6 @@ import android.location.LocationManager import android.os.Handler import android.os.Looper import android.util.Log -import androidx.lifecycle.* // ktlint-disable no-wildcard-imports import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner @@ -17,7 +16,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import androidx.test.platform.app.InstrumentationRegistry import org.hamcrest.CoreMatchers.equalTo -import org.hamcrest.core.IsNot.not import org.json.JSONObject import org.junit.After import org.junit.Before diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt index d0030c472101..9c5023b9b01e 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt @@ -6,7 +6,8 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.notNullValue import org.junit.Test import org.junit.runner.RunWith import org.mozilla.gecko.util.ImageResource diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt index 4005732d3554..65ca008fc95a 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InputResultDetailTest.kt @@ -4,7 +4,7 @@ import android.os.SystemClock import android.view.MotionEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.GeckoResult diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InteractiveWidgetTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InteractiveWidgetTest.kt index badd528290b2..a6bf9b2231ec 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InteractiveWidgetTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/InteractiveWidgetTest.kt @@ -5,14 +5,17 @@ package org.mozilla.geckoview.test import android.content.Context -import android.graphics.* // ktlint-disable no-wildcard-imports import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Rect import android.view.inputmethod.InputMethodManager import androidx.core.graphics.createBitmap import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt index 608681d7d9b9..75e8479fba8f 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/LocaleTest.kt @@ -6,7 +6,9 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThanOrEqualTo +import org.hamcrest.Matchers.lessThanOrEqualTo import org.junit.Test import org.junit.runner.RunWith diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt index 397f30338fa1..da3b38189af1 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt @@ -6,7 +6,10 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThanOrEqualTo +import org.hamcrest.Matchers.notNullValue import org.junit.After import org.junit.Before import org.junit.Test diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt index ee890bacce4f..adf62452debf 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt @@ -11,13 +11,25 @@ import android.util.Base64 import android.view.KeyEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.nullValue +import org.hamcrest.Matchers.startsWith import org.json.JSONObject import org.junit.Assume.assumeThat import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.AllowOrDeny +import org.mozilla.geckoview.ContentBlocking +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoRuntimeSettings import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.GeckoSession.HistoryDelegate @@ -27,8 +39,16 @@ import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest import org.mozilla.geckoview.GeckoSession.PermissionDelegate import org.mozilla.geckoview.GeckoSession.ProgressDelegate import org.mozilla.geckoview.GeckoSession.TextInputDelegate +import org.mozilla.geckoview.GeckoSessionSettings +import org.mozilla.geckoview.WebExtension +import org.mozilla.geckoview.WebExtensionController +import org.mozilla.geckoview.WebRequestError import org.mozilla.geckoview.test.rule.GeckoSessionTestRule -import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.RejectedPromiseException +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.Setting +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.UiThreadUtils import java.io.ByteArrayOutputStream import java.util.concurrent.ThreadLocalRandom diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt index 2f9ba3d89bdd..b9b8cde4bde9 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OpenWindowTest.kt @@ -11,12 +11,16 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.gecko.util.ThreadUtils -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.AllowOrDeny +import org.mozilla.geckoview.GeckoResult import org.mozilla.geckoview.GeckoRuntime.ServiceWorkerDelegate +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.GeckoSession.NavigationDelegate import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest import org.mozilla.geckoview.GeckoSession.PermissionDelegate +import org.mozilla.geckoview.WebNotification +import org.mozilla.geckoview.WebNotificationDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt index 26ff3656599e..4764712e73e3 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt @@ -9,13 +9,15 @@ import android.content.res.Configuration import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.rules.RuleChain import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.AllowOrDeny +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.ContentDelegate import org.mozilla.geckoview.OrientationController import org.mozilla.geckoview.test.rule.GeckoSessionTestRule diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt index 7129361ff3e0..07cbeafa557b 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt @@ -5,7 +5,12 @@ import android.view.InputDevice import android.view.MotionEvent import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.greaterThanOrEqualTo +import org.hamcrest.Matchers.lessThan +import org.hamcrest.Matchers.lessThanOrEqualTo import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.GeckoResult @@ -15,7 +20,6 @@ import org.mozilla.geckoview.GeckoSession.ScrollPositionUpdate import org.mozilla.geckoview.PanZoomController import org.mozilla.geckoview.ScreenLength import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay -import java.lang.Math import kotlin.math.roundToInt @RunWith(AndroidJUnit4::class) diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt index 5d7d60ec6d07..383090132ff2 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProfilerControllerTest.kt @@ -1,7 +1,8 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan import org.json.JSONObject import org.junit.Test import org.junit.runner.RunWith diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt index 3721ba486718..d97cd2135454 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ProgressDelegateTest.kt @@ -8,7 +8,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import androidx.test.filters.MediumTest import junit.framework.TestCase.assertTrue -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.greaterThanOrEqualTo +import org.hamcrest.Matchers.lessThan +import org.hamcrest.Matchers.lessThanOrEqualTo +import org.hamcrest.Matchers.notNullValue import org.json.JSONObject import org.junit.Assume.assumeThat import org.junit.Test @@ -17,7 +24,9 @@ import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.NavigationDelegate import org.mozilla.geckoview.GeckoSession.PermissionDelegate.ContentPermission import org.mozilla.geckoview.GeckoSession.ProgressDelegate -import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate +import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay @RunWith(AndroidJUnit4::class) @MediumTest diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt index d566b2087dcc..c627bbe929e7 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PromptDelegateTest.kt @@ -9,7 +9,12 @@ import androidx.core.net.toUri import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.nullValue import org.junit.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt index 561c37cfc6e5..54c3d052c3ff 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/RuntimeSettingsTest.kt @@ -9,7 +9,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry import junit.framework.TestCase.assertTrue -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.closeTo +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.`is` +import org.hamcrest.Matchers.lessThan import org.junit.Assume.assumeThat import org.junit.Ignore import org.junit.Test diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt index 6283fa00716d..4538c34e3d18 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt @@ -4,16 +4,24 @@ package org.mozilla.geckoview.test -import android.graphics.* // ktlint-disable no-wildcard-imports import android.graphics.Bitmap import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Paint +import android.graphics.Shader +import android.graphics.SurfaceTexture import android.view.Surface import androidx.core.graphics.createBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports -import org.junit.Assert.* +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.lessThanOrEqualTo +import org.hamcrest.Matchers.notNullValue +import org.junit.Assert.assertTrue +import org.junit.Assert.fail import org.junit.Assume.assumeThat import org.junit.Test import org.junit.runner.RunWith @@ -27,7 +35,6 @@ import org.mozilla.geckoview.GeckoSession.ProgressDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.UiThreadUtils -import java.lang.IllegalStateException import kotlin.math.absoluteValue import kotlin.math.max diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt index 5cddd0382654..7aeb0e4db143 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt @@ -17,7 +17,12 @@ import androidx.test.filters.MediumTest import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import org.hamcrest.Matcher -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.arrayContainingInAnyOrder +import org.hamcrest.Matchers.both +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.hasToString +import org.hamcrest.Matchers.not import org.json.JSONArray import org.junit.Assume.assumeThat import org.junit.Before @@ -33,7 +38,21 @@ import org.mozilla.geckoview.GeckoResult import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.PromptDelegate import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate -import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_COLLAPSE_TO_END +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_COLLAPSE_TO_START +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_COPY +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_CUT +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_DELETE +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_HIDE +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_PASTE +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_PASTE_AS_PLAIN_TEXT +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_SELECT_ALL +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ACTION_UNSELECT +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.ClipboardPermission +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.FLAG_IS_COLLAPSED +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.FLAG_IS_EDITABLE +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.HIDE_REASON_NO_SELECTION +import org.mozilla.geckoview.GeckoSession.SelectionActionDelegate.Selection import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt index 50f64301fd53..d2af65594041 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/SessionLifecycleTest.kt @@ -7,7 +7,9 @@ package org.mozilla.geckoview.test import android.os.Bundle import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.lessThan import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.GeckoRuntimeSettings diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt index 592aa442f8dc..37cf7b245478 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/StorageControllerTest.kt @@ -6,7 +6,8 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.containsString +import org.hamcrest.Matchers.equalTo import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.ContentBlocking.CookieBannerMode.COOKIE_BANNER_MODE_DISABLED diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt index 6136594aa774..a420fc18df72 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TextInputDelegateTest.kt @@ -20,7 +20,9 @@ import androidx.core.net.toUri import androidx.test.filters.MediumTest import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue import org.junit.Assume.assumeThat import org.junit.Ignore import org.junit.Test diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TrustedRecursiveResolverTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TrustedRecursiveResolverTest.kt index f2fe3f898188..f03f42e4a109 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TrustedRecursiveResolverTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TrustedRecursiveResolverTest.kt @@ -6,7 +6,7 @@ package org.mozilla.geckoview.test import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.`is` import org.junit.Test import org.junit.runner.RunWith import org.mozilla.geckoview.GeckoRuntimeSettings diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt index f421193f3e3a..aa6e40538f93 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VerticalClippingTest.kt @@ -4,8 +4,10 @@ package org.mozilla.geckoview.test -import android.graphics.* // ktlint-disable no-wildcard-imports import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint import androidx.core.graphics.createBitmap import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorOhttpTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorOhttpTest.kt index c438495a9181..096b7588577b 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorOhttpTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorOhttpTest.kt @@ -8,7 +8,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoWebExecutor +import org.mozilla.geckoview.WebRequest +import org.mozilla.geckoview.WebRequestError import org.mozilla.geckoview.test.util.RuntimeCreator @RunWith(AndroidJUnit4::class) diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt index 5cc94e7bc9c7..d3d931ba31a2 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExecutorTest.kt @@ -10,7 +10,11 @@ import androidx.test.platform.app.InstrumentationRegistry import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.greaterThan +import org.hamcrest.Matchers.isEmptyOrNullString +import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.notNullValue import org.json.JSONObject import org.junit.After import org.junit.Assert.assertThrows @@ -19,17 +23,21 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized import org.mozilla.gecko.util.ThreadUtils -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoWebExecutor +import org.mozilla.geckoview.StorageController +import org.mozilla.geckoview.WebRequest +import org.mozilla.geckoview.WebRequestError +import org.mozilla.geckoview.WebResponse import org.mozilla.geckoview.test.util.RuntimeCreator import org.mozilla.geckoview.test.util.TestServer import java.io.IOException -import java.lang.IllegalStateException import java.math.BigInteger import java.net.UnknownHostException import java.nio.ByteBuffer import java.nio.charset.Charset import java.security.MessageDigest -import java.util.* // ktlint-disable no-wildcard-imports +import java.util.Random @MediumTest @RunWith(Parameterized::class) diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt index a6f0a6cd81b7..29af5bbf1a99 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt @@ -11,18 +11,46 @@ import org.hamcrest.Matchers.greaterThan import org.hamcrest.core.IsEqual.equalTo import org.hamcrest.core.StringEndsWith.endsWith import org.json.JSONObject -import org.junit.Assert.* // ktlint-disable no-wildcard-imports +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Assert.fail import org.junit.Assume.assumeThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.AllowOrDeny +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoRuntimeSettings +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.NavigationDelegate import org.mozilla.geckoview.GeckoSession.PermissionDelegate import org.mozilla.geckoview.GeckoSession.ProgressDelegate -import org.mozilla.geckoview.WebExtension.* // ktlint-disable no-wildcard-imports -import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoSessionSettings +import org.mozilla.geckoview.GeckoWebExecutor +import org.mozilla.geckoview.WebExtension +import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.CACHE +import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.COOKIES +import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.DOWNLOADS +import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.HISTORY +import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.LOCAL_STORAGE +import org.mozilla.geckoview.WebExtension.DisabledFlags +import org.mozilla.geckoview.WebExtension.Download +import org.mozilla.geckoview.WebExtension.DownloadDelegate +import org.mozilla.geckoview.WebExtension.DownloadInitData +import org.mozilla.geckoview.WebExtension.DownloadRequest +import org.mozilla.geckoview.WebExtension.InstallException +import org.mozilla.geckoview.WebExtension.MessageDelegate +import org.mozilla.geckoview.WebExtension.MessageSender +import org.mozilla.geckoview.WebExtension.PermissionPromptResponse +import org.mozilla.geckoview.WebExtensionController import org.mozilla.geckoview.WebExtensionController.EnableSource +import org.mozilla.geckoview.WebNotification +import org.mozilla.geckoview.WebNotificationDelegate import org.mozilla.geckoview.test.rule.GeckoSessionTestRule import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.RejectedPromiseException @@ -31,7 +59,8 @@ import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.WithDisplay import org.mozilla.geckoview.test.util.RuntimeCreator import org.mozilla.geckoview.test.util.UiThreadUtils import java.nio.charset.Charset -import java.util.* // ktlint-disable no-wildcard-imports +import java.util.Date +import java.util.UUID import java.util.concurrent.CancellationException import kotlin.collections.HashMap diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt index 88376af1c585..a805602ba11c 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebNotificationTest.kt @@ -3,7 +3,9 @@ package org.mozilla.geckoview.test import android.os.Parcel import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.not import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Before diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt index 609275526cb3..2d24a70c1f32 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebPushTest.kt @@ -9,14 +9,22 @@ import android.util.Base64 import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.* // ktlint-disable no-wildcard-imports +import org.hamcrest.Matchers.endsWith +import org.hamcrest.Matchers.equalTo +import org.hamcrest.Matchers.notNullValue +import org.hamcrest.Matchers.nullValue import org.json.JSONObject import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.geckoview.* // ktlint-disable no-wildcard-imports +import org.mozilla.geckoview.GeckoResult +import org.mozilla.geckoview.GeckoSession import org.mozilla.geckoview.GeckoSession.PermissionDelegate +import org.mozilla.geckoview.WebNotification +import org.mozilla.geckoview.WebNotificationDelegate +import org.mozilla.geckoview.WebPushDelegate +import org.mozilla.geckoview.WebPushSubscription import org.mozilla.geckoview.test.rule.GeckoSessionTestRule import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.RejectedPromiseException import java.security.KeyPair diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/TestServer.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/TestServer.kt index 28b1dfc10042..275f18001921 100644 --- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/TestServer.kt +++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/TestServer.kt @@ -14,7 +14,8 @@ import org.json.JSONObject import java.io.FileNotFoundException import java.math.BigInteger import java.security.MessageDigest -import java.util.* // ktlint-disable no-wildcard-imports +import java.util.Random +import java.util.Vector class TestServer @JvmOverloads constructor( context: Context,