Change RequestFinishedListener to provide executor

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
-import static org.chromium.base.CollectionUtil.newHashSet;
-
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.StrictMode;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.FlakyTest;
-import org.chromium.net.CronetEngine.UrlRequestInfo;
 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
 import org.chromium.net.impl.CronetLibraryLoader;
 import org.chromium.net.impl.CronetUrlRequestContext;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
 /**
  * Test CronetEngine.
  */
 @JNINamespace("cronet")
@@ skipping 236 matching lines @@
         callback.blockForDone();
         networkQualityExecutor.runAllTasks();
         assertEquals(0, rttListener.rttObservationCount());
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testRealTimeNetworkQualityObservationsQuicDisabled() throws Exception {
         CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext());
-        Executor requestFinishedListenerExecutor =
-                Executors.newSingleThreadExecutor(new ExecutorThreadFactory());
         Executor listenersExecutor = Executors.newSingleThreadExecutor(new ExecutorThreadFactory());
         ConditionVariable waitForThroughput = new ConditionVariable();
         TestNetworkQualityRttListener rttListener =
                 new TestNetworkQualityRttListener(listenersExecutor);
         TestNetworkQualityThroughputListener throughputListener =
                 new TestNetworkQualityThroughputListener(listenersExecutor, waitForThroughput);
         mCronetEngineBuilder.enableHTTP2(true).enableQUIC(false).enableNetworkQualityEstimator(
                 true);
         mTestFramework =
                 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
         mTestFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true);
-        // requestFinishedListenerExecutor should not be used for notifying the RTT and
-        // throughput listeners.
-        mTestFramework.mCronetEngine.setRequestFinishedListenerExecutor(
-                requestFinishedListenerExecutor);
 
         mTestFramework.mCronetEngine.addRttListener(rttListener);
         mTestFramework.mCronetEngine.addThroughputListener(throughputListener);
 
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder builder = new UrlRequest.Builder(
                 mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
         UrlRequest urlRequest = builder.build();
         urlRequest.start();
         callback.blockForDone();
@@ skipping 17 matching lines @@
         // NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC
         assertEquals(0, rttListener.rttObservationCount(2));
 
         // Verify that the listeners were notified on the expected thread.
         assertEquals(mNetworkQualityThread, rttListener.getThread());
         assertEquals(mNetworkQualityThread, throughputListener.getThread());
 
         mTestFramework.mCronetEngine.shutdown();
     }
 
-    // TODO(tbansal):  http://crbug.com/618034 Remove this.
-    private static class TestRequestFinishedListener
-            implements CronetEngine.RequestFinishedListener {
-        private UrlRequestInfo mRequestInfo = null;
 
-        @Override
-        public void onRequestFinished(UrlRequestInfo requestInfo) {
-            assertNull("onRequestFinished called repeatedly", mRequestInfo);
-            assertNotNull(requestInfo);
-            mRequestInfo = requestInfo;
-        }
-    }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    @SuppressWarnings("deprecation")
-    public void testRequestFinishedListener_LegacyAPI() throws Exception {
-        mTestFramework = startCronetTestFramework();
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        mTestFramework.mCronetEngine.enableNetworkQualityEstimator(testExecutor);
-        mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
-                mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
-        urlRequestBuilder.addRequestAnnotation("request annotation")
-                .addRequestAnnotation(this)
-                .build()
-                .start();
-        callback.blockForDone();
-        testExecutor.runAllTasks();
-
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
-        assertNotNull("RequestFinishedListener must be called", requestInfo);
-        assertEquals(mUrl, requestInfo.getUrl());
-        assertNotNull(requestInfo.getResponseInfo());
-        assertEquals(newHashSet("request annotation", this), // Use sets for unordered comparison.
-                new HashSet<Object>(requestInfo.getAnnotations()));
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
-        assertTrue(metrics.getTotalTimeMs() > 0);
-        assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
-        assertTrue(metrics.getReceivedBytesCount() > 0);
-        mTestFramework.mCronetEngine.shutdown();
-    }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    @SuppressWarnings("deprecation")
-    public void testRequestFinishedListenerWithExecutorSetLater_LegacyAPI() throws Exception {
-        CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext());
-        TestExecutor testExecutor = new TestExecutor();
-        mCronetEngineBuilder.enableHTTP2(true).enableQUIC(false).enableNetworkQualityEstimator(
-                true);
-        mTestFramework =
-                startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
-        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        mTestFramework.mCronetEngine.setRequestFinishedListenerExecutor(testExecutor);
-        mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
-                mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
-        urlRequestBuilder.addRequestAnnotation("request annotation")
-                .addRequestAnnotation(this)
-                .build()
-                .start();
-        callback.blockForDone();
-        testExecutor.runAllTasks();
-
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
-        assertNotNull("RequestFinishedListener must be called", requestInfo);
-        assertEquals(mUrl, requestInfo.getUrl());
-        assertNotNull(requestInfo.getResponseInfo());
-        assertEquals(newHashSet("request annotation", this), // Use sets for unordered comparison.
-                new HashSet<Object>(requestInfo.getAnnotations()));
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
-        assertTrue(metrics.getTotalTimeMs() > 0);
-        assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
-        assertTrue(metrics.getReceivedBytesCount() > 0);
-        mTestFramework.mCronetEngine.shutdown();
-    }
-
-    /*
-    @SmallTest
-    @Feature({"Cronet"})
-    @SuppressWarnings("deprecation")
-    */
-    @FlakyTest(message = "https://crbug.com/592444")
-    public void testRequestFinishedListenerFailedRequest_LegacyAPI() throws Exception {
-        String connectionRefusedUrl = "http://127.0.0.1:3";
-        mTestFramework = startCronetTestFramework();
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        mTestFramework.mCronetEngine.enableNetworkQualityEstimator(testExecutor);
-        mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(connectionRefusedUrl,
-                callback, callback.getExecutor(), mTestFramework.mCronetEngine);
-        urlRequestBuilder.build().start();
-        callback.blockForDone();
-        assertTrue(callback.mOnErrorCalled);
-        testExecutor.runAllTasks();
-
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
-        assertNotNull("RequestFinishedListener must be called", requestInfo);
-        assertEquals(connectionRefusedUrl, requestInfo.getUrl());
-        assertTrue(requestInfo.getAnnotations().isEmpty());
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
-        assertTrue(metrics.getTotalTimeMs() > 0);
-        assertNull(metrics.getTtfbMs());
-        assertTrue(metrics.getReceivedBytesCount() == null || metrics.getReceivedBytesCount() == 0);
-        mTestFramework.mCronetEngine.shutdown();
-    }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    @SuppressWarnings("deprecation")
-    public void testRequestFinishedListenerRemoved_LegacyAPI() throws Exception {
-        mTestFramework = startCronetTestFramework();
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        mTestFramework.mCronetEngine.enableNetworkQualityEstimator(testExecutor);
-        mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
-        mTestFramework.mCronetEngine.removeRequestFinishedListener(requestFinishedListener);
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
-                mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
-        urlRequestBuilder.build().start();
-        callback.blockForDone();
-        testExecutor.runAllTasks();
-
-        assertNull(
-                "RequestFinishedListener must not be called", requestFinishedListener.mRequestInfo);
-        mTestFramework.mCronetEngine.shutdown();
-    }
-
-    @SmallTest
-    @Feature({"Cronet"})
-    @SuppressWarnings("deprecation")
-    public void testRequestFinishedListenerDisabled_LegacyAPI() throws Exception {
-        mTestFramework = startCronetTestFramework();
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        try {
-            mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
-            fail("addRequestFinishedListener unexpectedly succeeded "
-                    + "without a call to enableNetworkQualityEstimator()");
-        } catch (RuntimeException e) {
-            // Expected.
-        }
-        TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
-                mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
-        urlRequestBuilder.build().start();
-        callback.blockForDone();
-        testExecutor.runAllTasks();
-
-        assertNull(
-                "RequestFinishedListener must not be called", requestFinishedListener.mRequestInfo);
-        mTestFramework.mCronetEngine.shutdown();
-    }
 
     /**
     @SmallTest
     @Feature({"Cronet"})
     https://crbug.com/596929
     */
     @FlakyTest
     public void testShutdown() throws Exception {
         mTestFramework = startCronetTestFramework();
         TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback();
@@ skipping 770 matching lines @@
                     }
                 }.start();
                 otherThreadDone.block();
                 builder.build().shutdown();
                 uiThreadDone.open();
             }
         });
         assertTrue(uiThreadDone.block(1000));
     }
 }