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

Merge "Revert "Make sure we keep the screen record even if the test succeeds"" into main

Browse Source
This commit is contained in:
Sebastián Franco
2024-06-13 21:46:44 +00:00
committed by Android (Google) Code Review
parent f77600260c f46de7e690
commit 7793a2aecc
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/com/android/launcher3/ui/TaplTestsLauncher3Test.java
View File

@@ -21,9 +21,8 @@ import static org.junit.Assert.assertNotNull;
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.launcher3.Launcher;
import com.android.launcher3.util.rule.ScreenRecordRule.KeepRecordOnSuccess;
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
import com.android.launcher3.Launcher;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +31,6 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class TaplTestsLauncher3Test extends AbstractLauncherUiTest<Launcher> {
@KeepRecordOnSuccess
@ScreenRecord // b/322823478
@Test
public void testDevicePressMenu() throws Exception {

2
tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java
View File

@@ -45,7 +45,6 @@ import com.android.launcher3.allapps.WorkPausedCard;
import com.android.launcher3.allapps.WorkProfileManager;
import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.util.TestUtil;
import com.android.launcher3.util.rule.ScreenRecordRule.KeepRecordOnSuccess;
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
import com.android.launcher3.util.rule.TestStabilityRule.Stability;
@@ -196,7 +195,6 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest<Launcher> {
}
@KeepRecordOnSuccess
@ScreenRecord // b/322823478
@Test
public void testEdu() {

15
tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
View File

@@ -49,9 +49,6 @@ public class ScreenRecordRule implements TestRule {
return base;
}
final Boolean keepRecordOnSuccess = description.getAnnotation(KeepRecordOnSuccess.class)
!= null;
return new Statement() {
@Override
public void evaluate() throws Throwable {
@@ -73,7 +70,7 @@ public class ScreenRecordRule implements TestRule {
device.executeShellCommand("kill -INT " + screenRecordPid);
Log.e(TAG, "Screenrecord captured at: " + outputFile);
output.close();
if (success && !keepRecordOnSuccess) {
if (success) {
automation.executeShellCommand("rm " + outputFile);
}
}
@@ -88,14 +85,4 @@ public class ScreenRecordRule implements TestRule {
@Target(ElementType.METHOD)
public @interface ScreenRecord {
}
/**
* Interface to indicate that we should keep the screen record even if the test succeeds, use
* sparingly since it uses a lof of memory.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface KeepRecordOnSuccess {
}
}