From a6ee778cfed750aa439e5f398b26e39131a0f837 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 24 Aug 2020 17:30:56 +0100
Subject: [PATCH] Remove unnecessary ID suffix.

PiperOrigin-RevId: 328154018
---
 .../analytics/AnalyticsCollectorTest.java          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
index 5e483c9a22..1b686b8d04 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
@@ -106,7 +106,7 @@ public final class AnalyticsCollectorTest {
   private static final int EVENT_AUDIO_INPUT_FORMAT_CHANGED = 26;
   private static final int EVENT_AUDIO_DISABLED = 27;
   private static final int EVENT_AUDIO_SESSION_ID = 28;
-  private static final int EVENT_AUDIO_POSITION_ADVANCING_ID = 29;
+  private static final int EVENT_AUDIO_POSITION_ADVANCING = 29;
   private static final int EVENT_AUDIO_UNDERRUN = 30;
   private static final int EVENT_VIDEO_ENABLED = 31;
   private static final int EVENT_VIDEO_DECODER_INIT = 32;
@@ -227,7 +227,7 @@ public final class AnalyticsCollectorTest {
     assertThat(listener.getEvents(EVENT_AUDIO_DECODER_INIT)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_AUDIO_INPUT_FORMAT_CHANGED)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID)).containsExactly(period0);
-    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING_ID)).containsExactly(period0);
+    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_ENABLED)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_DECODER_INIT)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_INPUT_FORMAT_CHANGED)).containsExactly(period0);
@@ -307,7 +307,7 @@ public final class AnalyticsCollectorTest {
         .containsExactly(period0, period1)
         .inOrder();
     assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID)).containsExactly(period0);
-    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING_ID)).containsExactly(period0);
+    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_ENABLED)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_DECODER_INIT))
         .containsExactly(period0, period1)
@@ -383,7 +383,7 @@ public final class AnalyticsCollectorTest {
     assertThat(listener.getEvents(EVENT_AUDIO_DECODER_INIT)).containsExactly(period1);
     assertThat(listener.getEvents(EVENT_AUDIO_INPUT_FORMAT_CHANGED)).containsExactly(period1);
     assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID)).containsExactly(period1);
-    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING_ID)).containsExactly(period1);
+    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING)).containsExactly(period1);
     assertThat(listener.getEvents(EVENT_VIDEO_ENABLED)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_DECODER_INIT)).containsExactly(period0);
     assertThat(listener.getEvents(EVENT_VIDEO_INPUT_FORMAT_CHANGED)).containsExactly(period0);
@@ -480,7 +480,7 @@ public final class AnalyticsCollectorTest {
     assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID))
         .containsExactly(period0, period1)
         .inOrder();
-    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING_ID))
+    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING))
         .containsExactly(period0, period1)
         .inOrder();
     assertThat(listener.getEvents(EVENT_AUDIO_DISABLED)).containsExactly(period0);
@@ -583,7 +583,7 @@ public final class AnalyticsCollectorTest {
     assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID))
         .containsExactly(period1Seq1, period1Seq2)
         .inOrder();
-    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING_ID))
+    assertThat(listener.getEvents(EVENT_AUDIO_POSITION_ADVANCING))
         .containsExactly(period1Seq1, period1Seq2)
         .inOrder();
     assertThat(listener.getEvents(EVENT_AUDIO_DISABLED)).containsExactly(period0);
@@ -1934,7 +1934,7 @@ public final class AnalyticsCollectorTest {
 
     @Override
     public void onAudioPositionAdvancing(EventTime eventTime, long playoutStartSystemTimeMs) {
-      reportedEvents.add(new ReportedEvent(EVENT_AUDIO_POSITION_ADVANCING_ID, eventTime));
+      reportedEvents.add(new ReportedEvent(EVENT_AUDIO_POSITION_ADVANCING, eventTime));
     }
 
     @Override