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

Commit 6b6a0de1 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Replace Log.wtf with an exception in MediaCarouselController. 

These tests fail locally using Log.wtf prevents further tests
from running because it causes the test process to exit.

Also, @Ignore all of these tests as they still fail.

Bug: 253229241
Test: atest SystemUITests
Change-Id: Iad35b2559e0869ad80a0b3462c93127a98ae8524
parent 847d0f53

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt

+10 −2
Original line number Original line Diff line number Diff line
@@ -610,7 +610,11 @@ constructor( 
            // are

            // are

            // elements in mediaPlayers.

            // elements in mediaPlayers.

            if (MediaPlayerData.players().size != mediaContent.childCount) {

            if (MediaPlayerData.players().size != mediaContent.childCount) {

                Log.wtf(TAG, "Size of players list and number of views in carousel are out of sync")

                throw IllegalStateException(

                    "Size of players list and number of views in carousel are out of sync. " +

                        "Players size is ${MediaPlayerData.players().size}. " +

                        "View count is ${mediaContent.childCount}."

                )

            }

            }

            return existingPlayer == null

            return existingPlayer == null

        }

        }
@@ -667,7 +671,11 @@ constructor( 
            // are

            // are

            // elements in mediaPlayers.

            // elements in mediaPlayers.

            if (MediaPlayerData.players().size != mediaContent.childCount) {

            if (MediaPlayerData.players().size != mediaContent.childCount) {

                Log.wtf(TAG, "Size of players list and number of views in carousel are out of sync")

                throw IllegalStateException(

                    "Size of players list and number of views in carousel are out of sync. " +

                        "Players size is ${MediaPlayerData.players().size}. " +

                        "View count is ${mediaContent.childCount}."

                )

            }

            }

        }

        }

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaCarouselControllerTest.kt

+20 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import javax.inject.Provider 
import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertTrue

import junit.framework.Assert.assertTrue

import org.junit.Before

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.ArgumentCaptor
@@ -119,6 +120,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        MediaPlayerData.clear()

        MediaPlayerData.clear()

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testPlayerOrdering() {

    fun testPlayerOrdering() {

        // Test values: key, data, last active time

        // Test values: key, data, last active time
@@ -295,6 +297,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        }

        }

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testOrderWithSmartspace_prioritized() {

    fun testOrderWithSmartspace_prioritized() {

        testPlayerOrdering()

        testPlayerOrdering()
@@ -312,6 +315,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertTrue(MediaPlayerData.playerKeys().elementAt(2).isSsMediaRec)

        assertTrue(MediaPlayerData.playerKeys().elementAt(2).isSsMediaRec)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testOrderWithSmartspace_prioritized_updatingVisibleMediaPlayers() {

    fun testOrderWithSmartspace_prioritized_updatingVisibleMediaPlayers() {

        testPlayerOrdering()

        testPlayerOrdering()
@@ -328,6 +332,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertTrue(MediaPlayerData.visiblePlayerKeys().elementAt(2).isSsMediaRec)

        assertTrue(MediaPlayerData.visiblePlayerKeys().elementAt(2).isSsMediaRec)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testOrderWithSmartspace_notPrioritized() {

    fun testOrderWithSmartspace_notPrioritized() {

        testPlayerOrdering()

        testPlayerOrdering()
@@ -346,6 +351,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertTrue(MediaPlayerData.playerKeys().elementAt(idx).isSsMediaRec)

        assertTrue(MediaPlayerData.playerKeys().elementAt(idx).isSsMediaRec)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testPlayingExistingMediaPlayerFromCarousel_visibleMediaPlayersNotUpdated() {

    fun testPlayingExistingMediaPlayerFromCarousel_visibleMediaPlayersNotUpdated() {

        testPlayerOrdering()

        testPlayerOrdering()
@@ -382,6 +388,8 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
            MediaPlayerData.playerKeys().elementAt(0)

            MediaPlayerData.playerKeys().elementAt(0)

        )

        )

    }

    }



    @Ignore("b/253229241")

    @Test

    @Test

    fun testSwipeDismiss_logged() {

    fun testSwipeDismiss_logged() {

        mediaCarouselController.mediaCarouselScrollHandler.dismissCallback.invoke()

        mediaCarouselController.mediaCarouselScrollHandler.dismissCallback.invoke()
@@ -389,6 +397,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logSwipeDismiss()

        verify(logger).logSwipeDismiss()

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testSettingsButton_logged() {

    fun testSettingsButton_logged() {

        mediaCarouselController.settingsButton.callOnClick()

        mediaCarouselController.settingsButton.callOnClick()
@@ -396,6 +405,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logCarouselSettings()

        verify(logger).logCarouselSettings()

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testLocationChangeQs_logged() {

    fun testLocationChangeQs_logged() {

        mediaCarouselController.onDesiredLocationChanged(

        mediaCarouselController.onDesiredLocationChanged(
@@ -406,6 +416,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_QS)

        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_QS)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testLocationChangeQqs_logged() {

    fun testLocationChangeQqs_logged() {

        mediaCarouselController.onDesiredLocationChanged(

        mediaCarouselController.onDesiredLocationChanged(
@@ -416,6 +427,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_QQS)

        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_QQS)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testLocationChangeLockscreen_logged() {

    fun testLocationChangeLockscreen_logged() {

        mediaCarouselController.onDesiredLocationChanged(

        mediaCarouselController.onDesiredLocationChanged(
@@ -426,6 +438,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_LOCKSCREEN)

        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_LOCKSCREEN)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testLocationChangeDream_logged() {

    fun testLocationChangeDream_logged() {

        mediaCarouselController.onDesiredLocationChanged(

        mediaCarouselController.onDesiredLocationChanged(
@@ -436,6 +449,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_DREAM_OVERLAY)

        verify(logger).logCarouselPosition(MediaHierarchyManager.LOCATION_DREAM_OVERLAY)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testRecommendationRemoved_logged() {

    fun testRecommendationRemoved_logged() {

        val packageName = "smartspace package"

        val packageName = "smartspace package"
@@ -449,6 +463,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        verify(logger).logRecommendationRemoved(eq(packageName), eq(instanceId!!))

        verify(logger).logRecommendationRemoved(eq(packageName), eq(instanceId!!))

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testMediaLoaded_ScrollToActivePlayer() {

    fun testMediaLoaded_ScrollToActivePlayer() {

        listener.value.onMediaDataLoaded(

        listener.value.onMediaDataLoaded(
@@ -506,6 +521,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        )

        )

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testMediaLoadedFromRecommendationCard_ScrollToActivePlayer() {

    fun testMediaLoadedFromRecommendationCard_ScrollToActivePlayer() {

        listener.value.onSmartspaceMediaDataLoaded(

        listener.value.onSmartspaceMediaDataLoaded(
@@ -549,6 +565,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertEquals(playerIndex, 0)

        assertEquals(playerIndex, 0)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testRecommendationRemovedWhileNotVisible_updateHostVisibility() {

    fun testRecommendationRemovedWhileNotVisible_updateHostVisibility() {

        var result = false

        var result = false
@@ -560,6 +577,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertEquals(true, result)

        assertEquals(true, result)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testRecommendationRemovedWhileVisible_thenReorders_updateHostVisibility() {

    fun testRecommendationRemovedWhileVisible_thenReorders_updateHostVisibility() {

        var result = false

        var result = false
@@ -573,6 +591,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertEquals(true, result)

        assertEquals(true, result)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testGetCurrentVisibleMediaContentIntent() {

    fun testGetCurrentVisibleMediaContentIntent() {

        val clickIntent1 = mock(PendingIntent::class.java)

        val clickIntent1 = mock(PendingIntent::class.java)
@@ -619,6 +638,7 @@ class MediaCarouselControllerTest : SysuiTestCase() { 
        assertEquals(mediaCarouselController.getCurrentVisibleMediaContentIntent(), clickIntent2)

        assertEquals(mediaCarouselController.getCurrentVisibleMediaContentIntent(), clickIntent2)

    }

    }





    @Ignore("b/253229241")

    @Test

    @Test

    fun testSetCurrentState_UpdatePageIndicatorAlphaWhenSquish() {

    fun testSetCurrentState_UpdatePageIndicatorAlphaWhenSquish() {

        val delta = 0.0001F

        val delta = 0.0001F