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

Commit 984957f0 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Revert "[MAP] Temporarily catch failure in test"" into main am: 4a4b1ba2 

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



Change-Id: I20c307a461ad18657daaa381452abd7554cd11ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e11d8455 4a4b1ba2

android/app/tests/unit/src/com/android/bluetooth/map/BluetoothMapSmsPduTest.java

+1 −8
Original line number Diff line number Diff line
@@ -146,15 +146,8 @@ public class BluetoothMapSmsPduTest { 


        byte[] encodedMessageSms = messageSmsToEncode.encode();

        InputStream inputStream = new ByteArrayInputStream(encodedMessageSms);

        BluetoothMapbMessage messageParsed;

        try {

          messageParsed = BluetoothMapbMessage.parse(inputStream,

        BluetoothMapbMessage messageParsed = BluetoothMapbMessage.parse(inputStream,

                BluetoothMapAppParams.CHARSET_NATIVE);

        } catch (IllegalArgumentException e) {

          android.util.Log.e("getSubmitPdus_withTypeCDMA", "Failure: " + e);

          // TODO b/257375445 remove try catch that prevent failure

          return;

        }



        assertThat(messageParsed).isInstanceOf(BluetoothMapbMessageSms.class);

    }

android/app/tests/unit/src/com/android/bluetooth/map/BluetoothMapbMessageSmsTest.java

+1 −8
Original line number Diff line number Diff line
@@ -84,15 +84,8 @@ public class BluetoothMapbMessageSmsTest { 
        byte[] encodedMessageSms = messageSmsToEncode.encode();

        InputStream inputStream = new ByteArrayInputStream(encodedMessageSms);



        BluetoothMapbMessage messageParsed;

        try {

          messageParsed = BluetoothMapbMessage.parse(inputStream,

        BluetoothMapbMessage messageParsed = BluetoothMapbMessage.parse(inputStream,

                BluetoothMapAppParams.CHARSET_NATIVE);

        } catch (IllegalArgumentException e) {

          android.util.Log.e("encodeToByteArray_thenAddByParsing", "Failure: " + e);

          // TODO b/257375445 remove try catch that prevent failure

          return;

        }

        assertThat(messageParsed).isInstanceOf(BluetoothMapbMessageSms.class);

        BluetoothMapbMessageSms messageSmsParsed = (BluetoothMapbMessageSms) messageParsed;

        assertThat(messageSmsParsed.getSmsBody()).isEqualTo(TEST_MESSAGE);