Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev (8155b72c) · Commits · e / os / android_packages_apps_Settings

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@

		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;

		@@ -37,6 +35,8 @@ import android.os.RemoteException;
		import android.view.IWindowManager;
		import android.widget.Toast;

		import androidx.test.core.app.ApplicationProvider;

		import com.android.internal.inputmethod.ImeTracing;
		import com.android.settings.testutils.shadow.ShadowParcel;

		@@ -68,6 +68,9 @@ public class WinscopeTraceTest {
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mWinscopeTrace = spy(new DevelopmentTiles.WinscopeTrace());
		doReturn(ApplicationProvider.getApplicationContext()).when(
		mWinscopeTrace).getApplicationContext();

		ReflectionHelpers.setField(mWinscopeTrace, "mWindowManager", mWindowManager);
		ReflectionHelpers.setField(mWinscopeTrace, "mImeTracing", mImeTracing);
		ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", mSurfaceFlinger);