commit 9da4302a78ae37006dbbcaef22de9e43e9bd2967
author Xuanang Zhao <xuanangz@google.com> Tue Oct 18 09:12:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 09:12:31 2022 +0000
tree bf25c07ab59099d216bf6baf712d5e6baa104696
parent 0693ac72827edc99402e000d6bb0aab29fafe6d9
parent 50f229903e87277e8d3e35f28559333773df023a

Merge "Clean up ignored tests in Settings Slices provider."

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 9043974..c3b7821 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -61,12 +61,9 @@
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wifi.slice.WifiScanWorker;
-import com.android.settingslib.wifi.WifiTracker;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -100,7 +97,6 @@
 @Config(shadows = {ShadowUserManager.class, ShadowUtils.class,
         SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class,
         ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class,
-        SettingsSliceProviderTest.ShadowWifiScanWorker.class,
         SettingsSliceProviderTest.ShadowTheme.class})
 public class SettingsSliceProviderTest {
 
@@ -123,6 +119,7 @@
     private Context mContext;
     private SettingsSliceProvider mProvider;
     private ShadowPackageManager mPackageManager;
+
     @Mock
     private SliceManager mManager;
 
@@ -573,14 +570,6 @@
     }
 
     @Test
-    @Ignore
-    public void bindSlice_wifiSlice_returnsWifiSlice() {
-        final Slice wifiSlice = mProvider.onBindSlice(CustomSliceRegistry.WIFI_SLICE_URI);
-
-        assertThat(wifiSlice.getUri()).isEqualTo(CustomSliceRegistry.WIFI_SLICE_URI);
-    }
-
-    @Test
     public void bindSlice_flashlightSlice_returnsFlashlightSlice() {
         Settings.Secure.putInt(
                 mContext.getContentResolver(), Settings.Secure.FLASHLIGHT_AVAILABLE, 1);
@@ -604,32 +593,6 @@
     }
 
     @Test
-    @Ignore
-    public void onSlicePinned_backgroundWorker_started() {
-        mProvider.onSlicePinned(CustomSliceRegistry.WIFI_SLICE_URI);
-
-        verify(ShadowWifiScanWorker.getWifiTracker()).onStart();
-    }
-
-    @Test
-    @Ignore
-    public void onSlicePinned_backgroundWorker_stopped() {
-        mProvider.onSlicePinned(CustomSliceRegistry.WIFI_SLICE_URI);
-        mProvider.onSliceUnpinned(CustomSliceRegistry.WIFI_SLICE_URI);
-
-        verify(ShadowWifiScanWorker.getWifiTracker()).onStop();
-    }
-
-    @Test
-    @Ignore
-    public void shutdown_backgroundWorker_closed() {
-        mProvider.onSlicePinned(CustomSliceRegistry.WIFI_SLICE_URI);
-        mProvider.shutdown();
-
-        verify(ShadowWifiScanWorker.getWifiTracker()).onDestroy();
-    }
-
-    @Test
     @Config(qualifiers = "mcc998")
     public void grantAllowlistedPackagePermissions_noAllowlist_shouldNotGrant() {
         final List<Uri> uris = new ArrayList<>();
@@ -716,31 +679,6 @@
                 .build();
     }
 
-    @Implements(WifiScanWorker.class)
-    public static class ShadowWifiScanWorker {
-        private static WifiTracker mWifiTracker;
-
-        @Implementation
-        protected void onSlicePinned() {
-            mWifiTracker = mock(WifiTracker.class);
-            mWifiTracker.onStart();
-        }
-
-        @Implementation
-        protected void onSliceUnpinned() {
-            mWifiTracker.onStop();
-        }
-
-        @Implementation
-        protected void close() {
-            mWifiTracker.onDestroy();
-        }
-
-        static WifiTracker getWifiTracker() {
-            return mWifiTracker;
-        }
-    }
-
     @Implements(value = StrictMode.class)
     public static class ShadowStrictMode {