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

Side by Side Diff: components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java

Issue 2738813004: [Cronet] Write effective experimental options to NetLog (Closed)
Patch Set: Fix use-after-free bug Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.support.test.filters.SmallTest; 7 import android.support.test.filters.SmallTest;
8 8
9 import org.json.JSONObject; 9 import org.json.JSONObject;
10 10
(...skipping 28 matching lines...) Expand all
39 assertTrue(Http2TestServer.shutdownHttp2TestServer()); 39 assertTrue(Http2TestServer.shutdownHttp2TestServer());
40 if (mTestFramework.mCronetEngine != null) { 40 if (mTestFramework.mCronetEngine != null) {
41 mTestFramework.mCronetEngine.shutdown(); 41 mTestFramework.mCronetEngine.shutdown();
42 } 42 }
43 super.tearDown(); 43 super.tearDown();
44 } 44 }
45 45
46 @SmallTest 46 @SmallTest
47 @Feature({"Cronet"}) 47 @Feature({"Cronet"})
48 @OnlyRunNativeCronet 48 @OnlyRunNativeCronet
49 // Tests that NetLog writes effective experimental options to NetLog.
50 public void testNetLog() throws Exception {
51 File directory = new File(PathUtils.getDataDirectory());
52 File logfile = File.createTempFile("cronet", "json", directory);
53 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules ();
54 JSONObject experimentalOptions =
55 new JSONObject().put("HostResolverRules", hostResolverParams);
56 mBuilder.setExperimentalOptions(experimentalOptions.toString());
57
58 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der);
59 mTestFramework.mCronetEngine.startNetLogToFile(logfile.getPath(), false) ;
60 String url = Http2TestServer.getEchoMethodUrl();
61 TestUrlRequestCallback callback = new TestUrlRequestCallback();
62 UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestB uilder(
63 url, callback, callback.getExecutor());
64 UrlRequest urlRequest = builder.build();
65 urlRequest.start();
66 callback.blockForDone();
67 assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
68 assertEquals("GET", callback.mResponseAsString);
69 mTestFramework.mCronetEngine.stopNetLog();
70 assertTrue(logfile.exists());
71 assertTrue(logfile.length() != 0);
72 BufferedReader logReader = new BufferedReader(new FileReader(logfile));
73 boolean validFile = false;
74 try {
75 String logLine;
76 while ((logLine = logReader.readLine()) != null) {
77 if (logLine.contains("HostResolverRules")) {
78 validFile = true;
79 break;
80 }
81 }
82 } finally {
83 logReader.close();
84 }
85 assertTrue(validFile);
86 assertTrue(logfile.delete());
87 assertTrue(!logfile.exists());
88 }
89
90 @SmallTest
91 @Feature({"Cronet"})
92 @OnlyRunNativeCronet
49 public void testSetSSLKeyLogFile() throws Exception { 93 public void testSetSSLKeyLogFile() throws Exception {
50 String url = Http2TestServer.getEchoMethodUrl(); 94 String url = Http2TestServer.getEchoMethodUrl();
51 File dir = new File(PathUtils.getDataDirectory()); 95 File dir = new File(PathUtils.getDataDirectory());
52 File file = File.createTempFile("ssl_key_log_file", "", dir); 96 File file = File.createTempFile("ssl_key_log_file", "", dir);
53 97
54 JSONObject experimentalOptions = new JSONObject().put("ssl_key_log_file" , file.getPath()); 98 JSONObject experimentalOptions = new JSONObject().put("ssl_key_log_file" , file.getPath());
55 mBuilder.setExperimentalOptions(experimentalOptions.toString()); 99 mBuilder.setExperimentalOptions(experimentalOptions.toString());
56 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der); 100 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der);
57 101
58 TestUrlRequestCallback callback = new TestUrlRequestCallback(); 102 TestUrlRequestCallback callback = new TestUrlRequestCallback();
(...skipping 18 matching lines...) Expand all
77 } 121 }
78 } 122 }
79 } finally { 123 } finally {
80 logReader.close(); 124 logReader.close();
81 } 125 }
82 assertTrue(validFile); 126 assertTrue(validFile);
83 assertTrue(file.delete()); 127 assertTrue(file.delete());
84 assertTrue(!file.exists()); 128 assertTrue(!file.exists());
85 } 129 }
86 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698