From ec34c083f422f8d4f7a04902c45f7ca866e5e481 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 29 Apr 2020 11:15:48 +0100
Subject: [PATCH] DownloadManagerTest: Make posting consistent

PiperOrigin-RevId: 308991602
---
 .../offline/DownloadManagerTest.java          | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 2d698ffc0d..c99332697f 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -380,7 +380,7 @@ public class DownloadManagerTest {
     assertRemoving(ID2);
     postDownloadRequest(ID2);
 
-    runOnMainThread(() -> downloadManager.pauseDownloads());
+    postPauseDownloads();
 
     assertQueued(ID1);
 
@@ -403,7 +403,7 @@ public class DownloadManagerTest {
     postDownloadRequest(ID3);
     assertDownloaderNotCreated(ID3, 0);
 
-    runOnMainThread(() -> downloadManager.resumeDownloads());
+    postResumeDownloads();
 
     FakeDownloader downloader4 = getDownloader(ID2, 2);
     downloader4.assertStarted();
@@ -421,11 +421,11 @@ public class DownloadManagerTest {
 
     assertDownloading(ID1);
 
-    runOnMainThread(() -> downloadManager.setStopReason(ID1, APP_STOP_REASON));
+    postSetStopReason(ID1, APP_STOP_REASON);
 
     assertStopped(ID1);
 
-    runOnMainThread(() -> downloadManager.setStopReason(ID1, Download.STOP_REASON_NONE));
+    postSetStopReason(ID1, Download.STOP_REASON_NONE);
 
     FakeDownloader downloader = getDownloader(ID1, 1);
     downloader.assertStarted();
@@ -440,7 +440,7 @@ public class DownloadManagerTest {
 
     assertDownloading(ID1);
 
-    runOnMainThread(() -> downloadManager.setStopReason(ID1, APP_STOP_REASON));
+    postSetStopReason(ID1, APP_STOP_REASON);
 
     assertStopped(ID1);
 
@@ -461,7 +461,7 @@ public class DownloadManagerTest {
     postRemoveRequest(ID2);
     assertRemoving(ID2);
 
-    runOnMainThread(() -> downloadManager.setStopReason(ID1, APP_STOP_REASON));
+    postSetStopReason(ID1, APP_STOP_REASON);
 
     assertStopped(ID1);
 
@@ -587,6 +587,18 @@ public class DownloadManagerTest {
     runOnMainThread(() -> downloadManager.removeAllDownloads());
   }
 
+  private void postPauseDownloads() {
+    runOnMainThread(() -> downloadManager.pauseDownloads());
+  }
+
+  private void postResumeDownloads() {
+    runOnMainThread(() -> downloadManager.resumeDownloads());
+  }
+
+  private void postSetStopReason(String id, int reason) {
+    runOnMainThread(() -> downloadManager.setStopReason(id, reason));
+  }
+
   private void postDownloadRequest(String id, StreamKey... keys) {
     runOnMainThread(() -> downloadManager.addDownload(createDownloadRequest(id, keys)));
   }