aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Prevent some leaks from leaking to the next test"" into udc-qpr-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-22 20:00:54 +00:00
committed by Android (Google) Code Review
parent 053c11a344 84f51ec03e
commit a7eed17af3
3 changed files with 3 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Android.bp
View File

@@ -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",

16
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -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) {

53
tests/src/com/android/launcher3/util/rule/TestIsolationRule.java
View File

@@ -1,53 +0,0 @@
/*
* 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();
}
};
}
}