Commit 23d375d3 authored by Helen Li's avatar Helen Li Committed by Commit Bot

[cronet] Use JUnit4 for UploadDataProvidersTest

Use JUnit4 for UploadDataProvidersTest.

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I511a999a02a91d1f9c1f4ca076b96a4bc986d854
Reviewed-on: https://chromium-review.googlesource.com/663401
Commit-Queue: Helen Li <xunjieli@chromium.org>
Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501302}
parent 656a66bb
...@@ -4,10 +4,25 @@ ...@@ -4,10 +4,25 @@
package org.chromium.net; package org.chromium.net;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.chromium.net.CronetTestRule.assertContains;
import static org.chromium.net.CronetTestRule.getContext;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.net.CronetTestRule.CronetTestFramework; import org.chromium.net.CronetTestRule.CronetTestFramework;
...@@ -17,21 +32,22 @@ import java.io.IOException; ...@@ -17,21 +32,22 @@ import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** Test the default provided implementations of {@link UploadDataProvider} */ /** Test the default provided implementations of {@link UploadDataProvider} */
public class UploadDataProvidersTest extends CronetTestBase { @RunWith(BaseJUnit4ClassRunner.class)
public class UploadDataProvidersTest {
private static final String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " private static final String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
+ "Proin elementum, libero laoreet fringilla faucibus, metus tortor vehicula ante, " + "Proin elementum, libero laoreet fringilla faucibus, metus tortor vehicula ante, "
+ "lacinia lorem eros vel sapien."; + "lacinia lorem eros vel sapien.";
@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
@Rule
public final CronetTestRule mTestRule = new CronetTestRule();
private CronetTestFramework mTestFramework; private CronetTestFramework mTestFramework;
private File mFile; private File mFile;
private MockUrlRequestJobFactory mMockUrlRequestJobFactory;
@Override @Before
protected void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); mTestFramework = mTestRule.startCronetTestFramework();
mTestFramework = startCronetTestFramework();
assertTrue(NativeTestServer.startNativeTestServer(getContext())); assertTrue(NativeTestServer.startNativeTestServer(getContext()));
// Add url interceptors after native application context is initialized. // Add url interceptors after native application context is initialized.
mMockUrlRequestJobFactory = new MockUrlRequestJobFactory(mTestFramework.mCronetEngine);
mFile = new File(getContext().getCacheDir().getPath() + "/tmpfile"); mFile = new File(getContext().getCacheDir().getPath() + "/tmpfile");
FileOutputStream fileOutputStream = new FileOutputStream(mFile); FileOutputStream fileOutputStream = new FileOutputStream(mFile);
try { try {
...@@ -41,15 +57,14 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -41,15 +57,14 @@ public class UploadDataProvidersTest extends CronetTestBase {
} }
} }
@Override @After
protected void tearDown() throws Exception { public void tearDown() throws Exception {
mMockUrlRequestJobFactory.shutdown();
NativeTestServer.shutdownNativeTestServer(); NativeTestServer.shutdownNativeTestServer();
mTestFramework.mCronetEngine.shutdown(); mTestFramework.mCronetEngine.shutdown();
assertTrue(mFile.delete()); assertTrue(mFile.delete());
super.tearDown();
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testFileProvider() throws Exception { public void testFileProvider() throws Exception {
...@@ -65,6 +80,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -65,6 +80,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
assertEquals(LOREM, callback.mResponseAsString); assertEquals(LOREM, callback.mResponseAsString);
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testFileDescriptorProvider() throws Exception { public void testFileDescriptorProvider() throws Exception {
...@@ -83,6 +99,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -83,6 +99,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
assertEquals(LOREM, callback.mResponseAsString); assertEquals(LOREM, callback.mResponseAsString);
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testBadFileDescriptorProvider() throws Exception { public void testBadFileDescriptorProvider() throws Exception {
...@@ -103,6 +120,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -103,6 +120,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
} }
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testBufferProvider() throws Exception { public void testBufferProvider() throws Exception {
...@@ -119,6 +137,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -119,6 +137,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
assertEquals(LOREM, callback.mResponseAsString); assertEquals(LOREM, callback.mResponseAsString);
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testNoErrorWhenCanceledDuringStart() throws Exception { public void testNoErrorWhenCanceledDuringStart() throws Exception {
...@@ -152,6 +171,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -152,6 +171,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
assertTrue(callback.mOnCanceledCalled); assertTrue(callback.mOnCanceledCalled);
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
public void testNoErrorWhenExceptionDuringStart() throws Exception { public void testNoErrorWhenExceptionDuringStart() throws Exception {
...@@ -185,6 +205,7 @@ public class UploadDataProvidersTest extends CronetTestBase { ...@@ -185,6 +205,7 @@ public class UploadDataProvidersTest extends CronetTestBase {
assertContains(exceptionMessage, callback.mError.getCause().getMessage()); assertContains(exceptionMessage, callback.mError.getCause().getMessage());
} }
@Test
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
// Tests that creating a ByteBufferUploadProvider using a byte array with an // Tests that creating a ByteBufferUploadProvider using a byte array with an
......
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 to comment