Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround the issue that parameterized test don't support @UiThreadTest

Browse Source 
When the test infrastructure support it, this change should be reverted.
b/30746303

Change-Id: Ice181d93f4f1210bcd2c8566e61c90035fe12ec5
This commit is contained in:
Teng-Hui Zhu
2016-08-30 15:06:26 -07:00
parent 17e76971a1
commit 022113ad0d
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,29 +78,31 @@ 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());
public void testLayoutPerf() throws Throwable {
mActivityRule.runOnUiThread(() -> {
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);
Activity activity = mActivityRule.getActivity();
activity.setContentView(mLayoutId);
ViewGroup viewGroup = (ViewGroup) activity.findViewById(mViewId);
ViewGroup viewGroup = (ViewGroup) activity.findViewById(mViewId);
List<View> allNodes = gatherViewTree(viewGroup);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
List<View> allNodes = gatherViewTree(viewGroup);
BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
int length = mMeasureSpecs.length;
while (state.keepRunning()) {
for (int i = 0; i < length; i++) {
// The overhead of this call is ignorable, like within 1% difference.
requestLayoutForAllNodes(allNodes);
int length = mMeasureSpecs.length;
while (state.keepRunning()) {
for (int i = 0; i < length; i++) {
// The overhead of this call is ignorable, like within 1% difference.
requestLayoutForAllNodes(allNodes);
viewGroup.measure(mMeasureSpecs[i % length], mMeasureSpecs[i % length]);
viewGroup.layout(0, 0, viewGroup.getMeasuredWidth(), viewGroup.getMeasuredHeight());
viewGroup.measure(mMeasureSpecs[i % length], mMeasureSpecs[i % length]);
viewGroup.layout(0, 0, viewGroup.getMeasuredWidth(), viewGroup.getMeasuredHeight());
}
}
}
});
}
}