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:
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.widget;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
@@ -27,7 +26,6 @@ import android.support.v7.preference.PreferenceScreen;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -36,11 +34,10 @@ 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)
|
||||
public class TwoStateButtonPreferenceControllerTest {
|
||||
|
||||
private static final String KEY = "pref_key";
|
||||
|
||||
@Mock
|
||||
@@ -101,8 +98,8 @@ public class TwoStateButtonPreferenceControllerTest {
|
||||
/**
|
||||
* Controller to test methods in {@link TwoStateButtonPreferenceController}
|
||||
*/
|
||||
public static class TestButtonsPreferenceController extends
|
||||
TwoStateButtonPreferenceController {
|
||||
public static class TestButtonsPreferenceController
|
||||
extends TwoStateButtonPreferenceController {
|
||||
|
||||
TestButtonsPreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
|
||||
Reference in New Issue
Block a user