diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-08-25 15:45:15 +0000 |
|---|---|---|
| committer | Mohannad Farrag <aymanm@google.com> | 2023-08-25 16:40:50 +0000 |
| commit | 5801781e78741390b0321f8931c2a212e074c0e3 (patch) | |
| tree | 65c3b906afed4e763035cdb7089f53f781044f7b /components/cronet/android/test | |
| parent | 8934594da80cd6696f0d57aefadbb8cf721f493b (diff) | |
| download | cronet-5801781e78741390b0321f8931c2a212e074c0e3.tar.gz | |
Cronet Import: Fix incorrectly resolved merge conflicts
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
Change-Id: Ib9b59f179eb39fdb5f33ea641eb47aeaedaf6221
Diffstat (limited to 'components/cronet/android/test')
| -rw-r--r-- | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java index 6f03651cf..c6c12805e 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java @@ -42,6 +42,7 @@ import org.chromium.net.NetworkChangeNotifierAutoDetect.ConnectivityManagerDeleg import org.chromium.net.TestUrlRequestCallback.ResponseStep; import org.chromium.net.impl.CronetLibraryLoader; import org.chromium.net.impl.CronetUrlRequestContext; +import org.chromium.net.impl.NativeCronetEngineBuilderImpl; import org.json.JSONObject; import org.junit.After; import org.junit.Before; @@ -65,14 +66,13 @@ public class CronetUrlRequestContextTest { "http://mock.http/success.txt"; private static final int MAX_FILE_SIZE = 1000000000; - private EmbeddedTestServer mTestServer; private String mUrl; private String mUrl404; private String mUrl500; @Before public void setUp() throws Exception { - assertTrue(NativeTestServer.startNativeTestServer(getContext())); + assertThat(NativeTestServer.startNativeTestServer(mTestRule.getTestFramework().getContext())).isTrue(); mUrl = NativeTestServer.getSuccessURL(); mUrl404 = NativeTestServer.getNotFoundURL(); mUrl500 = NativeTestServer.getServerErrorURL(); @@ -506,11 +506,11 @@ public class CronetUrlRequestContextTest { urlRequestBuilder.build().start(); callback.blockForDone(); cronetEngine.stopNetLog(); - assertTrue(logFile.exists()); - assertTrue(logFile.length() != 0); - assertFalse(hasBytesInNetLog(logFile)); + assertThat(logFile.exists()).isTrue(); + assertThat(logFile.length()).isNotEqualTo(0); + assertThat(hasBytesInNetLog(logFile)).isFalse(); FileUtils.recursivelyDeleteFile(netLogDir, FileUtils.DELETE_ALL); - assertFalse(netLogDir.exists()); + assertThat(netLogDir.exists()).isFalse(); } @Test @@ -1407,7 +1407,6 @@ public class CronetUrlRequestContextTest { @Test @SmallTest - @OnlyRunNativeCronet @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky") @OnlyRunNativeCronet // Not supported by Java implementation public void testEnableHttpCacheDiskNoHttp() throws Exception { |