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:
@@ -18,18 +18,13 @@ package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
/**
|
||||
* Tests for {@link CaCertsPreferenceControllerBase}.
|
||||
*/
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
|
||||
|
||||
private static final String PREF_KEY = "pref";
|
||||
|
||||
private int mNumOfCaCerts;
|
||||
@@ -49,7 +44,7 @@ public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceContro
|
||||
private class CaCertsPreferenceControllerBaseTestable extends
|
||||
CaCertsPreferenceControllerBase {
|
||||
|
||||
public CaCertsPreferenceControllerBaseTestable(Context context) {
|
||||
private CaCertsPreferenceControllerBaseTestable(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user