Rename CronetUploadDataStreamAdapter to CronetUploadDataStream.

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

 // Copyright 2015 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 android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
@@ skipping 14 matching lines @@
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         launchCronetTestApp();
         ExecutorService executor = Executors.newSingleThreadExecutor();
         List<byte[]> reads = Arrays.asList("hello".getBytes());
         mDataProvider = new TestDrivenDataProvider(executor, reads);
         mUploadDataStream = new CronetUploadDataStream(mDataProvider, executor);
         mHandler = new TestUploadDataStreamHandler(
-            mUploadDataStream.createAdapterForTesting());
+                mUploadDataStream.createUploadDataStreamForTesting());
     }
 
     @Override
     protected void tearDown() throws Exception {
         // Destroy handler's native objects.
         mHandler.destroyNativeObjects();
         super.tearDown();
     }
 
     /**
      * Tests that after some data is read, init triggers a rewind, and that
      * before the rewind completes, init blocks.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })

[xunjieli, 2015/05/08 20:11:28]

Strange that this formatting got changed somehow. Maybe revert this and below.

[mmenke, 2015/05/08 20:24:19]

Done.  No idea how that happened.

     public void testInitTriggersRewindAndInitBeforeRewindCompletes()
             throws Exception {
         // Init completes synchronously and read succeeds.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mDataProvider.onReadSucceeded(mUploadDataStream);
         mHandler.waitForReadComplete();
         mDataProvider.assertReadNotPending();
@@ skipping 28 matching lines @@
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(2, mDataProvider.getNumReadCalls());
         assertEquals("hello", mHandler.getData());
     }
 
     /**
      * Tests that after some data is read, init triggers a rewind, and that
      * after the rewind completes, init does not block.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testInitTriggersRewindAndInitAfterRewindCompletes()
             throws Exception {
         // Init completes synchronously and read succeeds.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mDataProvider.onReadSucceeded(mUploadDataStream);
         mHandler.waitForReadComplete();
         mDataProvider.assertReadNotPending();
@@ skipping 27 matching lines @@
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(2, mDataProvider.getNumReadCalls());
         assertEquals("hello", mHandler.getData());
     }
 
     /**
      * Tests that if init before read completes, a rewind is triggered when
      * read completes.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testReadCompleteTriggerRewind() throws Exception {
         // Reset and init before read completes.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mHandler.reset();
         // Init should return asynchronously, since there is a pending read.
         assertFalse(mHandler.init());
         mDataProvider.assertRewindNotPending();
@@ skipping 13 matching lines @@
         assertEquals(1, mDataProvider.getNumReadCalls());
         assertEquals("", mHandler.getData());
     }
 
     /**
      * Tests that when init again after rewind completes, no additional rewind
      * is triggered. This test is the same as testReadCompleteTriggerRewind
      * except that this test invokes reset and init again in the end.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testReadCompleteTriggerRewindOnlyOneRewind() throws Exception {
         testReadCompleteTriggerRewind();
         // Reset and Init again, no rewind should happen.
         mHandler.reset();
         assertTrue(mHandler.init());
         mDataProvider.assertRewindNotPending();
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
         assertEquals("", mHandler.getData());
     }
 
     /**
      * Tests that if reset before read completes, no rewind is triggered, and
      * that a following init triggers rewind.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testResetBeforeReadCompleteAndInitTriggerRewind()
             throws Exception {
         // Reset before read completes. Rewind is not triggered.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mHandler.reset();
         mDataProvider.onReadSucceeded(mUploadDataStream);
         mDataProvider.assertRewindNotPending();
@@ skipping 14 matching lines @@
     }
 
     /**
      * Tests that there is no crash when native CronetUploadDataStreamAdapter is
      * destroyed while read is pending. The test is racy since read could
      * complete either before or after onDestroyAdapter() is called in
      * CronetUploadDataStream. However, the test should pass either way, though
      * we are interested in the latter case.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testDestroyAdapterBeforeReadComplete()
             throws Exception {
         // Start a read and wait for it to be pending.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
 
-        // Destroy the C++ TestUploadDataStreamHandler.  The handler owns the
-        // CronetUploadDataStreamAdapter, which this will cause it to destroy on
-        // the network thread.  Destroying the adapter will result in calling
-        // the CronetUploadDataSteam's onAdapterDestroyed() method on its
-        // executor thread, which will then destroy the
-        // CronetUploadDataStreamDelegate.
+        // Destroy the C++ TestUploadDataStreamHandler.  The handler will then

[xunjieli, 2015/05/08 20:11:27]

nit: there are two spaces after the dot.

[mmenke, 2015/05/08 20:24:19]

Done.

+        // destroy the C++ CronetUploadDataStream it owns on the network thread.
+        // That will result in calling the Java CronetUploadDataSteam's
+        // onCanceled() method on its executor thread, which will then destroy
+        // the CronetUploadDataStreamAdapter.
         mHandler.destroyNativeObjects();
 
         // Make the read complete should not encounter a crash.
         mDataProvider.onReadSucceeded(mUploadDataStream);
 
         assertEquals(0, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 
     /**
      * Tests that there is no crash when native CronetUploadDataStreamAdapter is
      * destroyed while rewind is pending. The test is racy since rewind could
      * complete either before or after onDestroyAdapter() is called in
      * CronetUploadDataStream. However, the test should pass either way, though
      * we are interested in the latter case.
      */
     @SmallTest
-    @Feature({"Cronet"})
+    @Feature({
+            "Cronet" })
     public void testDestroyAdapterBeforeRewindComplete()
             throws Exception {
         // Start a read and wait for it to complete.
         assertTrue(mHandler.init());
         mHandler.read();
         mDataProvider.waitForReadRequest();
         mHandler.checkReadCallbackNotInvoked();
         mDataProvider.onReadSucceeded(mUploadDataStream);
         mHandler.waitForReadComplete();
         mDataProvider.assertReadNotPending();
         assertEquals(0, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
         assertEquals("hello", mHandler.getData());
 
         // Reset and then init, which should trigger a rewind.
         mHandler.reset();
         assertEquals("", mHandler.getData());
         assertFalse(mHandler.init());
         mDataProvider.waitForRewindRequest();
         mHandler.checkInitCallbackNotInvoked();
 
-        // Destroy the C++ TestUploadDataStreamHandler.  The handler owns the
-        // CronetUploadDataStreamAdapter, which this will cause it to destroy on
-        // the network thread.  Destroying the adapter will result in calling
-        // the CronetUploadDataSteam's onAdapterDestroyed() method on its
-        // executor thread, which will then destroy the
-        // CronetUploadDataStreamDelegate.
+        // Destroy the C++ TestUploadDataStreamHandler.  The handler will then

[xunjieli, 2015/05/08 20:11:28]

nit: there are two spaces after the dot.

[mmenke, 2015/05/08 20:24:19]

Done.

+        // destroy the C++ CronetUploadDataStream it owns on the network thread.
+        // That will result in calling the Java CronetUploadDataSteam's
+        // onCanceled() method on its executor thread, which will then destroy
+        // the CronetUploadDataStreamAdapter.
         mHandler.destroyNativeObjects();
 
         // Signal rewind completes, and wait for init to complete.
         mDataProvider.onRewindSucceeded(mUploadDataStream);
 
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 }