Merge "Added missing verify() calls on TimingsTraceAndSlogTest" into main (f2161323) · Commits · e / os / android_frameworks_base

services/tests/mockingservicestests/src/com/android/server/utils/TimingsTraceAndSlogTest.java

+9 −17

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@ package com.android.server.utils;

	import static android.os.Trace.TRACE_TAG_APP;		import static android.os.Trace.TRACE_TAG_APP;

	import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
	import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;		import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;
	@@ -36,12 +35,11 @@ import androidx.test.filters.SmallTest;
	import androidx.test.runner.AndroidJUnit4;		import androidx.test.runner.AndroidJUnit4;

	import com.android.dx.mockito.inline.extended.MockedVoidMethod;		import com.android.dx.mockito.inline.extended.MockedVoidMethod;
			import com.android.modules.utils.testing.ExtendedMockitoRule;

	import org.junit.After;		import org.junit.Rule;
	import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	import org.mockito.MockitoSession;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;
	@@ -53,24 +51,15 @@ import java.util.List;
	*/		*/
	@SmallTest		@SmallTest
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class TimingsTraceAndSlogTest {		public final class TimingsTraceAndSlogTest {

	private static final String TAG = "TEST";		private static final String TAG = "TEST";

	private MockitoSession mSession;		@Rule
			public final ExtendedMockitoRule extendedMockito = new ExtendedMockitoRule.Builder(this)
	@Before
	public final void startMockSession() {
	mSession = mockitoSession()
	.spyStatic(Slog.class)		.spyStatic(Slog.class)
	.spyStatic(Trace.class)		.spyStatic(Trace.class)
	.startMocking();		.build();
	}

	@After
	public final void finishMockSession() {
	mSession.finishMocking();
	}

	@Test		@Test
	public void testDifferentThreads() throws Exception {		public void testDifferentThreads() throws Exception {
	@@ -135,6 +124,7 @@ public class TimingsTraceAndSlogTest {

	verify((MockedVoidMethod) () -> Trace.traceBegin(TRACE_TAG_APP, "test"));		verify((MockedVoidMethod) () -> Trace.traceBegin(TRACE_TAG_APP, "test"));
	verify((MockedVoidMethod) () -> Trace.traceEnd(TRACE_TAG_APP));		verify((MockedVoidMethod) () -> Trace.traceEnd(TRACE_TAG_APP));
			verify((MockedVoidMethod) () -> Slog.d(TAG, "test"));
	verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("test took to complete: \\dms")));		verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("test took to complete: \\dms")));
	}		}

	@@ -150,6 +140,8 @@ public class TimingsTraceAndSlogTest {
	verify((MockedVoidMethod) () -> Trace.traceBegin(TRACE_TAG_APP, "L2"));		verify((MockedVoidMethod) () -> Trace.traceBegin(TRACE_TAG_APP, "L2"));
	verify((MockedVoidMethod) () -> Trace.traceEnd(TRACE_TAG_APP), times(2)); // L1 and L2		verify((MockedVoidMethod) () -> Trace.traceEnd(TRACE_TAG_APP), times(2)); // L1 and L2

			verify((MockedVoidMethod) () -> Slog.d(TAG, "L1"));
			verify((MockedVoidMethod) () -> Slog.d(TAG, "L2"));
	verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("L2 took to complete: \\d+ms")));		verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("L2 took to complete: \\d+ms")));
	verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("L1 took to complete: \\d+ms")));		verify((MockedVoidMethod) () -> Slog.v(eq(TAG), matches("L1 took to complete: \\d+ms")));
	}		}