From 91c86ecec1b523786244647a481e1459e86f1ffa Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 16 Dec 2019 08:33:53 +0000
Subject: [PATCH] Fix ParameterName warnings in core tests

PiperOrigin-RevId: 285716982
---
 .../exoplayer2/MediaPeriodQueueTest.java      | 28 +++++++++----------
 .../SilenceSkippingAudioProcessorTest.java    |  5 ++--
 .../exoplayer2/source/SampleQueueTest.java    |  6 ++--
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
index 1a0e13b6c1..56726e3914 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -81,7 +81,7 @@ public final class MediaPeriodQueueTest {
 
   @Test
   public void getNextMediaPeriodInfo_withPrerollAd_returnsCorrectMediaPeriodInfos() {
-    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ 0);
+    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs...= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     assertNextMediaPeriodInfoIsAd(/* adGroupIndex= */ 0, /* contentPositionUs= */ 0);
     advance();
@@ -97,7 +97,7 @@ public final class MediaPeriodQueueTest {
   public void getNextMediaPeriodInfo_withMidrollAds_returnsCorrectMediaPeriodInfos() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ 0,
@@ -135,7 +135,7 @@ public final class MediaPeriodQueueTest {
   public void getNextMediaPeriodInfo_withMidrollAndPostroll_returnsCorrectMediaPeriodInfos() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         C.TIME_END_OF_SOURCE);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ 0,
@@ -169,7 +169,7 @@ public final class MediaPeriodQueueTest {
 
   @Test
   public void getNextMediaPeriodInfo_withPostrollLoadError_returnsEmptyFinalMediaPeriodInfo() {
-    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs= */ C.TIME_END_OF_SOURCE);
+    setupTimeline(/* initialPositionUs= */ 0, /* adGroupTimesUs...= */ C.TIME_END_OF_SOURCE);
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         /* startPositionUs= */ 0,
         /* endPositionUs= */ C.TIME_END_OF_SOURCE,
@@ -191,7 +191,7 @@ public final class MediaPeriodQueueTest {
       updateQueuedPeriods_withDurationChangeAfterReadingPeriod_handlesChangeAndRemovesPeriodsAfterChangedPeriod() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -204,7 +204,7 @@ public final class MediaPeriodQueueTest {
     // Change position of second ad (= change duration of content between ads).
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US + 1);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -221,7 +221,7 @@ public final class MediaPeriodQueueTest {
       updateQueuedPeriods_withDurationChangeBeforeReadingPeriod_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -235,7 +235,7 @@ public final class MediaPeriodQueueTest {
     // Change position of first ad (= change duration of content before first ad).
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US + 1,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US + 1,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -252,7 +252,7 @@ public final class MediaPeriodQueueTest {
       updateQueuedPeriods_withDurationChangeInReadingPeriodAfterReadingPosition_handlesChangeAndRemovesPeriodsAfterChangedPeriod() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -267,7 +267,7 @@ public final class MediaPeriodQueueTest {
     // Change position of second ad (= change duration of content between ads).
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US - 1000);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -286,7 +286,7 @@ public final class MediaPeriodQueueTest {
       updateQueuedPeriods_withDurationChangeInReadingPeriodBeforeReadingPosition_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -301,7 +301,7 @@ public final class MediaPeriodQueueTest {
     // Change position of second ad (= change duration of content between ads).
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US - 1000);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -320,7 +320,7 @@ public final class MediaPeriodQueueTest {
       updateQueuedPeriods_withDurationChangeInReadingPeriodReadToEnd_doesntHandleChangeAndRemovesPeriodsAfterChangedPeriod() {
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
@@ -335,7 +335,7 @@ public final class MediaPeriodQueueTest {
     // Change position of second ad (= change duration of content between ads).
     setupTimeline(
         /* initialPositionUs= */ 0,
-        /* adGroupTimesUs= */ FIRST_AD_START_TIME_US,
+        /* adGroupTimesUs...= */ FIRST_AD_START_TIME_US,
         SECOND_AD_START_TIME_US - 1000);
     setAdGroupLoaded(/* adGroupIndex= */ 0);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
index e8eb530d99..6783c96055 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
@@ -268,10 +268,11 @@ public final class SilenceSkippingAudioProcessorTest {
     Pcm16BitAudioBuilder audioBuilder = new Pcm16BitAudioBuilder(channelCount, totalFrameCount);
     while (!audioBuilder.isFull()) {
       int silenceDurationFrames = (silenceDurationMs * sampleRate) / 1000;
-      audioBuilder.appendFrames(/* count= */ silenceDurationFrames, /* channelLevels= */ (short) 0);
+      audioBuilder.appendFrames(
+          /* count= */ silenceDurationFrames, /* channelLevels...= */ (short) 0);
       int noiseDurationFrames = (noiseDurationMs * sampleRate) / 1000;
       audioBuilder.appendFrames(
-          /* count= */ noiseDurationFrames, /* channelLevels= */ Short.MAX_VALUE);
+          /* count= */ noiseDurationFrames, /* channelLevels...= */ Short.MAX_VALUE);
     }
     return new InputBufferProvider(audioBuilder.build());
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 4823a725c9..ad9e3f739f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -1078,7 +1078,7 @@ public final class SampleQueueTest {
    * filled with the specified sample data.
    *
    * @param timeUs The expected buffer timestamp.
-   * @param isKeyframe The expected keyframe flag.
+   * @param isKeyFrame The expected keyframe flag.
    * @param isEncrypted The expected encrypted flag.
    * @param sampleData An array containing the expected sample data.
    * @param offset The offset in {@code sampleData} of the expected sample data.
@@ -1086,7 +1086,7 @@ public final class SampleQueueTest {
    */
   private void assertReadSample(
       long timeUs,
-      boolean isKeyframe,
+      boolean isKeyFrame,
       boolean isEncrypted,
       byte[] sampleData,
       int offset,
@@ -1104,7 +1104,7 @@ public final class SampleQueueTest {
     assertThat(formatHolder.format).isNull();
     // inputBuffer should be populated.
     assertThat(inputBuffer.timeUs).isEqualTo(timeUs);
-    assertThat(inputBuffer.isKeyFrame()).isEqualTo(isKeyframe);
+    assertThat(inputBuffer.isKeyFrame()).isEqualTo(isKeyFrame);
     assertThat(inputBuffer.isDecodeOnly()).isFalse();
     assertThat(inputBuffer.isEncrypted()).isEqualTo(isEncrypted);
     inputBuffer.flip();