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

24
tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
View File

@@ -17,25 +17,24 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.fail;
import android.content.Intent;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.fail;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ResultPayloadUtilsTest {
private ResultPayload payload;
private final String EXTRA_KEY = "key";
private final String EXTRA_VALUE = "value";
private static final String EXTRA_KEY = "key";
private static final String EXTRA_VALUE = "value";
private ResultPayload payload;
@Before
public void setUp() {
@@ -50,7 +49,7 @@ public class ResultPayloadUtilsTest {
try {
ResultPayloadUtils.unmarshall(badData, ResultPayload.CREATOR);
fail("unmarshall should throw exception");
} catch ( RuntimeException e) {
} catch (RuntimeException e) {
assertThat(e).isNotNull();
}
}
@@ -65,12 +64,11 @@ public class ResultPayloadUtilsTest {
@Test
public void testUnmarshall_PreservedData() {
byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
ResultPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
ResultPayload.CREATOR);
ResultPayload newPayload =
ResultPayloadUtils.unmarshall(marshalledPayload, ResultPayload.CREATOR);
String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
}
}