commit d298cbe891298a42766ee0696de84c8510b29bb2 parent b51f6452afdf8e3b5f93d432481114ce1ee9df7f Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Fri, 7 Nov 2025 13:53:37 +0000 Bug 1998801 - Remove redundant null-safety after prior null checks. r=android-reviewers,mcarare Differential Revision: https://phabricator.services.mozilla.com/D271678 Diffstat:
26 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt @@ -1593,7 +1593,7 @@ class GeckoEngineSessionTest { TrackingCategory.TEST, ) - assertTrue(trackerBlocked!!.trackingCategories.containsAll(expectedBlockedCategories)) + assertTrue(trackerBlocked.trackingCategories.containsAll(expectedBlockedCategories)) var trackerLoaded: Tracker? = null engineSession.register( @@ -1624,7 +1624,7 @@ class GeckoEngineSessionTest { ) assertEquals("tracker1", trackerLoaded!!.url) - assertTrue(trackerLoaded!!.cookiePolicies.containsAll(expectedCookieCategories)) + assertTrue(trackerLoaded.cookiePolicies.containsAll(expectedCookieCategories)) contentBlockingDelegate.value.onContentLoaded( geckoSession, @@ -1632,7 +1632,7 @@ class GeckoEngineSessionTest { ) assertTrue( - trackerLoaded!!.cookiePolicies.containsAll( + trackerLoaded.cookiePolicies.containsAll( listOf( CookiePolicy.ACCEPT_ALL, ), @@ -4140,9 +4140,9 @@ class GeckoEngineSessionTest { assertNull(observedFallbackUrl) assertNull(observedAppName) assertNotNull(observedTriggeredByRedirect) - assertFalse(observedTriggeredByRedirect!!) + assertFalse(observedTriggeredByRedirect) assertNotNull(observedTriggeredByWebContent) - assertFalse(observedTriggeredByWebContent!!) + assertFalse(observedTriggeredByWebContent) assertEquals("sample:about", observedOnLoadRequestUrl) } @@ -4339,7 +4339,7 @@ class GeckoEngineSessionTest { assertNotNull(receivedWindowRequest) assertEquals("mozilla.org", receivedWindowRequest!!.url) - assertEquals(WindowRequest.Type.OPEN, receivedWindowRequest!!.type) + assertEquals(WindowRequest.Type.OPEN, receivedWindowRequest.type) } @Test @@ -4362,7 +4362,7 @@ class GeckoEngineSessionTest { assertNotNull(receivedWindowRequest) assertSame(engineSession, receivedWindowRequest!!.prepare()) - assertEquals(WindowRequest.Type.CLOSE, receivedWindowRequest!!.type) + assertEquals(WindowRequest.Type.CLOSE, receivedWindowRequest.type) } class MockSecurityInformation( diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineTest.kt @@ -2774,7 +2774,7 @@ class GeckoEngineTest { assertEquals("www.tracker.com", trackerLog.url) assertTrue(trackerLog.blockedCategories.contains(TrackingCategory.MOZILLA_SOCIAL)) - var trackerLog2 = trackersLog!![1] + var trackerLog2 = trackersLog[1] assertFalse(trackerLog2.cookiesHasBeenBlocked) assertEquals("www.tracker2.com", trackerLog2.url) assertTrue(trackerLog2.loadedCategories.contains(TrackingCategory.MOZILLA_SOCIAL)) @@ -2787,12 +2787,12 @@ class GeckoEngineTest { engine.getTrackersLog(mockSession, onSuccess = { trackersLog = it }) logEntriesResult.complete(createSocialTrackersLogEntryList()) - trackerLog = trackersLog!!.first() + trackerLog = trackersLog.first() assertTrue(trackerLog.cookiesHasBeenBlocked) assertEquals("www.tracker.com", trackerLog.url) assertTrue(trackerLog.blockedCategories.contains(TrackingCategory.MOZILLA_SOCIAL)) - trackerLog2 = trackersLog!![1] + trackerLog2 = trackersLog[1] assertFalse(trackerLog2.cookiesHasBeenBlocked) assertEquals("www.tracker2.com", trackerLog2.url) assertTrue(trackerLog2.loadedCategories.contains(TrackingCategory.MOZILLA_SOCIAL)) diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoTrackingProtectionExceptionStorageTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoTrackingProtectionExceptionStorageTest.kt @@ -232,7 +232,7 @@ class GeckoTrackingProtectionExceptionStorageTest { shadowOf(getMainLooper()).idle() assertTrue(exceptionList!!.isNotEmpty()) - val exception = exceptionList!!.first() as GeckoTrackingProtectionException + val exception = exceptionList.first() as GeckoTrackingProtectionException assertEquals("https://example.com/", exception.url) assertEquals(contentPermission, exception.contentPermission) diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt @@ -1515,11 +1515,11 @@ class GeckoPromptDelegateTest { geckoPrompt = geckoPopupPrompt() promptDelegate.onPopupPrompt(mock(), geckoPrompt) - request!!.onDeny() + request.onDeny() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) whenever(geckoPrompt.isComplete).thenReturn(true) - request!!.onDeny() + request.onDeny() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) } @@ -1555,11 +1555,11 @@ class GeckoPromptDelegateTest { geckoPrompt = geckoRedirectPrompt() promptDelegate.onRedirectPrompt(mock(), geckoPrompt) - request!!.onDeny() + request.onDeny() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) whenever(geckoPrompt.isComplete).thenReturn(true) - request!!.onDeny() + request.onDeny() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) } @@ -1581,21 +1581,21 @@ class GeckoPromptDelegateTest { promptDelegate.onBeforeUnloadPrompt(mock(), geckoPrompt) assertEquals(request!!.title, "") - request!!.onLeave() + request.onLeave() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.ALLOW)) whenever(geckoPrompt.isComplete).thenReturn(true) - request!!.onLeave() + request.onLeave() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.ALLOW)) geckoPrompt = geckoBeforeUnloadPrompt() promptDelegate.onBeforeUnloadPrompt(mock(), geckoPrompt) - request!!.onStay() + request.onStay() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) whenever(geckoPrompt.isComplete).thenReturn(true) - request!!.onStay() + request.onStay() verify(geckoPrompt, times(1)).confirm(eq(AllowOrDeny.DENY)) } @@ -1671,13 +1671,13 @@ class GeckoPromptDelegateTest { onFailureWasCalled = true } - request!!.onFailure() + request.onFailure() shadowOf(getMainLooper()).idle() assertTrue(onFailureWasCalled) whenever(geckoPrompt.isComplete).thenReturn(true) onFailureWasCalled = false - request!!.onFailure() + request.onFailure() shadowOf(getMainLooper()).idle() assertFalse(onFailureWasCalled) @@ -1688,7 +1688,7 @@ class GeckoPromptDelegateTest { onDismissWasCalled = true } - request!!.onDismiss() + request.onDismiss() shadowOf(getMainLooper()).idle() assertTrue(onDismissWasCalled) } diff --git a/mobile/android/android-components/components/browser/engine-system/src/test/java/mozilla/components/browser/engine/system/SystemEngineSessionTest.kt b/mobile/android/android-components/components/browser/engine-system/src/test/java/mozilla/components/browser/engine/system/SystemEngineSessionTest.kt @@ -101,15 +101,15 @@ class SystemEngineSessionTest { assertNotNull(loadHeaders) assertEquals(1, loadHeaders!!.size) - assertTrue(loadHeaders!!.containsKey("X-Requested-With")) - assertEquals("", loadHeaders!!["X-Requested-With"]) + assertTrue(loadHeaders.containsKey("X-Requested-With")) + assertEquals("", loadHeaders["X-Requested-With"]) val extraHeaders = mapOf("X-Extra-Header" to "true") engineSession.loadUrl("http://mozilla.org", additionalHeaders = extraHeaders) assertNotNull(loadHeaders) - assertEquals(2, loadHeaders!!.size) - assertTrue(loadHeaders!!.containsKey("X-Extra-Header")) - assertEquals("true", loadHeaders!!["X-Extra-Header"]) + assertEquals(2, loadHeaders.size) + assertTrue(loadHeaders.containsKey("X-Extra-Header")) + assertEquals("true", loadHeaders["X-Extra-Header"]) } @Test diff --git a/mobile/android/android-components/components/browser/engine-system/src/test/java/mozilla/components/browser/engine/system/SystemEngineViewTest.kt b/mobile/android/android-components/components/browser/engine-system/src/test/java/mozilla/components/browser/engine/system/SystemEngineViewTest.kt @@ -621,12 +621,12 @@ class SystemEngineViewTest { whenever(blockedRequest.url).thenReturn("http://analyticsTest1.com/".toUri()) webViewClient.shouldInterceptRequest(engineSession.webView, blockedRequest) - assertTrue(trackerBlocked!!.trackingCategories.first() == TrackingCategory.ANALYTICS) + assertTrue(trackerBlocked.trackingCategories.first() == TrackingCategory.ANALYTICS) whenever(blockedRequest.url).thenReturn("http://www.socialtest1.com/".toUri()) webViewClient.shouldInterceptRequest(engineSession.webView, blockedRequest) - assertTrue(trackerBlocked!!.trackingCategories.first() == TrackingCategory.SOCIAL) + assertTrue(trackerBlocked.trackingCategories.first() == TrackingCategory.SOCIAL) SystemEngineView.urlMatcher = null } diff --git a/mobile/android/android-components/components/browser/errorpages/src/test/java/mozilla/components/browser/errorpages/ErrorPagesTest.kt b/mobile/android/android-components/components/browser/errorpages/src/test/java/mozilla/components/browser/errorpages/ErrorPagesTest.kt @@ -91,7 +91,7 @@ class ErrorPagesTest { ) val expectedImageName = if (errorType.imageNameRes != null) { - testContext.resources.getString(errorType.imageNameRes!!) + ".svg" + testContext.resources.getString(errorType.imageNameRes) + ".svg" } else { "" } diff --git a/mobile/android/android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/loader/NonBlockingHttpIconLoaderTest.kt b/mobile/android/android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/loader/NonBlockingHttpIconLoaderTest.kt @@ -97,7 +97,7 @@ class NonBlockingHttpIconLoaderTest { assertEquals("Hello World!", downloadedResource) assertSame(Icon.Source.DOWNLOAD, ((callbackIcon as IconLoader.Result.BytesResult).source)) assertTrue(callbackResource!!.url.endsWith("/some/path")) - assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource?.type) + assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource.type) assertSame(iconRequest, callbackIconRequest) } finally { server.shutdown() @@ -203,7 +203,7 @@ class NonBlockingHttpIconLoaderTest { assertEquals(IconLoader.Result.NoResult, callbackIcon) assertNotNull(callbackIconRequest) assertEquals("https://www.example.org", callbackResource!!.url) - assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource?.type) + assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource.type) } @Test @@ -261,7 +261,7 @@ class NonBlockingHttpIconLoaderTest { assertEquals(IconLoader.Result.NoResult, callbackIcon) assertNotNull(callbackIconRequest) assertEquals("https://www.example.org", callbackResource!!.url) - assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource?.type) + assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource.type) } @Test @@ -300,7 +300,7 @@ class NonBlockingHttpIconLoaderTest { assertEquals(IconLoader.Result.NoResult, callbackIcon) assertNotNull(callbackIconRequest) assertEquals("https://www.example.org", callbackResource!!.url) - assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource?.type) + assertSame(IconRequest.Resource.Type.APPLE_TOUCH_ICON, callbackResource.type) } @Test diff --git a/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/action/SearchActionTest.kt b/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/action/SearchActionTest.kt @@ -266,7 +266,7 @@ class SearchActionTest { assertNotNull(state.search.region) assertEquals("DE", state.search.region!!.home) - assertEquals("FR", state.search.region!!.current) + assertEquals("FR", state.search.region.current) } @Test diff --git a/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesBookmarksStorageTest.kt b/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesBookmarksStorageTest.kt @@ -132,7 +132,7 @@ class PlacesBookmarksStorageTest { val separatorGuid = bookmarks.addSeparator(folderGuid, 1u).getOrNull()!! with(bookmarks.getTree(folderGuid).getOrNull()!!) { - assertEquals(2, this!!.children!!.size) + assertEquals(2, this.children!!.size) assertEquals(BookmarkNodeType.SEPARATOR, this.children!![1].type) } diff --git a/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesHistoryStorageTest.kt b/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesHistoryStorageTest.kt @@ -692,10 +692,10 @@ class PlacesHistoryStorageTest { storage.sync(SyncAuthInfo("kid", "token", 123L, "key", "serverUrl")) assertEquals("kid", passedAuthInfo!!.kid) - assertEquals("serverUrl", passedAuthInfo!!.tokenServerUrl) - assertEquals("token", passedAuthInfo!!.fxaAccessToken) - assertEquals(123L, passedAuthInfo!!.fxaAccessTokenExpiresAt) - assertEquals("key", passedAuthInfo!!.syncKey) + assertEquals("serverUrl", passedAuthInfo.tokenServerUrl) + assertEquals("token", passedAuthInfo.fxaAccessToken) + assertEquals(123L, passedAuthInfo.fxaAccessTokenExpiresAt) + assertEquals("key", passedAuthInfo.syncKey) } @Test diff --git a/mobile/android/android-components/components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/edit/EditToolbarTest.kt b/mobile/android/android-components/components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/edit/EditToolbarTest.kt @@ -59,7 +59,7 @@ class EditToolbarTest { latch.await() assertEquals("Hello", invokedWithParams!![0]) - assertTrue(invokedWithParams!![1] is AutocompleteDelegate) + assertTrue(invokedWithParams[1] is AutocompleteDelegate) } @Test @@ -82,7 +82,7 @@ class EditToolbarTest { // Serialize here for the sake of tests. latch.await() assertEquals("Test", invokedWithParams!![0]) - assertTrue(invokedWithParams!![1] is AutocompleteDelegate) + assertTrue(invokedWithParams[1] is AutocompleteDelegate) } @Test diff --git a/mobile/android/android-components/components/concept/fetch/src/test/java/mozilla/components/concept/fetch/RequestTest.kt b/mobile/android/android-components/components/concept/fetch/src/test/java/mozilla/components/concept/fetch/RequestTest.kt @@ -56,10 +56,10 @@ class RequestTest { assertEquals(Request.Method.POST, request.method) assertEquals(10, request.connectTimeout!!.first) - assertEquals(TimeUnit.SECONDS, request.connectTimeout!!.second) + assertEquals(TimeUnit.SECONDS, request.connectTimeout.second) assertEquals(1, request.readTimeout!!.first) - assertEquals(TimeUnit.MINUTES, request.readTimeout!!.second) + assertEquals(TimeUnit.MINUTES, request.readTimeout.second) assertEquals("Hello World!", request.body!!.useStream { it.bufferedReader().readText() }) assertEquals(Request.Redirect.MANUAL, request.redirect) diff --git a/mobile/android/android-components/components/feature/addons/src/test/java/AddonManagerTest.kt b/mobile/android/android-components/components/feature/addons/src/test/java/AddonManagerTest.kt @@ -170,8 +170,8 @@ class AddonManagerTest { assertEquals("ext1", addon1.installedState!!.id) assertTrue(addon1.isEnabled()) assertFalse(addon1.isDisabledAsUnsupported()) - assertNull(addon1.installedState!!.optionsPageUrl) - assertFalse(addon1.installedState!!.openOptionsPageInTab) + assertNull(addon1.installedState.optionsPageUrl) + assertFalse(addon1.installedState.openOptionsPageInTab) // ext2 should not be installed. val addon2 = addons.find { it.id == "ext2" }!! @@ -186,8 +186,8 @@ class AddonManagerTest { assertTrue(addon3.isSupported()) assertFalse(addon3.isEnabled()) assertTrue(addon3.isDisabledAsUnsupported()) - assertEquals("http://options-page.moz", addon3.installedState!!.optionsPageUrl) - assertTrue(addon3.installedState!!.openOptionsPageInTab) + assertEquals("http://options-page.moz", addon3.installedState.optionsPageUrl) + assertTrue(addon3.installedState.openOptionsPageInTab) // ext4 should be installed. val addon4 = addons.find { it.id == "ext4" }!! @@ -196,8 +196,8 @@ class AddonManagerTest { assertEquals("ext4", addon4.installedState!!.id) assertTrue(addon4.isEnabled()) assertFalse(addon4.isDisabledAsUnsupported()) - assertNull(addon4.installedState!!.optionsPageUrl) - assertFalse(addon4.installedState!!.openOptionsPageInTab) + assertNull(addon4.installedState.optionsPageUrl) + assertFalse(addon4.installedState.openOptionsPageInTab) // ext5 should be installed. val addon5 = addons.find { it.id == "ext5" }!! @@ -206,8 +206,8 @@ class AddonManagerTest { assertEquals("ext5", addon5.installedState!!.id) assertTrue(addon5.isEnabled()) assertFalse(addon5.isDisabledAsUnsupported()) - assertNull(addon5.installedState!!.optionsPageUrl) - assertFalse(addon5.installedState!!.openOptionsPageInTab) + assertNull(addon5.installedState.optionsPageUrl) + assertFalse(addon5.installedState.openOptionsPageInTab) // ext6 should be installed. val addon6 = addons.find { it.id == "ext6" }!! @@ -216,8 +216,8 @@ class AddonManagerTest { assertEquals("ext6", addon6.installedState!!.id) assertTrue(addon6.isEnabled()) assertFalse(addon6.isDisabledAsUnsupported()) - assertNull(addon6.installedState!!.optionsPageUrl) - assertFalse(addon6.installedState!!.openOptionsPageInTab) + assertNull(addon6.installedState.optionsPageUrl) + assertFalse(addon6.installedState.openOptionsPageInTab) } @Test @@ -595,7 +595,7 @@ class AddonManagerTest { onSuccessCaptor.value.invoke(extension) assertNotNull(installedAddon) assertEquals(addon.id, installedAddon!!.id) - assertEquals("nameFromMetadata", installedAddon!!.translateName(testContext)) + assertEquals("nameFromMetadata", installedAddon.translateName(testContext)) assertTrue(manager.pendingAddonActions.isEmpty()) } @@ -673,7 +673,7 @@ class AddonManagerTest { manager.uninstallAddon(addon, onError = errorCallback) verify(engine, never()).uninstallWebExtension(any(), any(), onErrorCaptor.capture()) assertNotNull(throwable!!) - assertEquals("Addon is not installed", throwable!!.localizedMessage) + assertEquals("Addon is not installed", throwable.localizedMessage) // Install extension and try again val extension: WebExtension = mock() @@ -687,8 +687,8 @@ class AddonManagerTest { manager.uninstallAddon(installedAddon, onError = errorCallback) verify(engine).uninstallWebExtension(eq(extension), any(), onErrorCaptor.capture()) onErrorCaptor.value.invoke(addon.id, IllegalStateException("test")) - assertNotNull(throwable!!) - assertEquals("test", throwable!!.localizedMessage) + assertNotNull(throwable) + assertEquals("test", throwable.localizedMessage) assertEquals(msg, addon.id) assertTrue(manager.pendingAddonActions.isEmpty()) } @@ -729,10 +729,10 @@ class AddonManagerTest { onSuccessCaptor.value.invoke(extension) assertNotNull(updateAddon) assertEquals(addon.id, updateAddon!!.id) - assertEquals("permission1", updateAddon!!.optionalPermissions.first().name) - assertEquals(true, updateAddon!!.optionalPermissions.first().granted) - assertEquals("origin", updateAddon!!.optionalOrigins.first().name) - assertEquals(true, updateAddon!!.optionalOrigins.first().granted) + assertEquals("permission1", updateAddon.optionalPermissions.first().name) + assertEquals(true, updateAddon.optionalPermissions.first().granted) + assertEquals("origin", updateAddon.optionalOrigins.first().name) + assertEquals(true, updateAddon.optionalOrigins.first().granted) assertTrue(manager.pendingAddonActions.isEmpty()) } @@ -849,7 +849,7 @@ class AddonManagerTest { manager.enableAddon(addon, onError = errorCallback) verify(engine, never()).enableWebExtension(any(), any(), any(), onErrorCaptor.capture()) assertNotNull(throwable!!) - assertEquals("Addon is not installed", throwable!!.localizedMessage) + assertEquals("Addon is not installed", throwable.localizedMessage) // Install extension and try again val extension: WebExtension = mock() @@ -863,8 +863,8 @@ class AddonManagerTest { manager.enableAddon(installedAddon, source = EnableSource.APP_SUPPORT, onError = errorCallback) verify(engine).enableWebExtension(eq(extension), eq(EnableSource.APP_SUPPORT), any(), onErrorCaptor.capture()) onErrorCaptor.value.invoke(IllegalStateException("test")) - assertNotNull(throwable!!) - assertEquals("test", throwable!!.localizedMessage) + assertNotNull(throwable) + assertEquals("test", throwable.localizedMessage) assertTrue(manager.pendingAddonActions.isEmpty()) } @@ -914,7 +914,7 @@ class AddonManagerTest { manager.disableAddon(addon, onError = errorCallback) verify(engine, never()).disableWebExtension(any(), any(), any(), onErrorCaptor.capture()) assertNotNull(throwable!!) - assertEquals("Addon is not installed", throwable!!.localizedMessage) + assertEquals("Addon is not installed", throwable.localizedMessage) // Install extension and try again val extension: WebExtension = mock() @@ -928,8 +928,8 @@ class AddonManagerTest { manager.disableAddon(installedAddon, onError = errorCallback) verify(engine).disableWebExtension(eq(extension), any(), any(), onErrorCaptor.capture()) onErrorCaptor.value.invoke(IllegalStateException("test")) - assertNotNull(throwable!!) - assertEquals("test", throwable!!.localizedMessage) + assertNotNull(throwable) + assertEquals("test", throwable.localizedMessage) assertTrue(manager.pendingAddonActions.isEmpty()) } diff --git a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt @@ -147,7 +147,7 @@ class AMOAddonsProviderTest { // Ratings assertEquals(4.7003F, addon.rating!!.average, 0.7003F) - assertEquals(4433, addon.rating!!.reviews) + assertEquals(4433, addon.rating.reviews) verify(client).fetch( Request( @@ -673,7 +673,7 @@ class AMOAddonsProviderTest { ) // Ratings assertEquals(4.7825F, addon.rating!!.average, 0.7825F) - assertEquals(4101, addon.rating!!.reviews) + assertEquals(4101, addon.rating.reviews) assertEquals( "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", addon.ratingUrl, diff --git a/mobile/android/android-components/components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/AwesomeBarFeatureTest.kt b/mobile/android/android-components/components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/AwesomeBarFeatureTest.kt @@ -58,11 +58,11 @@ class AwesomeBarFeatureTest { verify(awesomeBar).onInputStarted() - listener!!.onTextChanged("Hello") + listener.onTextChanged("Hello") verify(awesomeBar).onInputChanged("Hello") - listener!!.onStopEditing() + listener.onStopEditing() verify(awesomeBar).onInputCancelled() } @@ -297,7 +297,7 @@ class AwesomeBarFeatureTest { assertFalse(completeInvoked) startInvoked = false - listener!!.onStopEditing() + listener.onStopEditing() assertFalse(startInvoked) assertTrue(completeInvoked) @@ -323,8 +323,8 @@ class AwesomeBarFeatureTest { assertTrue("Nothing to cancel when editing has started.", listener!!.onCancelEditing()) - listener!!.onStartEditing() + listener.onStartEditing() - assertFalse("Cancelling because edit has started.", listener!!.onCancelEditing()) + assertFalse("Cancelling because edit has started.", listener.onCancelEditing()) } } diff --git a/mobile/android/android-components/components/feature/customtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabConfigHelperTest.kt b/mobile/android/android-components/components/feature/customtabs/src/test/java/mozilla/components/feature/customtabs/CustomTabConfigHelperTest.kt @@ -432,7 +432,7 @@ class CustomTabConfigHelperTest { customTabMenuInsertIndex = 1, ) - assertEquals(5, customTabMenu!!.items.size) + assertEquals(5, customTabMenu.items.size) assertEquals(defaultItems[0], customTabMenu.items[0]) assertTrue(customTabMenu.items[1] is SimpleBrowserMenuItem) assertTrue(customTabMenu.items[2] is SimpleBrowserMenuItem) diff --git a/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/icons/SearchConfigIconsParserTest.kt b/mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/icons/SearchConfigIconsParserTest.kt @@ -61,10 +61,10 @@ class SearchConfigIconsParserTest { assertNotNull(result.attachment) assertEquals("icon.png", result.attachment!!.filename) - assertEquals("image/png", result.attachment!!.mimetype) - assertEquals("location/path", result.attachment!!.location) - assertEquals("abc123hash", result.attachment!!.hash) - assertEquals(1024u, result.attachment!!.size) + assertEquals("image/png", result.attachment.mimetype) + assertEquals("location/path", result.attachment.location) + assertEquals("abc123hash", result.attachment.hash) + assertEquals(1024u, result.attachment.size) } @Test diff --git a/mobile/android/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/FullScreenFeatureTest.kt b/mobile/android/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/FullScreenFeatureTest.kt @@ -252,7 +252,7 @@ class FullScreenFeatureTest { ).joinBlocking() assertEquals(0, viewPort) - assertFalse(fullscreen!!) + assertFalse(fullscreen) } @Test @@ -315,12 +315,12 @@ class FullScreenFeatureTest { ).joinBlocking() assertEquals(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER, viewPort) - assertTrue(fullscreen!!) + assertTrue(fullscreen) feature.start() assertEquals(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES, viewPort) - assertFalse(fullscreen!!) + assertFalse(fullscreen) } @Test @@ -412,7 +412,7 @@ class FullScreenFeatureTest { ).joinBlocking() assertEquals(0, viewPort) - assertFalse(fullscreen!!) + assertFalse(fullscreen) } @Test diff --git a/mobile/android/android-components/components/support/base/src/test/java/mozilla/components/support/base/facts/FactTest.kt b/mobile/android/android-components/components/support/base/src/test/java/mozilla/components/support/base/facts/FactTest.kt @@ -57,9 +57,9 @@ class FactTest { assertNotNull(fact.metadata) assertEquals(2, fact.metadata!!.size) - assertTrue(fact.metadata!!.contains("key1")) - assertTrue(fact.metadata!!.contains("key2")) - assertEquals("value1", fact.metadata!!["key1"]) - assertEquals("value2", fact.metadata!!["key2"]) + assertTrue(fact.metadata.contains("key1")) + assertTrue(fact.metadata.contains("key2")) + assertEquals("value1", fact.metadata["key1"]) + assertEquals("value2", fact.metadata["key2"]) } } diff --git a/mobile/android/android-components/components/support/webextensions/src/test/java/mozilla/components/support/webextensions/WebExtensionPopupObserverTest.kt b/mobile/android/android-components/components/support/webextensions/src/test/java/mozilla/components/support/webextensions/WebExtensionPopupObserverTest.kt @@ -44,7 +44,7 @@ class WebExtensionPopupObserverTest { store.dispatch(WebExtensionAction.UpdatePopupSessionAction(extensionId, popupSession = engineSession)).joinBlocking() assertNotNull(extensionOpeningPopup) assertEquals(extensionId, extensionOpeningPopup!!.id) - assertEquals(engineSession, extensionOpeningPopup!!.popupSession) + assertEquals(engineSession, extensionOpeningPopup.popupSession) // Verify that stopped feature does not observe and forward requests to open popup extensionOpeningPopup = null diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/addons/ui/AddonPermissionsScreenTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/addons/ui/AddonPermissionsScreenTest.kt @@ -120,8 +120,8 @@ class AddonPermissionsScreenTest { assertNull(request) composeTestRule.onNodeWithText("Read and modify bookmarks").performClick() assertArrayEquals(listOf("bookmarks").toTypedArray(), request!!.optionalPermissions.toTypedArray()) - assertTrue(request!!.originPermissions.isEmpty()) - assertTrue(request!!.dataCollectionPermissions.isEmpty()) + assertTrue(request.originPermissions.isEmpty()) + assertTrue(request.dataCollectionPermissions.isEmpty()) composeTestRule.onNodeWithText("This extension doesn’t require any permissions.").assertIsNotDisplayed() } @@ -264,8 +264,8 @@ class AddonPermissionsScreenTest { assertNull(request) composeTestRule.onNodeWithText("Share health information with extension developer").performClick() assertTrue(request!!.optionalPermissions.isEmpty()) - assertTrue(request!!.originPermissions.isEmpty()) - assertArrayEquals(listOf("healthInfo").toTypedArray(), request!!.dataCollectionPermissions.toTypedArray()) + assertTrue(request.originPermissions.isEmpty()) + assertArrayEquals(listOf("healthInfo").toTypedArray(), request.dataCollectionPermissions.toTypedArray()) composeTestRule.onNodeWithText("This extension doesn’t require any permissions.").assertIsNotDisplayed() } diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/AppAndSystemHelper.kt @@ -160,7 +160,7 @@ object AppAndSystemHelper { "clearDownloadsFolder: Before cleanup: Downloads storage contains: ${files.size} file(s).", ) // Delete all files in the folder - for (file in files!!) { + for (file in files) { Log.i( TAG, "clearDownloadsFolder: Trying to delete $file from \"DOWNLOADS\" folder.", diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/MockWebServer.kt @@ -27,7 +27,7 @@ object MockWebServerHelper { messages.forEach { message -> val response = MockResponse().setBody("<html><body>$message</body></html>") mockServer.enqueue(response) - val endpoint = mockServer.url(uniquePath++.toString()).toString().toUri()!! + val endpoint = mockServer.url(uniquePath++.toString()).toString().toUri() uris += endpoint } return uris diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/appstate/setup/checklist/SetupChecklistReducerTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/appstate/setup/checklist/SetupChecklistReducerTest.kt @@ -73,7 +73,7 @@ class SetupChecklistReducerTest { // Verify that the expanded group is expanded, and the other one is not assertTrue((appState.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).isExpanded) - assertFalse((appState.setupChecklistState!!.checklistItems[1] as ChecklistItem.Group).isExpanded) + assertFalse((appState.setupChecklistState.checklistItems[1] as ChecklistItem.Group).isExpanded) val reducedState = SetupChecklistReducer.reduce( appState, @@ -82,7 +82,7 @@ class SetupChecklistReducerTest { // Verify that the expanded group was collapsed, and the other one got expanded assertFalse((reducedState.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).isExpanded) - assertTrue((reducedState.setupChecklistState!!.checklistItems[1] as ChecklistItem.Group).isExpanded) + assertTrue((reducedState.setupChecklistState.checklistItems[1] as ChecklistItem.Group).isExpanded) } @Test @@ -158,7 +158,7 @@ class SetupChecklistReducerTest { ) assertTrue((reducedState.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).tasks[0].isCompleted) - assertFalse((reducedState.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).tasks[1].isCompleted) + assertFalse((reducedState.setupChecklistState.checklistItems[0] as ChecklistItem.Group).tasks[1].isCompleted) val reducedState2 = SetupChecklistReducer.reduce( reducedState, @@ -166,6 +166,6 @@ class SetupChecklistReducerTest { ) assertFalse((reducedState2.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).tasks[0].isCompleted) - assertFalse((reducedState2.setupChecklistState!!.checklistItems[0] as ChecklistItem.Group).tasks[1].isCompleted) + assertFalse((reducedState2.setupChecklistState.checklistItems[0] as ChecklistItem.Group).tasks[1].isCompleted) } } diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuStoreTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuStoreTest.kt @@ -131,18 +131,18 @@ class MenuStoreTest { ) assertEquals(selectedTab, state.browserMenuState!!.selectedTab) - assertNull(state.browserMenuState!!.bookmarkState.guid) - assertFalse(state.browserMenuState!!.bookmarkState.isBookmarked) - assertFalse(state.browserMenuState!!.isPinned) + assertNull(state.browserMenuState.bookmarkState.guid) + assertFalse(state.browserMenuState.bookmarkState.isBookmarked) + assertFalse(state.browserMenuState.isPinned) var newState = state.copyWithBrowserMenuState { it.copy(selectedTab = firefoxTab) } assertEquals(firefoxTab, newState.browserMenuState!!.selectedTab) - assertNull(state.browserMenuState!!.bookmarkState.guid) - assertFalse(state.browserMenuState!!.bookmarkState.isBookmarked) - assertFalse(state.browserMenuState!!.isPinned) + assertNull(state.browserMenuState.bookmarkState.guid) + assertFalse(state.browserMenuState.bookmarkState.isBookmarked) + assertFalse(state.browserMenuState.isPinned) val bookmarkState = BookmarkState(guid = "id", isBookmarked = true) val isPinned = true @@ -151,8 +151,8 @@ class MenuStoreTest { } assertEquals(firefoxTab, newState.browserMenuState!!.selectedTab) - assertEquals(bookmarkState, newState.browserMenuState!!.bookmarkState) - assertEquals(isPinned, newState.browserMenuState!!.isPinned) + assertEquals(bookmarkState, newState.browserMenuState.bookmarkState) + assertEquals(isPinned, newState.browserMenuState.isPinned) } @Test