PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev

Browse Source
This commit is contained in:
Edgar Wang
2023-04-28 05:28:14 +00:00
committed by Android (Google) Code Review
parent 18d5ebc38f 4cf60b02b2
commit 8155b72cf8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,10 +16,8 @@
package com.android.settings.development.qstile; package com.android.settings.development.qstile;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
.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_STATUS_CODE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -37,6 +35,8 @@ import android.os.RemoteException;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.widget.Toast; import android.widget.Toast;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.inputmethod.ImeTracing; import com.android.internal.inputmethod.ImeTracing;
import com.android.settings.testutils.shadow.ShadowParcel; import com.android.settings.testutils.shadow.ShadowParcel;
@@ -68,6 +68,9 @@ public class WinscopeTraceTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mWinscopeTrace = spy(new DevelopmentTiles.WinscopeTrace()); mWinscopeTrace = spy(new DevelopmentTiles.WinscopeTrace());
doReturn(ApplicationProvider.getApplicationContext()).when(
mWinscopeTrace).getApplicationContext();
ReflectionHelpers.setField(mWinscopeTrace, "mWindowManager", mWindowManager); ReflectionHelpers.setField(mWinscopeTrace, "mWindowManager", mWindowManager);
ReflectionHelpers.setField(mWinscopeTrace, "mImeTracing", mImeTracing); ReflectionHelpers.setField(mWinscopeTrace, "mImeTracing", mImeTracing);
ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", mSurfaceFlinger); ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", mSurfaceFlinger);
@@ -118,7 +121,7 @@ public class WinscopeTraceTest {
assertThat(mWinscopeTrace.isEnabled()).isFalse(); assertThat(mWinscopeTrace.isEnabled()).isFalse();
verify(mSurfaceFlinger) verify(mSurfaceFlinger)
.transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(), .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
eq(0 /* flags */)); eq(0 /* flags */));
verifyNoMoreInteractions(mSurfaceFlinger); verifyNoMoreInteractions(mSurfaceFlinger);
} }
@@ -131,7 +134,7 @@ public class WinscopeTraceTest {
assertThat(mWinscopeTrace.isEnabled()).isTrue(); assertThat(mWinscopeTrace.isEnabled()).isTrue();
verify(mSurfaceFlinger) verify(mSurfaceFlinger)
.transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(), .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
eq(0 /* flags */)); eq(0 /* flags */));
verifyNoMoreInteractions(mSurfaceFlinger); verifyNoMoreInteractions(mSurfaceFlinger);
} }