commit 2c33e3085d52689cd62fcaa75f1e582e905f69a9
author Teng-Hui Zhu <ztenghui@google.com> Tue Jul 12 16:10:15 2016 -0700
committer Teng-Hui Zhu <ztenghui@google.com> Tue Jul 12 16:10:45 2016 -0700
tree 97a900e52a7559bedb26cd4f72d074781cbf30d9
parent 2906c208c7a0ece25814d54720664d8dc34c6f2e

Double check the layout test running on UI thread

Change-Id: I7628040868ab1cc047c2f891d91c88ab01815c9d

apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java

diff --git a/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java b/apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java
index db15e9b..d444c92 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.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 @@
     @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);