diff options
author | orionlee <orionlee@yahoo.com> | 2019-11-05 10:14:07 -0800 |
---|---|---|
committer | orionlee <orionlee@yahoo.com> | 2019-11-05 12:34:11 -0800 |
commit | 6e019f72de951acb21cec433a4da6cb64a103082 (patch) | |
tree | 3771b97ef64691708bcb5d7c319fa9764132b87b | |
parent | b80973bc303df5d51c4a677e2d65084eb3b938e8 (diff) | |
download | AntennaPod-6e019f72de951acb21cec433a4da6cb64a103082.zip |
code style / comment tweak per review
2 files changed, 4 insertions, 10 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java b/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java index 700c15eb6..4b28d36b5 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculator.java @@ -40,8 +40,10 @@ class ItemEnqueuePositionCalculator { case BACK: return curQueue.size(); case FRONT: - // return NOT 0, so that when a list of items are inserted, the items inserted - // keep the same order. Returning 0 will reverse the order + // Return not necessarily 0, so that when a list of items are downloaded and enqueued + // in succession of calls (e.g., users manually tapping download one by one), + // the items enqueued are kept the same order. + // Simply returning 0 will reverse the order. return getPositionOfFirstNonDownloadingItem(0, curQueue); case AFTER_CURRENTLY_PLAYING: int currentlyPlayingPosition = getCurrentlyPlayingPosition(curQueue, currentPlaying); diff --git a/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java b/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java index 68eb434a4..40ffd26b4 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/storage/ItemEnqueuePositionCalculatorTest.java @@ -189,17 +189,13 @@ public class ItemEnqueuePositionCalculatorTest { // A shallow copy, as the test code will manipulate the queue List<FeedItem> queue = new ArrayList<>(queueInitial); - // Test body - Playable currentlyPlaying = getCurrentlyPlaying(idCurrentlyPlaying); - // User clicks download on feed item 101 FeedItem tFI101 = setAsDownloading(101, stubDownloadStateProvider); doAddToQueueAndAssertResult(message + " (1st download)", calculator, tFI101, queue, currentlyPlaying, idsExpectedAfter101); - // Then user clicks download on feed item 102 FeedItem tFI102 = setAsDownloading(102, stubDownloadStateProvider); doAddToQueueAndAssertResult(message + " (2nd download, it should preserve order of download)", @@ -225,10 +221,6 @@ public class ItemEnqueuePositionCalculatorTest { } - // Common helpers: - // - common queue (of items) for tests - // - construct FeedItems for tests - static void doAddToQueueAndAssertResult(String message, ItemEnqueuePositionCalculator calculator, FeedItem itemToAdd, |