Show Toast with location of trace when trace is disabled

- Rename Layer Trace development tile to Surface Flinger Trace

Bug: 64831661
Test: Manually toggle trace
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LayerTraceTest && make RunSettingsRoboTests ROBOTEST_FILTER=WindowTraceTest
Change-Id: I438efca251688774f0d6f29ba93d02d116f1e574
This commit is contained in:
Vishnu Nair
2018-01-16 16:00:03 -08:00
parent d6b0490dea
commit 45603a1524
4 changed files with 36 additions and 5 deletions

View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.os.IBinder;
import android.os.RemoteException;
import android.widget.Toast;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowParcel;
@@ -52,6 +53,8 @@ import org.robolectric.util.ReflectionHelpers;
public class LayerTraceTest {
@Mock
private IBinder mSurfaceFlinger;
@Mock
private Toast mToast;
private DevelopmentTiles.LayerTrace mLayerTraceTile;
@@ -59,13 +62,14 @@ public class LayerTraceTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mLayerTraceTile = spy(new DevelopmentTiles.LayerTrace());
mLayerTraceTile.onCreate();
ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", mSurfaceFlinger);
ReflectionHelpers.setField(mLayerTraceTile, "mToast", mToast);
}
@After
public void after() {
verifyNoMoreInteractions(mSurfaceFlinger);
verifyNoMoreInteractions(mToast);
}
@Test
@@ -106,12 +110,13 @@ public class LayerTraceTest {
@Test
@Config(shadows = {ShadowParcel.class})
public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException {
public void setIsEnableFalse_shouldDisableLayerTraceAndShowToast() throws RemoteException {
mLayerTraceTile.setIsEnabled(false);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
verify(mSurfaceFlinger)
.transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(),
eq(0 /* flags */));
verify(mToast).show();
}
@Test

View File

@@ -25,12 +25,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
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.wrapper.IWindowManagerWrapper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,6 +46,8 @@ import org.robolectric.util.ReflectionHelpers;
public class WindowTraceTest {
@Mock
private IWindowManagerWrapper mWindowManager;
@Mock
private Toast mToast;
private DevelopmentTiles.WindowTrace mWindowTrace;
@@ -51,8 +55,13 @@ public class WindowTraceTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mWindowTrace = spy(new DevelopmentTiles.WindowTrace());
mWindowTrace.onCreate();
ReflectionHelpers.setField(mWindowTrace, "mWindowManager", mWindowManager);
ReflectionHelpers.setField(mWindowTrace, "mToast", mToast);
}
@After
public void teardown() {
verifyNoMoreInteractions(mToast);
}
@Test
@@ -83,9 +92,10 @@ public class WindowTraceTest {
@Test
@Config(shadows = {ShadowParcel.class})
public void setIsEnableFalse_shouldDisableWindowTrace() throws RemoteException {
public void setIsEnableFalse_shouldDisableWindowTraceAndShowToast() throws RemoteException {
mWindowTrace.setIsEnabled(false);
verify(mWindowManager).stopWindowTrace();
verify(mToast).show();
verifyNoMoreInteractions(mWindowManager);
}