PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
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:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,7 +24,6 @@ import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,12 +37,10 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BaseSearchIndexProviderTest {
private static final String TEST_PREF_KEY = "test_pref_key";
@@ -64,9 +60,10 @@ public class BaseSearchIndexProviderTest {
assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
}
public static class AvailablePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public AvailablePreferenceController(Context context) {
public static class AvailablePreferenceController
extends AbstractPreferenceController
implements PreferenceControllerMixin {
private AvailablePreferenceController(Context context) {
super(context);
}
@@ -100,7 +97,7 @@ public class BaseSearchIndexProviderTest {
boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.location_settings;
return Arrays.asList(sir);
return Collections.singletonList(sir);
}
@Override
@@ -122,9 +119,11 @@ public class BaseSearchIndexProviderTest {
assertThat(controllers).hasSize(3);
}
public static class NotAvailablePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public NotAvailablePreferenceController(Context context) {
public static class NotAvailablePreferenceController
extends AbstractPreferenceController
implements PreferenceControllerMixin {
private NotAvailablePreferenceController(Context context) {
super(context);
}
@@ -153,10 +152,10 @@ public class BaseSearchIndexProviderTest {
final BaseSearchIndexProvider provider = new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.data_usage;
return Arrays.asList(sir);
return Collections.singletonList(sir);
}
@Override
@@ -165,8 +164,8 @@ public class BaseSearchIndexProviderTest {
}
};
final List<String> nonIndexableKeys = provider
.getNonIndexableKeys(RuntimeEnvironment.application);
final List<String> nonIndexableKeys =
provider.getNonIndexableKeys(RuntimeEnvironment.application);
assertThat(nonIndexableKeys).contains("status_header");
}