Disable two test files
They are broken in master because of change in framework. First disable them to unblock the master. Bug: 110263693 Test: RunSettingsRoboTests Change-Id: I487129c905b070a5a968fd2b677218909e1afda4
This commit is contained in:
@@ -23,6 +23,7 @@ import com.android.settings.R;
|
|||||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -33,6 +34,7 @@ import org.robolectric.util.ReflectionHelpers;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
@Ignore
|
||||||
public class MockLocationAppPreferenceControllerTest {
|
public class MockLocationAppPreferenceControllerTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
|
@@ -39,6 +39,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
|
|||||||
import com.android.settings.fuelgauge.batterytip.AppInfo;
|
import com.android.settings.fuelgauge.batterytip.AppInfo;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
@@ -51,6 +52,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Ignore
|
||||||
public class RestrictAppPreferenceControllerTest {
|
public class RestrictAppPreferenceControllerTest {
|
||||||
private static final int ALLOWED_UID = 111;
|
private static final int ALLOWED_UID = 111;
|
||||||
private static final String ALLOWED_PACKAGE_NAME = "com.android.allowed.package";
|
private static final String ALLOWED_PACKAGE_NAME = "com.android.allowed.package";
|
||||||
|
Reference in New Issue
Block a user