From 2c33e3085d52689cd62fcaa75f1e582e905f69a9 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Tue, 12 Jul 2016 16:10:15 -0700 Subject: [PATCH] Double check the layout test running on UI thread Change-Id: I7628040868ab1cc047c2f891d91c88ab01815c9d --- .../perftests/core/src/android/widget/LayoutPerfTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java b/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java index db15e9bbe4b67..d444c92973189 100644 --- a/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java +++ b/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java @@ -17,6 +17,7 @@ package android.widget; import android.app.Activity; +import android.os.Looper; import android.perftests.utils.BenchmarkState; import android.perftests.utils.PerfStatusReporter; import android.perftests.utils.StubActivity; @@ -42,6 +43,7 @@ import static android.perftests.utils.LayoutUtils.requestLayoutForAllNodes; import static android.view.View.MeasureSpec.AT_MOST; import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.UNSPECIFIED; +import static org.junit.Assert.assertTrue; @LargeTest @RunWith(Parameterized.class) @@ -77,6 +79,11 @@ public class LayoutPerfTest { @Test @UiThreadTest public void testLayoutPerf() { + assertTrue("We should be running on the main thread", + Looper.getMainLooper().getThread() == Thread.currentThread()); + assertTrue("We should be running on the main thread", + Looper.myLooper() == Looper.getMainLooper()); + Activity activity = mActivityRule.getActivity(); activity.setContentView(mLayoutId);