From 50530147d01a948ccd277e46bca8b0414bf87254 Mon Sep 17 00:00:00 2001 From: eguven Date: Thu, 29 Jun 2017 03:28:21 -0700 Subject: [PATCH] Add a new test and extra checks to DashDownloadServiceTest Modified old testRemoveAction to test removing content after it's fully downloaded. Added a new testRemoveBeforeDownloadComplete which tests removing content before it's fully downloaded. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160507573 --- .../android/exoplayer2/testutil/FakeDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java index b3f76391e4..57e0ba41dd 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java @@ -63,11 +63,11 @@ import java.util.HashMap; * .newDefaultData() * .appendReadData(defaultData) * .endData() - * .setData("http:///1", data1) + * .setData("http://1", data1) * .newData("test_file") * .appendReadError(new IOException()) - * .appendReadData(data2); - * // No need to call endData at the end + * .appendReadData(data2) + * .endData(); * */ public final class FakeDataSource implements DataSource { @@ -139,7 +139,7 @@ public final class FakeDataSource implements DataSource { (int) Math.min(Math.max(0, dataSpec.position - scannedLength), segment.length); scannedLength += segment.length; findingCurrentSegmentIndex &= segment.isErrorSegment() ? segment.exceptionCleared - : segment.bytesRead == segment.length; + : (!segment.isActionSegment() && segment.bytesRead == segment.length); if (findingCurrentSegmentIndex) { currentSegmentIndex++; }