Fix DashManifestParserTest in release branch

google · Oct 14, 2019 · 55ff555 · 55ff555
1 parent a9a1cb7
commit 55ff555
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 76 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ allprojects {
         jcenter()
     }
     project.ext {
-        exoplayerPublishEnabled = false
+        exoplayerPublishEnabled = true
     }
     if (it.hasProperty('externalBuildDir')) {
         if (!new File(externalBuildDir).isAbsolute()) {

diff --git a/.../test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/.../test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -26,11 +26,14 @@
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
+import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 
 /** Unit tests for {@link DashManifestParser}. */
 @RunWith(AndroidJUnit4.class)
@@ -188,81 +191,6 @@ public void parseMediaPresentationDescription_labels() throws IOException {
     assertThat(adaptationSets.get(1).representations.get(0).format.label).isEqualTo("video label");
   }
 
-  @Test
-  public void parseSegmentTimeline_repeatCount() throws Exception {
-    DashManifestParser parser = new DashManifestParser();
-    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
-    xpp.setInput(
-        new StringReader(
-            "<SegmentTimeline><S d=\"96000\" r=\"2\"/><S d=\"48000\" r=\"0\"/></SegmentTimeline>"
-                + NEXT_TAG));
-    xpp.next();
-
-    List<SegmentTimelineElement> elements =
-        parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
-
-    assertThat(elements)
-        .containsExactly(
-            new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000))
-        .inOrder();
-    assertNextTag(xpp);
-  }
-
-  @Test
-  public void parseSegmentTimeline_singleUndefinedRepeatCount() throws Exception {
-    DashManifestParser parser = new DashManifestParser();
-    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
-    xpp.setInput(
-        new StringReader(
-            "<SegmentTimeline><S d=\"96000\" r=\"-1\"/></SegmentTimeline>" + NEXT_TAG));
-    xpp.next();
-
-    List<SegmentTimelineElement> elements =
-        parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
-
-    assertThat(elements)
-        .containsExactly(
-            new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 96000))
-        .inOrder();
-    assertNextTag(xpp);
-  }
-
-  @Test
-  public void parseSegmentTimeline_timeOffsetsAndUndefinedRepeatCount() throws Exception {
-    DashManifestParser parser = new DashManifestParser();
-    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
-    xpp.setInput(
-        new StringReader(
-            "<SegmentTimeline><S t=\"0\" "
-                + "d=\"96000\" r=\"-1\"/><S t=\"192000\" d=\"48000\" r=\"-1\"/>"
-                + "</SegmentTimeline>"
-                + NEXT_TAG));
-    xpp.next();
-
-    List<SegmentTimelineElement> elements =
-        parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
-
-    assertThat(elements)
-        .containsExactly(
-            new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
-            new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 48000),
-            new SegmentTimelineElement(/* startTime= */ 240000, /* duration= */ 48000),
-            new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000),
-            new SegmentTimelineElement(/* startTime= */ 336000, /* duration= */ 48000),
-            new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 48000),
-            new SegmentTimelineElement(/* startTime= */ 432000, /* duration= */ 48000))
-        .inOrder();
-    assertNextTag(xpp);
-  }
-
   @Test
   public void parseLabel() throws Exception {
     DashManifestParser parser = new DashManifestParser();