From 05cbbffbd78fddd9eb2b416fcf4b9e890adc1a90 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 29 Aug 2024 03:49:20 -0700
Subject: [PATCH] Add a space in the `ParserException` message

PiperOrigin-RevId: 668870991
---
 .../java/androidx/media3/common/ParserException.java  |  2 +-
 .../androidx/media3/extractor/VorbisUtilTest.java     | 11 +++++++----
 .../media3/transformer/ImageAssetLoaderTest.java      |  8 +++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/ParserException.java b/libraries/common/src/main/java/androidx/media3/common/ParserException.java
index 5ae5e46900..ee4c74d51f 100644
--- a/libraries/common/src/main/java/androidx/media3/common/ParserException.java
+++ b/libraries/common/src/main/java/androidx/media3/common/ParserException.java
@@ -113,7 +113,7 @@ public class ParserException extends IOException {
   @Override
   public String getMessage() {
     return super.getMessage()
-        + "{contentIsMalformed="
+        + " {contentIsMalformed="
         + contentIsMalformed
         + ", dataType="
         + dataType
diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/VorbisUtilTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/VorbisUtilTest.java
index 3fc2b0b32d..179f1d456c 100644
--- a/libraries/extractor/src/test/java/androidx/media3/extractor/VorbisUtilTest.java
+++ b/libraries/extractor/src/test/java/androidx/media3/extractor/VorbisUtilTest.java
@@ -20,6 +20,7 @@ import static androidx.media3.extractor.VorbisUtil.verifyVorbisHeaderCapturePatt
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.media3.common.C;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.test.utils.TestUtil;
@@ -116,8 +117,9 @@ public final class VorbisUtilTest {
       VorbisUtil.verifyVorbisHeaderCapturePattern(0x99, header, false);
       fail();
     } catch (ParserException e) {
-      assertThat(e.getMessage())
-          .isEqualTo("expected header type 99{contentIsMalformed=true, dataType=1}");
+      assertThat(e).hasMessageThat().contains("expected header type 99");
+      assertThat(e.contentIsMalformed).isTrue();
+      assertThat(e.dataType).isEqualTo(C.DATA_TYPE_MEDIA);
     }
   }
 
@@ -137,8 +139,9 @@ public final class VorbisUtilTest {
       VorbisUtil.verifyVorbisHeaderCapturePattern(0x01, header, false);
       fail();
     } catch (ParserException e) {
-      assertThat(e.getMessage())
-          .isEqualTo("expected characters 'vorbis'{contentIsMalformed=true, dataType=1}");
+      assertThat(e).hasMessageThat().contains("expected characters 'vorbis'");
+      assertThat(e.contentIsMalformed).isTrue();
+      assertThat(e.dataType).isEqualTo(C.DATA_TYPE_MEDIA);
     }
   }
 
diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
index 8b1384568f..28f978c552 100644
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
@@ -157,13 +157,11 @@ public class ImageAssetLoaderTest {
         });
     ParserException parserException = (ParserException) exceptionRef.get().getCause();
 
-    assertThat(parserException.contentIsMalformed).isFalse();
-    assertThat(parserException.dataType).isEqualTo(C.DATA_TYPE_MEDIA);
     assertThat(parserException)
         .hasMessageThat()
-        .isEqualTo(
-            "Attempted to load a Bitmap from unsupported MIME type:"
-                + " image/gif{contentIsMalformed=false, dataType=1}");
+        .contains("Attempted to load a Bitmap from unsupported MIME type: image/gif");
+    assertThat(parserException.contentIsMalformed).isFalse();
+    assertThat(parserException.dataType).isEqualTo(C.DATA_TYPE_MEDIA);
   }
 
   private static AssetLoader getAssetLoader(AssetLoader.Listener listener, String uri) {