diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt index 2c5072c6f..04cbf471b 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt @@ -27,18 +27,21 @@ import mozilla.components.concept.engine.permission.SitePermissions.Status.NO_DE import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.session.TrackingProtectionUseCases import mozilla.components.feature.tabs.TabsUseCases +import mozilla.components.service.glean.testing.GleanTestRule import mozilla.components.support.test.mock import mozilla.components.support.test.robolectric.testContext import org.junit.After import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertSame import org.junit.Assert.assertTrue import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mozilla.fenix.GleanMetrics.TrackingProtection import org.mozilla.fenix.components.PermissionStorage -import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.directionsEq @@ -86,6 +89,9 @@ class DefaultQuickSettingsControllerTest { private lateinit var controller: DefaultQuickSettingsController + @get:Rule + val gleanRule = GleanTestRule(testContext) + @Before fun setUp() { MockKAnnotations.init(this) @@ -332,11 +338,12 @@ class DefaultQuickSettingsControllerTest { } isEnabled = false + assertFalse(TrackingProtection.exceptionAdded.testHasValue()) controller.handleTrackingProtectionToggled(isEnabled) + assertTrue(TrackingProtection.exceptionAdded.testHasValue()) verify { - metrics.track(Event.TrackingProtectionException) trackingProtectionUseCases.addException(tab.id) sessionUseCases.reload.invoke(tab.id) store.dispatch(TrackingProtectionAction.ToggleTrackingProtectionEnabled(isEnabled)) diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt index 078c95249..b75c7cb71 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt @@ -10,13 +10,16 @@ import androidx.core.view.isVisible import io.mockk.every import io.mockk.mockk import io.mockk.verify +import mozilla.components.service.glean.testing.GleanTestRule import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mozilla.fenix.GleanMetrics.TrackingProtection import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -38,6 +41,9 @@ class TrackingProtectionPanelViewTest { lastAccessedCategory = "" ) + @get:Rule + val gleanRule = GleanTestRule(testContext) + @Before fun setup() { container = FrameLayout(testContext) @@ -112,7 +118,11 @@ class TrackingProtectionPanelViewTest { @Test fun testCrossSiteTrackerClick() { every { testContext.components.analytics } returns mockk(relaxed = true) + assertFalse(TrackingProtection.etpTrackerList.testHasValue()) + view.binding.crossSiteTracking.performClick() + + assertTrue(TrackingProtection.etpTrackerList.testHasValue()) verify { interactor.openDetails(CROSS_SITE_TRACKING_COOKIES, categoryBlocked = true) } view.binding.crossSiteTrackingLoaded.performClick()