From de54cb8fa53d3b4549beeb9ce3ab193f1da97655 Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 5 Jun 2023 11:08:55 -0700 Subject: [PATCH] Adding a rule for analyzing view capture data For now, the rule is basically empty, to start with. In the following CLs it will invoke the search for anomalies in the data collected by ViewCaptureRule after the test succeeds and fail the test if an anomaly is found. Bug: 286251603 Test: presubmit Flag: N/A Change-Id: I373ea0d7ee85206101fb15584889ea5933e7d7b8 --- .../quickstep/FallbackRecentsTest.java | 4 +- tests/Android.bp | 1 + .../launcher3/ui/AbstractLauncherUiTest.java | 4 +- .../util/rule/ViewCaptureAnalysisRule.java | 56 +++++++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 tests/src/com/android/launcher3/util/rule/ViewCaptureAnalysisRule.java diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index 97e34c5f10..083b4f8c19 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -62,6 +62,7 @@ import com.android.launcher3.util.rule.FailureWatcher; import com.android.launcher3.util.rule.SamplerRule; import com.android.launcher3.util.rule.ScreenRecordRule; import com.android.launcher3.util.rule.TestStabilityRule; +import com.android.launcher3.util.rule.ViewCaptureAnalysisRule; import com.android.launcher3.util.rule.ViewCaptureRule; import com.android.quickstep.views.RecentsView; @@ -121,7 +122,8 @@ public class FallbackRecentsTest { .outerRule(new SamplerRule()) .around(new NavigationModeSwitchRule(mLauncher)) .around(viewCaptureRule) - .around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture())); + .around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture())) + .around(new ViewCaptureAnalysisRule(viewCaptureRule.getViewCapture())); mOtherLauncherActivity = context.getPackageManager().queryIntentActivities( getHomeIntentInPackage(context), diff --git a/tests/Android.bp b/tests/Android.bp index e7f408487d..d518a0ee53 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -58,6 +58,7 @@ filegroup { "src/com/android/launcher3/util/rule/SimpleActivityRule.java", "src/com/android/launcher3/util/rule/TestStabilityRule.java", "src/com/android/launcher3/util/rule/TISBindRule.java", + "src/com/android/launcher3/util/rule/ViewCaptureAnalysisRule.java", "src/com/android/launcher3/testcomponent/BaseTestingActivity.java", "src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java", "src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java", diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 09c4b1f49a..6a06a1874f 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -72,6 +72,7 @@ import com.android.launcher3.util.rule.SamplerRule; import com.android.launcher3.util.rule.ScreenRecordRule; import com.android.launcher3.util.rule.ShellCommandRule; import com.android.launcher3.util.rule.TestStabilityRule; +import com.android.launcher3.util.rule.ViewCaptureAnalysisRule; import com.android.launcher3.util.rule.ViewCaptureRule; import org.junit.After; @@ -210,7 +211,8 @@ public abstract class AbstractLauncherUiTest { final RuleChain inner = RuleChain .outerRule(new PortraitLandscapeRunner(this)) .around(viewCaptureRule) - .around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture())); + .around(new FailureWatcher(mDevice, mLauncher, viewCaptureRule.getViewCapture())) + .around(new ViewCaptureAnalysisRule(viewCaptureRule.getViewCapture())); return TestHelpers.isInLauncherProcess() ? RuleChain.outerRule(ShellCommandRule.setDefaultLauncher()).around(inner) diff --git a/tests/src/com/android/launcher3/util/rule/ViewCaptureAnalysisRule.java b/tests/src/com/android/launcher3/util/rule/ViewCaptureAnalysisRule.java new file mode 100644 index 0000000000..702757f0e2 --- /dev/null +++ b/tests/src/com/android/launcher3/util/rule/ViewCaptureAnalysisRule.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.util.rule; + +import androidx.annotation.NonNull; +import androidx.test.InstrumentationRegistry; + +import com.android.app.viewcapture.ViewCapture; +import com.android.app.viewcapture.data.ExportedData; + +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; + +import java.util.concurrent.ExecutionException; + +/** + * After the test succeeds, the rule looks for anomalies in the data accumulated by ViewCapture + * that's passed as a parameter. If anomalies are detected, throws an exception and fails the test. + */ +public class ViewCaptureAnalysisRule extends TestWatcher { + @NonNull + private final ViewCapture mViewCapture; + + public ViewCaptureAnalysisRule(@NonNull ViewCapture viewCapture) { + mViewCapture = viewCapture; + } + + @Override + protected void succeeded(Description description) { + super.succeeded(description); + try { + analyzeViewCaptureData(mViewCapture.getExportedData( + InstrumentationRegistry.getTargetContext())); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + } + + private static void analyzeViewCaptureData(ExportedData viewCaptureData) { + } +}