Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes. Also replaced TestConfig with traditional robolectric.properties. Bug: 73173204 Bug: 73892008 Test: make -j56 RunSettingsRoboTests Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
@@ -16,16 +16,13 @@
|
||||
|
||||
package com.android.settings.datausage;
|
||||
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.ColorDrawable;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowThreadUtils;
|
||||
import com.android.settingslib.AppItem;
|
||||
import com.android.settingslib.net.UidDetail;
|
||||
import com.android.settingslib.net.UidDetailProvider;
|
||||
@@ -36,11 +33,8 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
||||
shadows = ShadowThreadUtils.class)
|
||||
public class AppDataUsagePreferenceTest {
|
||||
|
||||
@Mock
|
||||
@@ -71,7 +65,6 @@ public class AppDataUsagePreferenceTest {
|
||||
assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void createPref_noCachedUidDetail_shouldSetAppInfo() {
|
||||
when(mUidDetailProvider.getUidDetail(mAppItem.key, true /* blocking */))
|
||||
|
||||
Reference in New Issue
Block a user