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

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

Issue 1817553002: Add host resolver rules experimental flag for Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete registerHostResolverProc and rebase Created 4 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 static org.chromium.base.CollectionUtil.newHashSet; 7 import static org.chromium.base.CollectionUtil.newHashSet;
8 8
9 import android.content.Context; 9 import android.content.Context;
10 import android.content.ContextWrapper; 10 import android.content.ContextWrapper;
11 import android.os.ConditionVariable; 11 import android.os.ConditionVariable;
12 import android.os.Handler; 12 import android.os.Handler;
13 import android.os.Looper; 13 import android.os.Looper;
14 import android.os.StrictMode; 14 import android.os.StrictMode;
15 import android.test.suitebuilder.annotation.SmallTest; 15 import android.test.suitebuilder.annotation.SmallTest;
16 16
17 import org.chromium.base.PathUtils; 17 import org.chromium.base.PathUtils;
18 import org.chromium.base.annotations.JNINamespace; 18 import org.chromium.base.annotations.JNINamespace;
19 import org.chromium.base.test.util.Feature; 19 import org.chromium.base.test.util.Feature;
20 import org.chromium.base.test.util.FlakyTest; 20 import org.chromium.base.test.util.FlakyTest;
21 import org.chromium.net.CronetEngine.UrlRequestInfo; 21 import org.chromium.net.CronetEngine.UrlRequestInfo;
22 import org.chromium.net.TestUrlRequestCallback.ResponseStep; 22 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
23 import org.chromium.net.test.EmbeddedTestServer; 23 import org.chromium.net.test.EmbeddedTestServer;
24 import org.json.JSONObject;
24 25
25 import java.io.BufferedReader; 26 import java.io.BufferedReader;
26 import java.io.File; 27 import java.io.File;
27 import java.io.FileReader; 28 import java.io.FileReader;
29 import java.net.URL;
28 import java.util.Arrays; 30 import java.util.Arrays;
29 import java.util.HashSet; 31 import java.util.HashSet;
30 import java.util.LinkedList; 32 import java.util.LinkedList;
31 import java.util.NoSuchElementException; 33 import java.util.NoSuchElementException;
32 import java.util.concurrent.Executor; 34 import java.util.concurrent.Executor;
33 import java.util.concurrent.Executors; 35 import java.util.concurrent.Executors;
34 import java.util.concurrent.ThreadFactory; 36 import java.util.concurrent.ThreadFactory;
35 37
36 /** 38 /**
37 * Test CronetEngine. 39 * Test CronetEngine.
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 cronetEngine.shutdown(); 1352 cronetEngine.shutdown();
1351 } 1353 }
1352 }.start(); 1354 }.start();
1353 otherThreadDone.block(); 1355 otherThreadDone.block();
1354 builder.build().shutdown(); 1356 builder.build().shutdown();
1355 uiThreadDone.open(); 1357 uiThreadDone.open();
1356 } 1358 }
1357 }); 1359 });
1358 assertTrue(uiThreadDone.block(1000)); 1360 assertTrue(uiThreadDone.block(1000));
1359 } 1361 }
1362
1363 @SmallTest
1364 @Feature({"Cronet"})
1365 public void testHostResolverRules() throws Exception {
1366 String resolverTestHostname = "some-weird-hostname";
1367 URL testUrl = new URL(mUrl);
1368 CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(getC ontext());
1369 JSONObject hostResolverRules = new JSONObject().put(
1370 "host_resolver_rules", "MAP " + resolverTestHostname + " " + tes tUrl.getHost());
1371 JSONObject experimentalOptions =
1372 new JSONObject().put("HostResolverRules", hostResolverRules);
1373 cronetEngineBuilder.setExperimentalOptions(experimentalOptions.toString( ));
1374
1375 mTestFramework =
1376 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, cron etEngineBuilder);
1377 TestUrlRequestCallback callback = new TestUrlRequestCallback();
1378 URL requestUrl =
1379 new URL("http", resolverTestHostname, testUrl.getPort(), testUrl .getFile());
1380 UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(requestUrl .toString(),
1381 callback, callback.getExecutor(), mTestFramework.mCronetEngine);
1382 urlRequestBuilder.build().start();
1383 callback.blockForDone();
1384 assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
1385 }
1360 } 1386 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698