Skip to content

SDK / exoplayer

Go to a project
Commit a6e9a9c6 by andrewlewis Committed by Oliver Woodman
Options

Remove mocking executor in `CronetDataSourceTest` 

Other tests in this file already use `Executors.newSingleThreadExecutor` so do the same for the ones that currently use `mockExecutor`.

PiperOrigin-RevId: 368859470
parent 62eb5453
Inline Side-by-side
Showing with 17 additions and 9 deletions
extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
...@@ -56,6 +56,7 @@ import java.util.List; ...@@ -56,6 +56,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
...@@ -66,6 +67,7 @@ import org.chromium.net.CronetEngine; ...@@ -66,6 +67,7 @@ import org.chromium.net.CronetEngine;
import org.chromium.net.NetworkException; import org.chromium.net.NetworkException;
import org.chromium.net.UrlRequest; import org.chromium.net.UrlRequest;
import org.chromium.net.UrlResponseInfo; import org.chromium.net.UrlResponseInfo;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -96,10 +98,10 @@ public final class CronetDataSourceTest { ...@@ -96,10 +98,10 @@ public final class CronetDataSourceTest {
@Mock private UrlRequest.Builder mockUrlRequestBuilder; @Mock private UrlRequest.Builder mockUrlRequestBuilder;
@Mock private UrlRequest mockUrlRequest; @Mock private UrlRequest mockUrlRequest;
@Mock private TransferListener mockTransferListener; @Mock private TransferListener mockTransferListener;
@Mock private Executor mockExecutor;
@Mock private NetworkException mockNetworkException; @Mock private NetworkException mockNetworkException;
@Mock private CronetEngine mockCronetEngine; @Mock private CronetEngine mockCronetEngine;
private ExecutorService executorService;
private CronetDataSource dataSourceUnderTest; private CronetDataSource dataSourceUnderTest;
private boolean redirectCalled; private boolean redirectCalled;
...@@ -111,9 +113,10 @@ public final class CronetDataSourceTest { ...@@ -111,9 +113,10 @@ public final class CronetDataSourceTest {
defaultRequestProperties.put("defaultHeader1", "defaultValue1"); defaultRequestProperties.put("defaultHeader1", "defaultValue1");
defaultRequestProperties.put("defaultHeader2", "defaultValue2"); defaultRequestProperties.put("defaultHeader2", "defaultValue2");
executorService = Executors.newSingleThreadExecutor();
dataSourceUnderTest = dataSourceUnderTest =
(CronetDataSource) (CronetDataSource)
new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), mockExecutor) new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), executorService)
.setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS) .setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS)
.setReadTimeoutMs(TEST_READ_TIMEOUT_MS) .setReadTimeoutMs(TEST_READ_TIMEOUT_MS)
.setResetTimeoutOnRedirects(true) .setResetTimeoutOnRedirects(true)
...@@ -143,6 +146,11 @@ public final class CronetDataSourceTest { ...@@ -143,6 +146,11 @@ public final class CronetDataSourceTest {
testUrlResponseInfo = createUrlResponseInfo(200); // statusCode testUrlResponseInfo = createUrlResponseInfo(200); // statusCode
} }
@After
public void tearDown() {
executorService.shutdown();
}
private UrlResponseInfo createUrlResponseInfo(int statusCode) { private UrlResponseInfo createUrlResponseInfo(int statusCode) {
return createUrlResponseInfoWithUrl(TEST_URL, statusCode); return createUrlResponseInfoWithUrl(TEST_URL, statusCode);
} }
...@@ -1159,7 +1167,7 @@ public final class CronetDataSourceTest { ...@@ -1159,7 +1167,7 @@ public final class CronetDataSourceTest {
throws HttpDataSourceException { throws HttpDataSourceException {
dataSourceUnderTest = dataSourceUnderTest =
(CronetDataSource) (CronetDataSource)
new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), mockExecutor) new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), executorService)
.setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS) .setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS)
.setReadTimeoutMs(TEST_READ_TIMEOUT_MS) .setReadTimeoutMs(TEST_READ_TIMEOUT_MS)
.setResetTimeoutOnRedirects(true) .setResetTimeoutOnRedirects(true)
...@@ -1187,7 +1195,7 @@ public final class CronetDataSourceTest { ...@@ -1187,7 +1195,7 @@ public final class CronetDataSourceTest {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest = dataSourceUnderTest =
(CronetDataSource) (CronetDataSource)
new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), mockExecutor) new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), executorService)
.setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS) .setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS)
.setReadTimeoutMs(TEST_READ_TIMEOUT_MS) .setReadTimeoutMs(TEST_READ_TIMEOUT_MS)
.setResetTimeoutOnRedirects(true) .setResetTimeoutOnRedirects(true)
...@@ -1224,7 +1232,7 @@ public final class CronetDataSourceTest { ...@@ -1224,7 +1232,7 @@ public final class CronetDataSourceTest {
throws HttpDataSourceException { throws HttpDataSourceException {
dataSourceUnderTest = dataSourceUnderTest =
(CronetDataSource) (CronetDataSource)
new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), mockExecutor) new CronetDataSource.Factory(new CronetEngineWrapper(mockCronetEngine), executorService)
.setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS) .setConnectionTimeoutMs(TEST_CONNECT_TIMEOUT_MS)
.setReadTimeoutMs(TEST_READ_TIMEOUT_MS) .setReadTimeoutMs(TEST_READ_TIMEOUT_MS)
.setResetTimeoutOnRedirects(true) .setResetTimeoutOnRedirects(true)
...@@ -1384,7 +1392,7 @@ public final class CronetDataSourceTest { ...@@ -1384,7 +1392,7 @@ public final class CronetDataSourceTest {
DefaultHttpDataSource.Factory fallbackFactory = DefaultHttpDataSource.Factory fallbackFactory =
new DefaultHttpDataSource.Factory().setUserAgent("customFallbackFactoryUserAgent"); new DefaultHttpDataSource.Factory().setUserAgent("customFallbackFactoryUserAgent");
HttpDataSource dataSourceUnderTest = HttpDataSource dataSourceUnderTest =
new CronetDataSource.Factory(cronetEngineWrapper, Executors.newSingleThreadExecutor()) new CronetDataSource.Factory(cronetEngineWrapper, executorService)
.setFallbackFactory(fallbackFactory) .setFallbackFactory(fallbackFactory)
.createDataSource(); .createDataSource();
...@@ -1403,7 +1411,7 @@ public final class CronetDataSourceTest { ...@@ -1403,7 +1411,7 @@ public final class CronetDataSourceTest {
mockWebServer.enqueue(new MockResponse()); mockWebServer.enqueue(new MockResponse());
CronetEngineWrapper cronetEngineWrapper = new CronetEngineWrapper((CronetEngine) null); CronetEngineWrapper cronetEngineWrapper = new CronetEngineWrapper((CronetEngine) null);
HttpDataSource dataSourceUnderTest = HttpDataSource dataSourceUnderTest =
new CronetDataSource.Factory(cronetEngineWrapper, Executors.newSingleThreadExecutor()) new CronetDataSource.Factory(cronetEngineWrapper, executorService)
.setTransferListener(mockTransferListener) .setTransferListener(mockTransferListener)
.createDataSource(); .createDataSource();
DataSpec dataSpec = DataSpec dataSpec =
...@@ -1428,7 +1436,7 @@ public final class CronetDataSourceTest { ...@@ -1428,7 +1436,7 @@ public final class CronetDataSourceTest {
Map<String, String> defaultRequestProperties = new HashMap<>(); Map<String, String> defaultRequestProperties = new HashMap<>();
defaultRequestProperties.put("0", "defaultRequestProperty0"); defaultRequestProperties.put("0", "defaultRequestProperty0");
HttpDataSource dataSourceUnderTest = HttpDataSource dataSourceUnderTest =
new CronetDataSource.Factory(cronetEngineWrapper, Executors.newSingleThreadExecutor()) new CronetDataSource.Factory(cronetEngineWrapper, executorService)
.setDefaultRequestProperties(defaultRequestProperties) .setDefaultRequestProperties(defaultRequestProperties)
.createDataSource(); .createDataSource();
...@@ -1450,7 +1458,7 @@ public final class CronetDataSourceTest { ...@@ -1450,7 +1458,7 @@ public final class CronetDataSourceTest {
Map<String, String> defaultRequestProperties = new HashMap<>(); Map<String, String> defaultRequestProperties = new HashMap<>();
defaultRequestProperties.put("0", "defaultRequestProperty0"); defaultRequestProperties.put("0", "defaultRequestProperty0");
CronetDataSource.Factory factory = CronetDataSource.Factory factory =
new CronetDataSource.Factory(cronetEngineWrapper, Executors.newSingleThreadExecutor()); new CronetDataSource.Factory(cronetEngineWrapper, executorService);
HttpDataSource dataSourceUnderTest = HttpDataSource dataSourceUnderTest =
factory.setDefaultRequestProperties(defaultRequestProperties).createDataSource(); factory.setDefaultRequestProperties(defaultRequestProperties).createDataSource();
defaultRequestProperties.clear(); defaultRequestProperties.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment