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

Commit d0c92ed5 authored by Lucas Lin's avatar Lucas Lin
Browse files

Ignore verifying canBeSatisfiedBy() on Android Q 

The method - satisfiedBy() has changed to canBeSatisfiedBy()
starting from Android R, so the method - canBeSatisfiedBy()
cannot be found when running this test on Android Q.
Ignore verifying canBeSatisfiedBy() on Android Q to fix this
problem.

Bug: 173911834
Test: Run MatchAllNetworkSpecifierTest on Android Q, R, S.
Original-Change: https://android-review.googlesource.com/1508137
Merged-In: Ibe317b56f82d3ea100b1d78c3907dce4f2fd964d
Change-Id: Ibe317b56f82d3ea100b1d78c3907dce4f2fd964d
parent 71ae4fc7

tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -53,8 +53,13 @@ class MatchAllNetworkSpecifierTest { 
        assertParcelSane(MatchAllNetworkSpecifier(), 0)

    }



    @Test @IgnoreAfter(Build.VERSION_CODES.R)

    fun testCanBeSatisfiedBy_BeforeS() {

    @Test

    @IgnoreUpTo(Build.VERSION_CODES.Q)

    @IgnoreAfter(Build.VERSION_CODES.R)

    // Only run this test on Android R.

    // The method - satisfiedBy() has changed to canBeSatisfiedBy() starting from Android R, so the

    // method - canBeSatisfiedBy() cannot be found when running this test on Android Q.

    fun testCanBeSatisfiedBy_OnlyForR() {

        // MatchAllNetworkSpecifier didn't follow its parent class to change the satisfiedBy() to

        // canBeSatisfiedBy(), so if a caller calls MatchAllNetworkSpecifier#canBeSatisfiedBy(), the

        // NetworkSpecifier#canBeSatisfiedBy() will be called actually, and false will be returned.