[Cronet] Pass metrics information from C++ BidirectionalStream to Java

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

 // Copyright 2016 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.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
-import org.chromium.net.MetricsTestUtil.TestExecutor;
 import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener;

[xunjieli, 2016/10/05 19:00:28]

Any idea on why presubmit script gives the following warning?

" 
components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java:14:
Wrong order for org.json.JSONObject import. Use :JavaImportOrganize (ECLIM) or
Ctrl+Shift+O (Eclipse) to sort imports. An importorder file for configuring
Eclipse can be found at //tools/android/eclipse/android.importorder."

I thought the order is correct...

[mgersh, 2016/10/05 19:36:47]

I think this must have been a recent change to the presubmit, because I ran into
the same thing. I tried a bunch of places and the one that eventually made the
warning go away was putting it after android imports but before org.chromium
imports.

[xunjieli, 2016/10/06 03:51:47]

Done. That's good to know. Thanks!

 import org.json.JSONObject;
 
 import java.nio.ByteBuffer;
 import java.util.HashSet;
 
 /**
  * Tests functionality of BidirectionalStream's QUIC implementation.
  */
 public class BidirectionalStreamQuicTest extends CronetTestBase {
     private CronetTestFramework mTestFramework;
@@ skipping 62 matching lines @@
     public void testSimplePost() throws Exception {
         setUp(QuicBidirectionalStreams.ENABLED);
         String path = "/simple.txt";
         String quicURL = QuicTestServer.getServerURL() + path;
         TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
         // Although we have no way to verify data sent at this point, this test
         // can make sure that onWriteCompleted is invoked appropriately.
         callback.addWriteData("Test String".getBytes());
         callback.addWriteData("1234567890".getBytes());
         callback.addWriteData("woot!".getBytes());
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener =
-                new TestRequestFinishedListener(testExecutor);
+        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
         mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
         BidirectionalStream stream = new BidirectionalStream
                                              .Builder(quicURL, callback, callback.getExecutor(),
                                                      mTestFramework.mCronetEngine)
                                              .addHeader("foo", "bar")
                                              .addHeader("empty", "")
                                              .addHeader("Content-Type", "zebra")
                                              .addRequestAnnotation("request annotation")
                                              .addRequestAnnotation(this)
                                              .build();
         stream.start();
         callback.blockForDone();
-        testExecutor.runAllTasks();
         assertTrue(stream.isDone());
+        requestFinishedListener.blockUntilDone();

[mgersh, 2016/10/05 19:36:47]

Can we also do some checks on the timing metrics here?

[xunjieli, 2016/10/06 03:51:47]

Done.

         RequestFinishedInfo finishedInfo = requestFinishedListener.getRequestInfo();
         assertNotNull("RequestFinishedInfo.Listener must be called", finishedInfo);
         assertEquals(quicURL, finishedInfo.getUrl());
         assertEquals(newHashSet("request annotation", this),
                 new HashSet<Object>(finishedInfo.getAnnotations()));
         assertNotNull(finishedInfo.getResponseInfo());
         // TODO(xunjieli): Check other fields once metrics support is in crbug.com/648346.
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
         assertEquals("This is a simple text file served by QUIC.\n", callback.mResponseAsString);
         assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
@@ skipping 238 matching lines @@
         builder.enableQuic(true);
         builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
         builder.setCertVerifierData(serialized_data);
 
         CronetTestFramework testFramework =
                 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
         String deserialized_data = testFramework.mCronetEngine.getCertVerifierData(100);
         assertEquals(deserialized_data, serialized_data);
     }
 }