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

19
tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
View File

@@ -15,10 +15,16 @@
*/
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.support.annotation.NonNull;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Before;
@@ -26,21 +32,16 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import java.io.OutputStream;
import java.io.PrintWriter;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsDumpServiceTest {
private static final String PACKAGE_BROWSER = "com.android.test.browser";
private static final String PACKAGE_NULL = "android";
@Mock
private PackageManager mPackageManager;
@Mock
@@ -107,7 +108,7 @@ public class SettingsDumpServiceTest {
private class TestPrintWriter extends PrintWriter {
private Object mPrintObject;
public TestPrintWriter(@NonNull OutputStream out) {
private TestPrintWriter(@NonNull OutputStream out) {
super(out);
}
@@ -116,7 +117,7 @@ public class SettingsDumpServiceTest {
mPrintObject = object;
}
public Object getPrintObject() {
private Object getPrintObject() {
return mPrintObject;
}
}