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

Commit 0fb11293 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Ignore test methods with $noRavenwood suffix 

This allows AOSP changes to have `@IgnoreUnderRavenwood` equivalent
until the annotations are availabe in AOSP.

Bug: 292141694
Test: atest RavenwoodMinimumTest
Change-Id: Id1d5a879eb7e31bb99911aae16bdf093c1c93c6e
parent 79b8a00c

ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java

+5 −0
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ public class RavenwoodRule implements TestRule { 
                    Assume.assumeFalse(IS_UNDER_RAVENWOOD);

                }



                // Stopgap for http://g/ravenwood/EPAD-N5ntxM

                if (description.getMethodName().endsWith("$noRavenwood")) {

                    Assume.assumeFalse(IS_UNDER_RAVENWOOD);

                }



                RavenwoodRuleImpl.init(RavenwoodRule.this);

                try {

                    base.evaluate();

ravenwood/minimum-test/test/com/android/ravenwood/RavenwoodMinimumTest.java

+5 −0
Original line number Diff line number Diff line
@@ -42,4 +42,9 @@ public class RavenwoodMinimumTest { 
    public void testIgnored() {

        throw new RuntimeException("Shouldn't be executed under ravenwood");

    }



    @Test

    public void testIgnored$noRavenwood() {

        throw new RuntimeException("Shouldn't be executed under ravenwood");

    }

}