Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62378d34 authored by Vania Desmonda's avatar Vania Desmonda Committed by Android (Google) Code Review
Browse files

Revert "Move `ScreenRecordRule` to be a class rule." 

This reverts commit 2944e9c2.

Reason for revert: Breaks tests, @ClassRule requires ScreenRecordRule to be static but it's not

Change-Id: Icf86cbbd707bc43cef1cfb81390193f6325dcace
parent 2944e9c2

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeBaseTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.tools.flicker.rules.ChangeDisplayOrientationRule 
import org.junit.Assume

import org.junit.Before

import org.junit.Test

import org.junit.ClassRule

import org.junit.Rule

import org.junit.rules.TestName

import com.android.server.wm.flicker.entireScreenCovered
@@ -43,8 +42,8 @@ abstract class DesktopModeBaseTest(flicker: LegacyFlickerTest) : BaseBenchmarkTe 
    @get:Rule

    val testName = TestName()



    @get:ClassRule

    val screenRecordRule = ScreenRecordRule()

    @get:Rule

    val screenRecordRule = ScreenRecordRule(keepTestLevelRecordingOnSuccess = false)



    // Override this set with the test method names that you want to exclude from the test

    open val excludedTests: Set<String> = emptySet()