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

11
tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
View File

@@ -23,17 +23,14 @@ import android.app.Fragment;
import android.content.pm.PackageInfo;
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.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppDialogFragmentTest {
@Mock
@@ -49,16 +46,16 @@ public class AppDialogFragmentTest {
@Test
public void notManagingOrConnected_shouldNotShow() {
AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
false /* connected */);
AppDialogFragment
.show(mParent, mPackageInfo, "label", false /* manage */, false /* connected */);
verify(mParent, never()).isAdded();
}
@Test
public void notManagingAndConnected_showShow() {
AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
true /* connected */);
AppDialogFragment
.show(mParent, mPackageInfo, "label", false /* manage */, true /* connected */);
verify(mParent).isAdded();
}

18
tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
View File

@@ -16,23 +16,17 @@
package com.android.settings.vpn2;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Tests for {@link VpnUtils}.
*/
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class VpnUtilsTest {
@Test
public void testIsAlwaysOnVpnSet() {