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

Commit 04dd0eb0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Fix CaptivePortalDataTest on R" am: fada307d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe
parents 25a7767c fada307d

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

+25 −25
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ class CaptivePortalDataTest { 
            .build()



    private val dataFromPasspoint = CaptivePortalData.Builder()

            .setUserPortalUrl(Uri.parse("https://tc.example.com/passpoint"),

                    CaptivePortalData.CAPTIVE_PORTAL_DATA_SOURCE_PASSPOINT)

            .setVenueInfoUrl(Uri.parse("https://venue.example.com/passpoint"),

                    CaptivePortalData.CAPTIVE_PORTAL_DATA_SOURCE_PASSPOINT)

            .setCaptive(true)

            .apply {

                if (SdkLevel.isAtLeastS()) {

                    setVenueFriendlyName("venue friendly name")

                    setUserPortalUrl(Uri.parse("https://tc.example.com/passpoint"),

                            CaptivePortalData.CAPTIVE_PORTAL_DATA_SOURCE_PASSPOINT)

                    setVenueInfoUrl(Uri.parse("https://venue.example.com/passpoint"),

                            CaptivePortalData.CAPTIVE_PORTAL_DATA_SOURCE_PASSPOINT)

                }

            }

            .build()
@@ -96,7 +96,6 @@ class CaptivePortalDataTest { 
        if (SdkLevel.isAtLeastS()) {

            assertNotEqualsAfterChange { it.setVenueFriendlyName("another friendly name") }

            assertNotEqualsAfterChange { it.setVenueFriendlyName(null) }

        }



            assertEquals(dataFromPasspoint, CaptivePortalData.Builder(dataFromPasspoint).build())

            assertNotEqualsAfterChange { it.setUserPortalUrl(
@@ -119,6 +118,7 @@ class CaptivePortalDataTest { 
                    Uri.parse("https://venue.example.com/passpoint"),

                    CaptivePortalData.CAPTIVE_PORTAL_DATA_SOURCE_OTHER) }

        }

    }



    @Test

    fun testUserPortalUrl() {