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

Commit 9e273e68 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Truth: better size list assertion" into main am: 73964577 am: a6d1e508 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3451608



Change-Id: Ic785ee35ba063adb2cdffd7b15f5752ad2fb1665
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01fda573 a6d1e508

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

+2 −2
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ public class AvrcpControllerStateMachineTest { 


        List<MediaSessionCompat.QueueItem> queue = controller.getQueue();

        assertThat(queue).isNotNull();

        assertThat(queue.size()).isEqualTo(2);

        assertThat(queue).hasSize(2);

        assertThat(queue.get(0).getDescription().getTitle().toString()).isEqualTo("title");

        assertThat(queue.get(1).getDescription().getTitle().toString()).isEqualTo("title 2");

    }
@@ -2054,7 +2054,7 @@ public class AvrcpControllerStateMachineTest { 
        playerNodes = mAvrcpStateMachine.findNode(results.getID());

        assertThat(playerNodes.isCached()).isTrue();

        assertThat(playerNodes.getChildren()).isNotNull();

        assertThat(playerNodes.getChildren().size()).isEqualTo(2);

        assertThat(playerNodes.getChildren()).hasSize(2);

        assertThat(playerNodes.getChildren().get(0).getMediaItem().toString())

                .isEqualTo("MediaItem{mFlags=1, mDescription=player 1, null, null}");

        assertThat(playerNodes.getChildren().get(1).getMediaItem().toString())

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/BrowseNodeTest.java

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class BrowseNodeTest { 


        mRootNode.addChild(browseNode);



        assertThat(mRootNode.getContents().size()).isEqualTo(1);

        assertThat(mRootNode.getContents()).hasSize(1);

    }



    @Test

android/app/tests/unit/src/com/android/bluetooth/bass_client/BaseDataTest.java

+10 −10
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class BaseDataTest { 
        assertThat(level.presentationDelay).isEqualTo(new byte[] {0x01, 0x02, 0x03});

        assertThat(level.numSubGroups).isEqualTo(1);



        assertThat(data.getLevelTwo().size()).isEqualTo(1);

        assertThat(data.getLevelTwo()).hasSize(1);

        level = data.getLevelTwo().get(0);



        assertThat(level.numSubGroups).isEqualTo(1);
@@ -113,7 +113,7 @@ public class BaseDataTest { 
        assertThat(level.codecConfigLength).isEqualTo(2);

        assertThat(level.metaDataLength).isEqualTo(3);



        assertThat(data.getLevelThree().size()).isEqualTo(1);

        assertThat(data.getLevelThree()).hasSize(1);

        level = data.getLevelThree().get(0);

        assertThat(level.index).isEqualTo(4);

        assertThat(level.codecConfigLength).isEqualTo(3);
@@ -249,7 +249,7 @@ public class BaseDataTest { 
        assertThat(level.presentationDelay).isEqualTo(new byte[] {0x01, 0x02, 0x03});

        assertThat(level.numSubGroups).isEqualTo(1);



        assertThat(data.getLevelTwo().size()).isEqualTo(1);

        assertThat(data.getLevelTwo()).hasSize(1);

        level = data.getLevelTwo().get(0);



        assertThat(level.numSubGroups).isEqualTo(1);
@@ -257,7 +257,7 @@ public class BaseDataTest { 
        assertThat(level.codecConfigLength).isEqualTo(2);

        assertThat(level.metaDataLength).isEqualTo(3);



        assertThat(data.getLevelThree().size()).isEqualTo(1);

        assertThat(data.getLevelThree()).hasSize(1);

        level = data.getLevelThree().get(0);

        assertThat(level.index).isEqualTo(4);
@@ -305,7 +305,7 @@ public class BaseDataTest { 
        assertThat(level.presentationDelay).isEqualTo(new byte[] {0x01, 0x02, 0x03});

        assertThat(level.numSubGroups).isEqualTo(1);



        assertThat(data.getLevelTwo().size()).isEqualTo(1);

        assertThat(data.getLevelTwo()).hasSize(1);

        level = data.getLevelTwo().get(0);



        assertThat(level.numSubGroups).isEqualTo(1);
@@ -317,7 +317,7 @@ public class BaseDataTest { 
        assertThat(level.codecConfigLength).isEqualTo(4);

        assertThat(level.metaDataLength).isEqualTo(3);



        assertThat(data.getLevelThree().size()).isEqualTo(1);

        assertThat(data.getLevelThree()).hasSize(1);

        level = data.getLevelThree().get(0);

        assertThat(level.index).isEqualTo(4);

        assertThat(level.codecConfigLength).isEqualTo(3);
@@ -353,7 +353,7 @@ public class BaseDataTest { 
        assertThat(level.presentationDelay).isEqualTo(new byte[] {0x01, 0x02, 0x03});

        assertThat(level.numSubGroups).isEqualTo(1);



        assertThat(data.getLevelTwo().size()).isEqualTo(1);

        assertThat(data.getLevelTwo()).hasSize(1);

        level = data.getLevelTwo().get(0);



        assertThat(level.numSubGroups).isEqualTo(1);
@@ -365,7 +365,7 @@ public class BaseDataTest { 
        assertThat(level.codecConfigLength).isEqualTo(0);

        assertThat(level.metaDataLength).isEqualTo(0);



        assertThat(data.getLevelThree().size()).isEqualTo(1);

        assertThat(data.getLevelThree()).hasSize(1);

        level = data.getLevelThree().get(0);

        assertThat(level.index).isEqualTo(4);

        assertThat(level.codecConfigLength).isEqualTo(0);
@@ -451,7 +451,7 @@ public class BaseDataTest { 
        assertThat(level.presentationDelay).isEqualTo(new byte[] {0x01, 0x02, 0x03});

        assertThat(level.numSubGroups).isEqualTo(1);



        assertThat(data.getLevelTwo().size()).isEqualTo(1);

        assertThat(data.getLevelTwo()).hasSize(1);

        level = data.getLevelTwo().get(0);



        assertThat(level.numSubGroups).isEqualTo(1);
@@ -460,7 +460,7 @@ public class BaseDataTest { 
        assertThat(level.metaDataLength).isEqualTo(metaDataLength);

        assertThat(level.metaData).isEqualTo(Bytes.concat(metadataHeader, metadataPayload));



        assertThat(data.getLevelThree().size()).isEqualTo(1);

        assertThat(data.getLevelThree()).hasSize(1);

        level = data.getLevelThree().get(0);

        assertThat(level.index).isEqualTo(4);

        assertThat(level.codecConfigLength).isEqualTo(3);

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+65 −65

File changed.

Preview size limit exceeded, changes collapsed.

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientStateMachineTest.java

+3 −3
Original line number Diff line number Diff line
@@ -3528,7 +3528,7 @@ public class BassClientStateMachineTest { 
                null, characteristic, GATT_SUCCESS);

        TestUtils.waitForLooperToFinishScheduledTask(mHandlerThread.getLooper());



        assertThat(mBassClientStateMachine.getAllSources().size()).isEqualTo(1);

        assertThat(mBassClientStateMachine.getAllSources()).hasSize(1);

        BluetoothLeBroadcastReceiveState recvState = mBassClientStateMachine.getAllSources().get(0);



        assertThat(recvState.getSourceId()).isEqualTo(sourceId);
@@ -3540,10 +3540,10 @@ public class BassClientStateMachineTest { 
        assertThat(recvState.getBigEncryptionState()).isEqualTo(bigEncryptState);

        assertThat(recvState.getNumSubgroups()).isEqualTo(numOfSubgroups);



        assertThat(recvState.getBisSyncState().size()).isEqualTo(numOfSubgroups);

        assertThat(recvState.getBisSyncState()).hasSize(numOfSubgroups);

        assertThat(recvState.getBisSyncState().get(0)).isEqualTo(bisSyncState);



        assertThat(recvState.getSubgroupMetadata().size()).isEqualTo(numOfSubgroups);

        assertThat(recvState.getSubgroupMetadata()).hasSize(numOfSubgroups);

        BluetoothLeAudioContentMetadata metaData = recvState.getSubgroupMetadata().get(0);

        assertThat(metaData.getRawMetadata().length).isEqualTo(metaDataLength);

        assertThat(metaData.getRawMetadata())