From 440d2ab162604a5555ebdaa6d71b2f82120b1e09 Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 22 Feb 2024 09:39:34 -0800 Subject: [PATCH] ForwardingAudioSink: add override for release() We forgot to add it when we added AudioSink.release(). The commit includes a test that ensures ForwardingAudioSink overrides all the methods defined in the AudioSink interface. PiperOrigin-RevId: 609402258 --- .../exoplayer/audio/ForwardingAudioSink.java | 5 +++ .../audio/ForwardingAudioSinkTest.java | 42 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/ForwardingAudioSinkTest.java diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java index 62bfa34b3c..4a9dcdacf1 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ForwardingAudioSink.java @@ -203,4 +203,9 @@ public class ForwardingAudioSink implements AudioSink { public void reset() { sink.reset(); } + + @Override + public void release() { + sink.release(); + } } diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/ForwardingAudioSinkTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/ForwardingAudioSinkTest.java new file mode 100644 index 0000000000..a4c213ed76 --- /dev/null +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/ForwardingAudioSinkTest.java @@ -0,0 +1,42 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package androidx.media3.exoplayer.audio; + +import static com.google.common.truth.Truth.assertThat; + +import androidx.media3.test.utils.TestUtil; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import java.lang.reflect.Method; +import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Unit tests for {@link ForwardingAudioSink}. */ +@RunWith(AndroidJUnit4.class) +public final class ForwardingAudioSinkTest { + @Test + public void forwardingAudioSink_overridesAllAudioSinkMethods() throws NoSuchMethodException { + // Check with reflection that ForwardingAudioSink overrides all AudioSink methods. + List methods = TestUtil.getPublicMethods(AudioSink.class); + for (Method method : methods) { + assertThat( + ForwardingAudioSink.class + .getDeclaredMethod(method.getName(), method.getParameterTypes()) + .getDeclaringClass()) + .isEqualTo(ForwardingAudioSink.class); + } + } +}