Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Issue 1417973002: [Cronet] Switch from InstrumentationTest to junit (Closed)

Created:
5 years, 2 months ago by pauljensen
Modified:
5 years, 2 months ago
Reviewers:
xunjieli
CC:
chromium-reviews, cbentzel+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

[Cronet] Switch from InstrumentationTest to junit Instrumentation tests are meant for testing apps, where as junit tests are better for unit testing, which is what the cronet tests do. This change gets rid of the restriction of setting up the tests via an Intent. It removes a fair bit of code and paves the way for removing more, including JSON serializing of CronetEngine.Builder. I think this makes testing faster...because I ran into two race conditions in tests that I also fixed: 1. Starting the CronetTestFramework with a URL did not wait for the request to finish. 2. NetworkChangeNotifier initialization test did not wait for the NetworkChangeNotifier to actually initialize. For now the test continues to be launched as an instrumentation test because this ensures lighttpd is launched, which isn't the case for junit tests. All tests run and pass being launched as an instrumentation test. BUG=544976 Committed: https://crrev.com/373bed9bc93f00af4244808cff41c355de268ed7 Cr-Commit-Position: refs/heads/master@{#355770}

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : #

Total comments: 16

Patch Set 6 : address Helen's comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+405 lines, -826 lines) Patch
M components/cronet/android/test/AndroidManifest.xml View 1 1 chunk +0 lines, -10 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java View 1 2 4 chunks +9 lines, -18 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/ContextInitTest.java View 1 2 7 chunks +21 lines, -21 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java View 1 2 3 4 5 3 chunks +21 lines, -92 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java View 1 2 1 chunk +1 line, -1 line 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java View 1 2 29 chunks +110 lines, -119 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java View 1 2 41 chunks +47 lines, -47 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java View 1 2 3 4 5 5 chunks +23 lines, -28 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java View 1 2 3 chunks +5 lines, -5 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java View 1 2 1 chunk +5 lines, -5 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java View 1 2 7 chunks +11 lines, -20 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java View 1 2 1 chunk +5 lines, -2 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java View 1 2 3 4 7 chunks +15 lines, -16 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java View 1 2 15 chunks +30 lines, -29 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java View 1 2 1 chunk +5 lines, -6 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java View 1 2 2 chunks +4 lines, -5 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java View 1 2 2 chunks +4 lines, -4 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java View 1 2 2 chunks +4 lines, -5 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java View 1 2 3 chunks +6 lines, -8 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java View 1 2 6 chunks +8 lines, -9 lines 0 comments Download
M components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java View 1 2 1 chunk +1 line, -1 line 0 comments Download
M components/cronet/android/test/src/org/chromium/net/CronetTestActivity.java View 1 2 1 chunk +0 lines, -310 lines 0 comments Download
A + components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java View 1 2 3 4 5 12 chunks +42 lines, -55 lines 0 comments Download
M net/android/BUILD.gn View 1 2 3 1 chunk +1 line, -0 lines 0 comments Download
M net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java View 2 chunks +1 line, -10 lines 0 comments Download
M net/net.gyp View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
A net/test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java View 1 2 3 4 5 1 chunk +25 lines, -0 lines 0 comments Download

Messages

Total messages: 11 (4 generated)
pauljensen
Helen, PTAL.
5 years, 2 months ago (2015-10-22 00:37:03 UTC) #3
xunjieli
On 2015/10/22 00:37:03, pauljensen wrote: > Helen, PTAL. This is great! I am happy as ...
5 years, 2 months ago (2015-10-22 18:41:05 UTC) #4
xunjieli
https://codereview.chromium.org/1417973002/diff/80001/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java File components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java (right): https://codereview.chromium.org/1417973002/diff/80001/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java#newcode23 components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java:23: * Starts the CronetTest activity. nit: outdated comment containing ...
5 years, 2 months ago (2015-10-22 18:41:24 UTC) #5
pauljensen
https://codereview.chromium.org/1417973002/diff/80001/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java File components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java (right): https://codereview.chromium.org/1417973002/diff/80001/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java#newcode23 components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java:23: * Starts the CronetTest activity. On 2015/10/22 18:41:24, xunjieli ...
5 years, 2 months ago (2015-10-23 11:35:50 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1417973002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1417973002/100001
5 years, 2 months ago (2015-10-23 12:16:26 UTC) #9
commit-bot: I haz the power
Committed patchset #6 (id:100001)
5 years, 2 months ago (2015-10-23 13:18:50 UTC) #10
commit-bot: I haz the power
5 years, 2 months ago (2015-10-23 13:19:48 UTC) #11
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/373bed9bc93f00af4244808cff41c355de268ed7
Cr-Commit-Position: refs/heads/master@{#355770}

Powered by Google App Engine
This is Rietveld 408576698