Merge "Revert "Prevent some leaks from leaking to the next test"" into udc-qpr-dev (a7eed17a) · Commits · e / os / android_packages_apps_Trebuchet

tests/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ filegroup {
		"src/com/android/launcher3/util/rule/SamplerRule.java",
		"src/com/android/launcher3/util/rule/ScreenRecordRule.java",
		"src/com/android/launcher3/util/rule/ShellCommandRule.java",
		"src/com/android/launcher3/util/rule/TestIsolationRule.java",
		"src/com/android/launcher3/util/rule/TestStabilityRule.java",
		"src/com/android/launcher3/util/rule/TISBindRule.java",
		"src/com/android/launcher3/util/viewcapture_analysis/*.java",

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+3 −13

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ 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.ShellCommandRule;
		import com.android.launcher3.util.rule.TestIsolationRule;
		import com.android.launcher3.util.rule.TestStabilityRule;
		import com.android.launcher3.util.rule.ViewCaptureRule;

		@@ -124,10 +123,6 @@ public abstract class AbstractLauncherUiTest {
		}, DEFAULT_UI_TIMEOUT, launcher);
		}

		public void checkDetectedLeaks() {
		checkDetectedLeaks(mLauncher);
		}

		private static String getActivityLeakErrorMessage(LauncherInstrumentation launcher) {
		sActivityLeakReported = true;
		return "Activity leak detector has found leaked activities, "
		@@ -220,8 +215,7 @@ public abstract class AbstractLauncherUiTest {

		@Rule
		public TestRule mOrderSensitiveRules = RuleChain
		.outerRule(new TestIsolationRule(this))
		.around(new SamplerRule())
		.outerRule(new SamplerRule())
		.around(new TestStabilityRule())
		.around(getRulesInsideActivityMonitor());

		@@ -494,12 +488,6 @@ public abstract class AbstractLauncherUiTest {
		}

		protected void closeLauncherActivity() {
		finishLauncherActivity();
		waitForLauncherCondition(
		"Launcher still active", launcher -> launcher == null, DEFAULT_UI_TIMEOUT);
		}

		public void finishLauncherActivity() {
		// Destroy Launcher activity.
		executeOnLauncher(launcher -> {
		if (launcher != null) {
		@@ -507,6 +495,8 @@ public abstract class AbstractLauncherUiTest {
		launcher.finish();
		}
		});
		waitForLauncherCondition(
		"Launcher still active", launcher -> launcher == null, DEFAULT_UI_TIMEOUT);
		}

		protected boolean isInLaunchedApp(Launcher launcher) {

tests/src/com/android/launcher3/util/rule/TestIsolationRule.java

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/*
		* 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 com.android.launcher3.ui.AbstractLauncherUiTest;

		import org.junit.rules.TestRule;
		import org.junit.runner.Description;
		import org.junit.runners.model.Statement;

		/**
		* Isolates tests from some of the state created by the previous test.
		*/
		public class TestIsolationRule implements TestRule {
		final AbstractLauncherUiTest mTest;

		public TestIsolationRule(AbstractLauncherUiTest test) {
		mTest = test;
		}

		@NonNull
		@Override
		public Statement apply(@NonNull Statement base, @NonNull Description description) {
		return new Statement() {
		@Override
		public void evaluate() throws Throwable {
		mTest.finishLauncherActivity();
		mTest.checkDetectedLeaks();
		try {
		base.evaluate();
		} finally {
		mTest.finishLauncherActivity();
		}
		mTest.checkDetectedLeaks();
		}
		};
		}
		}