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

7
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -37,7 +36,6 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -48,12 +46,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DevelopmentTilePreferenceControllerTest {
private static final String SERVICE_INFO_NAME = "TestName";
@@ -133,11 +129,10 @@ public class DevelopmentTilePreferenceControllerTest {
return preference;
}
public static class FakeServiceInfo extends ServiceInfo {
private static class FakeServiceInfo extends ServiceInfo {
public String loadLabel(PackageManager mgr) {
return "hi";
}
}
}

31
tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
View File

@@ -16,13 +16,9 @@
package com.android.settings.development.qstile;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
.SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace.SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -36,9 +32,8 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.widget.Toast;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowParcel;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowParcel;
import com.android.settings.wrapper.IWindowManagerWrapper;
import org.junit.After;
@@ -51,8 +46,8 @@ import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WinscopeTraceTest {
@Mock
private IWindowManagerWrapper mWindowManager;
@Mock
@@ -77,7 +72,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void wmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
// Assume Surface Trace is disabled.
ShadowParcel.sReadBoolResult = false;
@@ -86,7 +81,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void sfReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
// Assume Window Trace is disabled.
doReturn(false).when(mWindowManager).isWindowTraceEnabled();
@@ -99,7 +94,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void sfAndWmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
ShadowParcel.sReadBoolResult = true;
doReturn(true).when(mWindowManager).isWindowTraceEnabled();
@@ -118,7 +113,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void wmThrowsRemoteExAndSfReturnsTraceDisabled_shouldReturnDisabled()
throws RemoteException {
ShadowParcel.sReadBoolResult = false;
@@ -144,7 +139,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void setIsEnableTrue_shouldEnableLayerTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(true);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(1);
@@ -155,7 +150,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void setIsEnableFalse_shouldDisableWindowTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(false);
verify(mWindowManager).stopWindowTrace();
@@ -164,7 +159,7 @@ public class WinscopeTraceTest {
}
@Test
@Config(shadows = {ShadowParcel.class})
@Config(shadows = ShadowParcel.class)
public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(false);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
@@ -176,7 +171,7 @@ public class WinscopeTraceTest {
}
@Test
public void setIsEnableFalse_shouldShowToast() throws RemoteException {
public void setIsEnableFalse_shouldShowToast() {
mWinscopeTrace.setIsEnabled(false);
verify(mToast).show();
}
@@ -196,7 +191,7 @@ public class WinscopeTraceTest {
* Verify is surface flinger is not available not calls are made to it.
*/
@Test
public void setIsEnableAndSfUnavailable_shouldFailGracefully() throws RemoteException {
public void setIsEnableAndSfUnavailable_shouldFailGracefully() {
ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", null);
mWinscopeTrace.setIsEnabled(true);
verifyNoMoreInteractions(mSurfaceFlinger);