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

Commit 1884f4ef authored by Nikhil Nayunigari's avatar Nikhil Nayunigari
Browse files

Fix a flaky test in EthernetInterfaceTracker 

In EtherentDialogTest, we are creating an ethernet interface and that is
interfering with the interface count here. Since we are checking for the
presence of the interface with the id, checking the count isn't
necessary and could cause issues in the future if some other test keeps
adding new interfaces.

Removed the check for interface count to avoid this issue.

Flag: com.android.settings.connectivity.ethernet_settings

Test: Manual testing

Change-Id: I202112a10f1a57c7bc235f115c2c6a1eced8e6d4
parent 1f99733b

tests/robotests/src/com/android/settings/network/ethernet/EthernetInterfaceTrackerTest.kt

+19 −8
Original line number Diff line number Diff line
@@ -25,12 +25,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import org.junit.Assert.assertEquals

import org.junit.Assert.assertNotNull

import org.junit.Assert.assertNull

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.mock



@Ignore

@RunWith(AndroidJUnit4::class)

class EthernetTrackerImplTest {

class EthernetInterfaceTrackerTest {

    private val mockEthernetManager = mock<EthernetManager>()



    private val context: Context =
@@ -44,9 +47,19 @@ class EthernetTrackerImplTest { 


    private val ethernetTrackerImpl = EthernetTrackerImpl.getInstance(context)



    @Before

    fun setUp() {

        ethernetTrackerImpl.onInterfaceStateChanged(

            "eth0",

            EthernetManager.STATE_ABSENT,

            EthernetManager.ROLE_NONE,

            IpConfiguration(),

        )

    }



    @Test

    fun getInterface_shouldReturnEmpty() {

        assertNull(ethernetTrackerImpl.getInterface("id0"))

        assertNull(ethernetTrackerImpl.getInterface("eth0"))

    }



    @Test
@@ -57,23 +70,21 @@ class EthernetTrackerImplTest { 
    @Test

    fun interfacesChanged_shouldUpdateInterfaces() {

        ethernetTrackerImpl.onInterfaceStateChanged(

            "id0",

            "eth0",

            EthernetManager.STATE_LINK_DOWN,

            EthernetManager.ROLE_NONE,

            IpConfiguration(),

        )



        assertNotNull(ethernetTrackerImpl.getInterface("id0"))

        assertEquals(ethernetTrackerImpl.availableInterfaces.size, 1)

        assertNotNull(ethernetTrackerImpl.getInterface("eth0"))



        ethernetTrackerImpl.onInterfaceStateChanged(

            "id0",

            "eth0",

            EthernetManager.STATE_ABSENT,

            EthernetManager.ROLE_NONE,

            IpConfiguration(),

        )



        assertNull(ethernetTrackerImpl.getInterface("id0"))

        assertEquals(ethernetTrackerImpl.availableInterfaces.size, 0)

        assertNull(ethernetTrackerImpl.getInterface("eth0"))

    }

}