| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 /** | 5 /** |
| 6 * Test suite for Android's default ProxySelector implementation. The purpose of
these tests | 6 * Test suite for Android's default ProxySelector implementation. The purpose of
these tests |
| 7 * is to check that the behaviour of the ProxySelector implementation matches wh
at we have | 7 * is to check that the behaviour of the ProxySelector implementation matches wh
at we have |
| 8 * implemented in net/proxy/proxy_config_service_android.cc. | 8 * implemented in net/proxy/proxy_config_service_android.cc. |
| 9 * | 9 * |
| 10 * IMPORTANT: These test cases are generated from net/android/tools/proxy_test_c
ases.py, so if any | 10 * IMPORTANT: These test cases are generated from net/android/tools/proxy_test_c
ases.py, so if any |
| 11 * of these tests fail, please be sure to edit that file and regenerate the test
cases here and also | 11 * of these tests fail, please be sure to edit that file and regenerate the test
cases here and also |
| 12 * in net/proxy/proxy_config_service_android_unittests.cc if required. | 12 * in net/proxy/proxy_config_service_android_unittests.cc if required. |
| 13 */ | 13 */ |
| 14 | 14 |
| 15 package org.chromium.net; | 15 package org.chromium.net; |
| 16 | 16 |
| 17 import android.test.InstrumentationTestCase; | 17 import android.test.InstrumentationTestCase; |
| 18 import android.test.suitebuilder.annotation.SmallTest; | 18 import android.test.suitebuilder.annotation.SmallTest; |
| 19 | 19 |
| 20 import org.chromium.base.test.util.Feature; |
| 21 |
| 20 import java.net.Proxy; | 22 import java.net.Proxy; |
| 21 import java.net.ProxySelector; | 23 import java.net.ProxySelector; |
| 22 import java.net.URI; | 24 import java.net.URI; |
| 23 import java.net.URISyntaxException; | 25 import java.net.URISyntaxException; |
| 24 import java.util.List; | 26 import java.util.List; |
| 25 import java.util.Properties; | 27 import java.util.Properties; |
| 26 | 28 |
| 27 import org.chromium.base.test.util.Feature; | |
| 28 | |
| 29 public class AndroidProxySelectorTest extends InstrumentationTestCase { | 29 public class AndroidProxySelectorTest extends InstrumentationTestCase { |
| 30 Properties mProperties; | 30 Properties mProperties; |
| 31 | 31 |
| 32 public AndroidProxySelectorTest() { | 32 public AndroidProxySelectorTest() { |
| 33 // Start with a clean slate in case there is a system proxy configured. | 33 // Start with a clean slate in case there is a system proxy configured. |
| 34 mProperties = new Properties(); | 34 mProperties = new Properties(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 @Override | 37 @Override |
| 38 public void setUp() { | 38 public void setUp() { |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 @SmallTest | 286 @SmallTest |
| 287 @Feature({"AndroidWebView"}) | 287 @Feature({"AndroidWebView"}) |
| 288 public void testHttpProxySupercedesSocks() throws Exception { | 288 public void testHttpProxySupercedesSocks() throws Exception { |
| 289 System.setProperty("proxyHost", "defaultproxy.com"); | 289 System.setProperty("proxyHost", "defaultproxy.com"); |
| 290 System.setProperty("socksProxyHost", "socksproxy.com"); | 290 System.setProperty("socksProxyHost", "socksproxy.com"); |
| 291 System.setProperty("socksProxyPort", "9000"); | 291 System.setProperty("socksProxyPort", "9000"); |
| 292 checkMapping("http://example.com/", "PROXY defaultproxy.com:80"); | 292 checkMapping("http://example.com/", "PROXY defaultproxy.com:80"); |
| 293 } | 293 } |
| 294 } | 294 } |
| 295 | 295 |
| OLD | NEW |