Implement getSentBytesCount() in Cronet UrlRequest metrics

components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.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.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 94 matching lines @@
         assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         // Check old (deprecated) timing metrics
         assertTrue(metrics.getTotalTimeMs() > 0);
         assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
         // Check new timing metrics
         MetricsTestUtil.checkTimingMetrics(metrics, startTime, endTime);
         MetricsTestUtil.checkHasConnectTiming(metrics, startTime, endTime, false);
         assertNull(metrics.getPushStart());
         assertNull(metrics.getPushEnd());
         // Check data use metrics
+        assertTrue(metrics.getSentBytesCount() > 0);
         assertTrue(metrics.getReceivedBytesCount() > 0);
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @OnlyRunNativeCronet
     @Feature({"Cronet"})
     @SuppressWarnings("deprecation")
     public void testRequestFinishedListenerDirectExecutor() throws Exception {
         mTestFramework = startCronetTestFramework();
@@ skipping 22 matching lines @@
         assertEquals(newHashSet("request annotation", this), // Use sets for unordered comparison.
                 new HashSet<Object>(requestInfo.getAnnotations()));
         assertEquals(RequestFinishedInfo.SUCCEEDED, requestInfo.getFinishedReason());
         assertNull(requestInfo.getException());
         RequestFinishedInfo.Metrics metrics = requestInfo.getMetrics();
         assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         assertTrue(metrics.getTotalTimeMs() > 0);
         assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
         MetricsTestUtil.checkTimingMetrics(metrics, startTime, endTime);
         MetricsTestUtil.checkHasConnectTiming(metrics, startTime, endTime, false);
+        assertTrue(metrics.getSentBytesCount() > 0);
         assertTrue(metrics.getReceivedBytesCount() > 0);
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @OnlyRunNativeCronet
     @Feature({"Cronet"})
     @SuppressWarnings("deprecation")
     public void testRequestFinishedListenerDifferentThreads() throws Exception {
         mTestFramework = startCronetTestFramework();
@@ skipping 29 matching lines @@
         assertEquals(RequestFinishedInfo.SUCCEEDED, firstRequestInfo.getFinishedReason());
         assertEquals(RequestFinishedInfo.SUCCEEDED, secondRequestInfo.getFinishedReason());
         assertNull(firstRequestInfo.getException());
         assertNull(secondRequestInfo.getException());
         RequestFinishedInfo.Metrics firstMetrics = firstRequestInfo.getMetrics();
         assertNotNull("RequestFinishedInfo.getMetrics() must not be null", firstMetrics);
         assertTrue(firstMetrics.getTotalTimeMs() > 0);
         assertTrue(firstMetrics.getTotalTimeMs() >= firstMetrics.getTtfbMs());
         MetricsTestUtil.checkTimingMetrics(firstMetrics, startTime, endTime);
         MetricsTestUtil.checkHasConnectTiming(firstMetrics, startTime, endTime, false);
+        assertTrue(firstMetrics.getSentBytesCount() > 0);
         assertTrue(firstMetrics.getReceivedBytesCount() > 0);
         RequestFinishedInfo.Metrics secondMetrics = secondRequestInfo.getMetrics();
         assertNotNull("RequestFinishedInfo.getMetrics() must not be null", secondMetrics);
         assertTrue(secondMetrics.getTotalTimeMs() > 0);
         assertTrue(secondMetrics.getTotalTimeMs() >= secondMetrics.getTtfbMs());
         MetricsTestUtil.checkTimingMetrics(secondMetrics, startTime, endTime);
         MetricsTestUtil.checkHasConnectTiming(secondMetrics, startTime, endTime, false);
+        assertTrue(secondMetrics.getSentBytesCount() > 0);
         assertTrue(secondMetrics.getReceivedBytesCount() > 0);
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @OnlyRunNativeCronet
     @Feature({"Cronet"})
     @SuppressWarnings("deprecation")
     public void testRequestFinishedListenerFailedRequest() throws Exception {
         String connectionRefusedUrl = "http://127.0.0.1:3";
@@ skipping 30 matching lines @@
                 || metrics.getRequestStart().equals(startTime));
         MetricsTestUtil.checkNoConnectTiming(metrics);
         assertNull(metrics.getSendingStart());
         assertNull(metrics.getSendingEnd());
         assertNull(metrics.getResponseStart());
         assertNotNull(metrics.getResponseEnd());
         assertTrue(metrics.getResponseEnd().before(endTime)
                 || metrics.getResponseEnd().equals(endTime));
         // Entire request should take more than 0 ms
         assertTrue(metrics.getResponseEnd().getTime() - metrics.getRequestStart().getTime() > 0);
-
-        assertTrue(metrics.getReceivedBytesCount() == null || metrics.getReceivedBytesCount() == 0);
+        assertTrue(metrics.getSentBytesCount() == 0);
+        assertTrue(metrics.getReceivedBytesCount() == 0);
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @OnlyRunNativeCronet
     @Feature({"Cronet"})
     @SuppressWarnings("deprecation")
     public void testRequestFinishedListenerRemoved() throws Exception {
         mTestFramework = startCronetTestFramework();
         TestExecutor testExecutor = new TestExecutor();
@@ skipping 49 matching lines @@
         assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         // Check old (deprecated) timing metrics
         assertTrue(metrics.getTotalTimeMs() > 0);
         assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
         // Check new timing metrics
         MetricsTestUtil.checkTimingMetrics(metrics, startTime, endTime);
         MetricsTestUtil.checkHasConnectTiming(metrics, startTime, endTime, false);
         assertNull(metrics.getPushStart());
         assertNull(metrics.getPushEnd());
         // Check data use metrics
+        assertTrue(metrics.getSentBytesCount() > 0);
         assertTrue(metrics.getReceivedBytesCount() > 0);
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testMetricsGetters() throws Exception {
         long requestStart = 1;
         long dnsStart = 2;
         long dnsEnd = -1;
@@ skipping 25 matching lines @@
         assertEquals(new Date(sslEnd), metrics.getSslEnd());
         assertEquals(new Date(pushStart), metrics.getPushStart());
         assertEquals(new Date(pushEnd), metrics.getPushEnd());
         assertEquals(new Date(responseStart), metrics.getResponseStart());
         assertEquals(new Date(responseEnd), metrics.getResponseEnd());
         assertEquals(socketReused, metrics.getSocketReused());
         assertEquals(sentBytesCount, (long) metrics.getSentBytesCount());
         assertEquals(receivedBytesCount, (long) metrics.getReceivedBytesCount());
     }
 }