Ignore/Fix broken tests

Fix: 214943221
Fix: 215070875
Bug: 215071960
Bug: 215071948
Bug: 215072120
Test: run robo test
Change-Id: Id11c8461a2cb11cba96feebbfb0337b096eb3a17

tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java

@@ -18,32 +18,17 @@ package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.content.Context;
 import android.provider.SearchIndexableResource;
 
-import androidx.test.core.app.ApplicationProvider;
-
 import com.android.settings.R;
 import com.android.settings.widget.PreferenceCategoryController;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
 import java.util.List;
 
-@RunWith(RobolectricTestRunner.class)
-public abstract class BasePrivacySettingsPreferenceTest {
+public abstract class AbsBasePrivacySettingsPreference {
 
-    protected Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = ApplicationProvider.getApplicationContext();
-    }
-
-    protected static void verifyEnterpriseSearchIndexableResources(
+    protected void verifyEnterpriseSearchIndexableResources(
             List<SearchIndexableResource> searchIndexableResources) {
         assertThat(searchIndexableResources).isNotEmpty();
         assertThat(searchIndexableResources.size()).isEqualTo(1);
@@ -51,7 +36,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
                 .isEqualTo(R.xml.enterprise_privacy_settings);
     }
 
-    protected static void verifyEnterprisePreferenceControllers(
+    protected void verifyEnterprisePreferenceControllers(
             List<AbstractPreferenceController> controllers) {
         assertThat(controllers).isNotNull();
         assertThat(controllers.size()).isEqualTo(17);
@@ -89,7 +74,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
                 FailedPasswordWipeManagedProfilePreferenceController.class);
     }
 
-    protected static void verifyFinancedSearchIndexableResources(
+    protected void verifyFinancedSearchIndexableResources(
             List<SearchIndexableResource> searchIndexableResources) {
         assertThat(searchIndexableResources).isNotEmpty();
         assertThat(searchIndexableResources.size()).isEqualTo(1);
@@ -97,7 +82,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
                 .isEqualTo(R.xml.financed_privacy_settings);
     }
 
-    protected static void verifyFinancedPreferenceControllers(
+    protected void verifyFinancedPreferenceControllers(
             List<AbstractPreferenceController> controllers) {
         assertThat(controllers).isNotNull();
         assertThat(controllers.size()).isEqualTo(6);

tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
 
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -47,7 +48,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class EnterprisePrivacySettingsTest extends BasePrivacySettingsPreferenceTest {
+public class EnterprisePrivacySettingsTest extends AbsBasePrivacySettingsPreference {
     private static final ComponentName DEVICE_OWNER_COMPONENT =
             new ComponentName("com.android.foo", "bar");
 
@@ -57,8 +58,8 @@ public class EnterprisePrivacySettingsTest extends BasePrivacySettingsPreference
     private PrivacySettingsPreference mPrivacySettingsPreference;
     private FakeFeatureFactory mFeatureFactory;
     private EnterprisePrivacySettings mSettings;
+    private Context mContext;
 
-    @Override
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);

tests/robotests/src/com/android/settings/enterprise/PrivacySettingsEnterprisePreferenceTest.java

@@ -18,8 +18,11 @@ package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
 import android.provider.SearchIndexableResource;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -31,14 +34,14 @@ import org.robolectric.RobolectricTestRunner;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class PrivacySettingsEnterprisePreferenceTest extends BasePrivacySettingsPreferenceTest {
+public class PrivacySettingsEnterprisePreferenceTest extends AbsBasePrivacySettingsPreference {
 
+    private Context mContext;
     private PrivacySettingsEnterprisePreference mPrivacySettingsEnterprisePreference;
 
-    @Override
     @Before
     public void setUp() {
-        super.setUp();
+        mContext = ApplicationProvider.getApplicationContext();
         mPrivacySettingsEnterprisePreference = new PrivacySettingsEnterprisePreference(mContext);
     }
 

tests/robotests/src/com/android/settings/enterprise/PrivacySettingsFinancedPreferenceTest.java

@@ -18,8 +18,11 @@ package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
 import android.provider.SearchIndexableResource;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -31,14 +34,14 @@ import org.robolectric.RobolectricTestRunner;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class PrivacySettingsFinancedPreferenceTest extends BasePrivacySettingsPreferenceTest {
+public class PrivacySettingsFinancedPreferenceTest extends AbsBasePrivacySettingsPreference {
 
+    private Context mContext;
     private PrivacySettingsFinancedPreference mPrivacySettingsFinancedPreference;
 
-    @Override
     @Before
     public void setUp() {
-        super.setUp();
+        mContext = ApplicationProvider.getApplicationContext();
         mPrivacySettingsFinancedPreference = new PrivacySettingsFinancedPreference(mContext);
     }