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

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

Issue 2339223002: Cronet API Refactoring (Closed)
Patch Set: Rebased onto Charles change + Paul's Comments Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.os.ConditionVariable; 7 import android.os.ConditionVariable;
8 import android.test.suitebuilder.annotation.SmallTest; 8 import android.test.suitebuilder.annotation.SmallTest;
9 9
10 import org.chromium.base.test.util.Feature; 10 import org.chromium.base.test.util.Feature;
11 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
12 import org.chromium.net.impl.CronetUrlRequestContext; 11 import org.chromium.net.impl.CronetUrlRequestContext;
13 import org.json.JSONException; 12 import org.json.JSONException;
14 import org.json.JSONObject; 13 import org.json.JSONObject;
15 14
16 import java.io.BufferedReader; 15 import java.io.BufferedReader;
17 import java.io.FileReader; 16 import java.io.FileReader;
18 import java.io.IOException; 17 import java.io.IOException;
19 import java.util.ArrayList; 18 import java.util.ArrayList;
20 import java.util.Arrays; 19 import java.util.Arrays;
21 import java.util.List; 20 import java.util.List;
(...skipping 16 matching lines...) Expand all
38 commandLineArgs.add(CronetTestFramework.CACHE_DISK); 37 commandLineArgs.add(CronetTestFramework.CACHE_DISK);
39 if (setting == Sdch.ENABLED) { 38 if (setting == Sdch.ENABLED) {
40 commandLineArgs.add(CronetTestFramework.SDCH_KEY); 39 commandLineArgs.add(CronetTestFramework.SDCH_KEY);
41 commandLineArgs.add(CronetTestFramework.SDCH_ENABLE); 40 commandLineArgs.add(CronetTestFramework.SDCH_ENABLE);
42 } 41 }
43 42
44 commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY); 43 commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);
45 commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET); 44 commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);
46 45
47 String[] args = new String[commandLineArgs.size()]; 46 String[] args = new String[commandLineArgs.size()];
48 CronetEngine.Builder builder = new CronetEngine.Builder(getContext()); 47 ExperimentalCronetEngine.Builder builder =
48 new ExperimentalCronetEngine.Builder(getContext());
49 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules (); 49 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules ();
50 JSONObject experimentalOptions = 50 JSONObject experimentalOptions =
51 new JSONObject().put("HostResolverRules", hostResolverParams); 51 new JSONObject().put("HostResolverRules", hostResolverParams);
52 builder.setExperimentalOptions(experimentalOptions.toString()); 52 builder.setExperimentalOptions(experimentalOptions.toString());
53 mTestFramework = 53 mTestFramework =
54 new CronetTestFramework(null, commandLineArgs.toArray(args), get Context(), builder); 54 new CronetTestFramework(null, commandLineArgs.toArray(args), get Context(), builder);
55 // Start NativeTestServer. 55 // Start NativeTestServer.
56 assertTrue(NativeTestServer.startNativeTestServer(getContext())); 56 assertTrue(NativeTestServer.startNativeTestServer(getContext()));
57 } 57 }
58 58
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 166 }
167 167
168 private long getContextAdapter(CronetUrlRequestContext requestContext) { 168 private long getContextAdapter(CronetUrlRequestContext requestContext) {
169 return requestContext.getUrlRequestContextAdapter(); 169 return requestContext.getUrlRequestContextAdapter();
170 } 170 }
171 171
172 private TestUrlRequestCallback startAndWaitForComplete(CronetEngine cronetEn gine, String url) 172 private TestUrlRequestCallback startAndWaitForComplete(CronetEngine cronetEn gine, String url)
173 throws Exception { 173 throws Exception {
174 TestUrlRequestCallback callback = new TestUrlRequestCallback(); 174 TestUrlRequestCallback callback = new TestUrlRequestCallback();
175 UrlRequest.Builder builder = 175 UrlRequest.Builder builder =
176 new UrlRequest.Builder(url, callback, callback.getExecutor(), cr onetEngine); 176 cronetEngine.newUrlRequestBuilder(url, callback, callback.getExe cutor());
177 builder.build().start(); 177 builder.build().start();
178 callback.blockForDone(); 178 callback.blockForDone();
179 return callback; 179 return callback;
180 } 180 }
181 181
182 // Returns whether a file contains a particular string. 182 // Returns whether a file contains a particular string.
183 private boolean fileContainsString(String filename, String content) throws I OException { 183 private boolean fileContainsString(String filename, String content) throws I OException {
184 BufferedReader reader = new BufferedReader(new FileReader( 184 BufferedReader reader = new BufferedReader(new FileReader(
185 CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + f ilename)); 185 CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + f ilename));
186 String line; 186 String line;
187 while ((line = reader.readLine()) != null) { 187 while ((line = reader.readLine()) != null) {
188 if (line.contains(content)) { 188 if (line.contains(content)) {
189 reader.close(); 189 reader.close();
190 return true; 190 return true;
191 } 191 }
192 } 192 }
193 reader.close(); 193 reader.close();
194 return false; 194 return false;
195 } 195 }
196 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698