From 681eadeb855020c16a79fb3e6d321c5c4298409f Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 16 Oct 2023 09:53:31 -0700 Subject: [PATCH] Test overriding resource type in `RawResourceDataSource` I couldn't work out a good way to set up a test environment with an asset in a different package, so I'm not adding a test for the package overriding. PiperOrigin-RevId: 573843326 --- .../RawResourceDataSourceContractTest.java | 12 +++++++++++- .../src/androidTest/res/font/test_font.ttf | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 libraries/datasource/src/androidTest/res/font/test_font.ttf diff --git a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java index 77c9ab86e0..b78ca02cfe 100644 --- a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java +++ b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java @@ -31,6 +31,7 @@ public final class RawResourceDataSourceContractTest extends DataSourceContractT private static final byte[] RESOURCE_1_DATA = Util.getUtf8Bytes("resource1 abc\n"); private static final byte[] RESOURCE_2_DATA = Util.getUtf8Bytes("resource2 abcdef\n"); + private static final byte[] FONT_DATA = Util.getUtf8Bytes("test font data\n"); @Override protected DataSource createDataSource() { @@ -58,7 +59,7 @@ public final class RawResourceDataSourceContractTest extends DataSourceContractT .build(), // Additional resources using different URI schemes. new TestResource.Builder() - .setName("android.resource:// with package, type, and name") + .setName("android.resource:// with package, 'raw' type, and name") .setUri( Uri.parse( "android.resource://" @@ -66,6 +67,15 @@ public final class RawResourceDataSourceContractTest extends DataSourceContractT + "/raw/resource1")) .setExpectedBytes(RESOURCE_1_DATA) .build(), + new TestResource.Builder() + .setName("android.resource:// with package, 'font' type, and name") + .setUri( + Uri.parse( + "android.resource://" + + ApplicationProvider.getApplicationContext().getPackageName() + + "/font/test_font")) + .setExpectedBytes(FONT_DATA) + .build(), new TestResource.Builder() .setName("android.resource:// with type and name only") .setUri(Uri.parse("android.resource:///raw/resource1")) diff --git a/libraries/datasource/src/androidTest/res/font/test_font.ttf b/libraries/datasource/src/androidTest/res/font/test_font.ttf new file mode 100644 index 0000000000..4fdf782332 --- /dev/null +++ b/libraries/datasource/src/androidTest/res/font/test_font.ttf @@ -0,0 +1 @@ +test font data