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,13 +17,11 @@
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
|
||||
@@ -40,19 +38,15 @@ import org.robolectric.shadows.ShadowAlertDialog;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(
|
||||
manifest = TestConfig.MANIFEST_PATH,
|
||||
sdk = TestConfig.SDK_VERSION,
|
||||
shadows = {
|
||||
SettingsShadowResources.class,
|
||||
SettingsShadowResources.SettingsShadowTheme.class,
|
||||
ShadowConnectivityManager.class,
|
||||
ShadowWifiManager.class
|
||||
}
|
||||
@Config(shadows = {
|
||||
SettingsShadowResources.SettingsShadowTheme.class,
|
||||
ShadowConnectivityManager.class,
|
||||
ShadowWifiManager.class
|
||||
}
|
||||
)
|
||||
public class WifiDialogActivityTest {
|
||||
|
||||
public static final String AP1_SSID = "\"ap1\"";
|
||||
private static final String AP1_SSID = "\"ap1\"";
|
||||
@Mock
|
||||
private WifiConfigController mController;
|
||||
|
||||
|
Reference in New Issue
Block a user