| Index: tests/standalone/io/http_proxy_configuration_test.dart
|
| diff --git a/tests/standalone/io/http_proxy_configuration_test.dart b/tests/standalone/io/http_proxy_configuration_test.dart
|
| index 0d1f57d44d042d54879f3ebf7e2a7922927a018b..ab87c600ccb3b72886901febb9c9f9b20abf7b7b 100644
|
| --- a/tests/standalone/io/http_proxy_configuration_test.dart
|
| +++ b/tests/standalone/io/http_proxy_configuration_test.dart
|
| @@ -6,15 +6,17 @@ import "package:expect/expect.dart";
|
| import "dart:io";
|
|
|
| expect(expected, String uri, environment) {
|
| - Expect.equals(expected,
|
| - HttpClient.findProxyFromEnvironment(Uri.parse(uri),
|
| - environment: environment));
|
| + Expect.equals(
|
| + expected,
|
| + HttpClient.findProxyFromEnvironment(Uri.parse(uri),
|
| + environment: environment));
|
| }
|
|
|
| expectDirect(String uri, environment) {
|
| - Expect.equals("DIRECT",
|
| - HttpClient.findProxyFromEnvironment(Uri.parse(uri),
|
| - environment: environment));
|
| + Expect.equals(
|
| + "DIRECT",
|
| + HttpClient.findProxyFromEnvironment(Uri.parse(uri),
|
| + environment: environment));
|
| }
|
|
|
| main() {
|
| @@ -22,137 +24,111 @@ main() {
|
| expectDirect("http://www.google.com", {"http_proxy": ""});
|
| expectDirect("http://www.google.com", {"http_proxy": " "});
|
|
|
| - expect("PROXY www.proxy.com:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "www.proxy.com"});
|
| - expect("PROXY www.proxys.com:1080",
|
| - "https://www.google.com",
|
| - {"https_proxy": "www.proxys.com"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080"});
|
| - expect("PROXY www.proxys.com:8080",
|
| - "https://www.google.com",
|
| - {"https_proxy": "www.proxys.com:8080"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "https_proxy": "www.proxys.com:8080"});
|
| - expect("PROXY www.proxys.com:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "https_proxy": "www.proxys.com:8080"});
|
| + expect("PROXY www.proxy.com:1080", "http://www.google.com",
|
| + {"http_proxy": "www.proxy.com"});
|
| + expect("PROXY www.proxys.com:1080", "https://www.google.com",
|
| + {"https_proxy": "www.proxys.com"});
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com",
|
| + {"http_proxy": "www.proxy.com:8080"});
|
| + expect("PROXY www.proxys.com:8080", "https://www.google.com",
|
| + {"https_proxy": "www.proxys.com:8080"});
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com", {
|
| + "http_proxy": "www.proxy.com:8080",
|
| + "https_proxy": "www.proxys.com:8080"
|
| + });
|
| + expect("PROXY www.proxys.com:8080", "https://www.google.com", {
|
| + "http_proxy": "www.proxy.com:8080",
|
| + "https_proxy": "www.proxys.com:8080"
|
| + });
|
|
|
| - expect("PROXY [::ffff:1]:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "[::ffff:1]"});
|
| - expect("PROXY [::ffff:2]:1080",
|
| - "https://www.google.com",
|
| - {"https_proxy": "[::ffff:2]"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "[::ffff:1]:8080"});
|
| - expect("PROXY [::ffff:2]:8080",
|
| - "https://www.google.com",
|
| - {"https_proxy": "[::ffff:2]:8080"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "[::ffff:1]:8080",
|
| - "https_proxy": "[::ffff:2]:8080"});
|
| - expect("PROXY [::ffff:2]:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "[::ffff:1]:8080",
|
| - "https_proxy": "[::ffff:2]:8080"});
|
| + expect("PROXY [::ffff:1]:1080", "http://www.google.com",
|
| + {"http_proxy": "[::ffff:1]"});
|
| + expect("PROXY [::ffff:2]:1080", "https://www.google.com",
|
| + {"https_proxy": "[::ffff:2]"});
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com",
|
| + {"http_proxy": "[::ffff:1]:8080"});
|
| + expect("PROXY [::ffff:2]:8080", "https://www.google.com",
|
| + {"https_proxy": "[::ffff:2]:8080"});
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com",
|
| + {"http_proxy": "[::ffff:1]:8080", "https_proxy": "[::ffff:2]:8080"});
|
| + expect("PROXY [::ffff:2]:8080", "https://www.google.com",
|
| + {"http_proxy": "[::ffff:1]:8080", "https_proxy": "[::ffff:2]:8080"});
|
|
|
| - expect("PROXY www.proxy.com:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com"});
|
| - expect("PROXY www.proxy.com:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com/"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/index.html"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/",
|
| - "https_proxy": "http://www.proxys.com:8080/"});
|
| - expect("PROXY www.proxys.com:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/",
|
| - "https_proxy": "http://www.proxys.com:8080/"});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/",
|
| - "https_proxy": "http://www.proxys.com:8080/index.html"});
|
| - expect("PROXY www.proxys.com:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "http://www.proxy.com:8080/",
|
| - "https_proxy": "http://www.proxys.com:8080/index.html"});
|
| + expect("PROXY www.proxy.com:1080", "http://www.google.com",
|
| + {"http_proxy": "http://www.proxy.com"});
|
| + expect("PROXY www.proxy.com:1080", "http://www.google.com",
|
| + {"http_proxy": "http://www.proxy.com/"});
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com",
|
| + {"http_proxy": "http://www.proxy.com:8080/"});
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com",
|
| + {"http_proxy": "http://www.proxy.com:8080/index.html"});
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com", {
|
| + "http_proxy": "http://www.proxy.com:8080/",
|
| + "https_proxy": "http://www.proxys.com:8080/"
|
| + });
|
| + expect("PROXY www.proxys.com:8080", "https://www.google.com", {
|
| + "http_proxy": "http://www.proxy.com:8080/",
|
| + "https_proxy": "http://www.proxys.com:8080/"
|
| + });
|
| + expect("PROXY www.proxy.com:8080", "http://www.google.com", {
|
| + "http_proxy": "http://www.proxy.com:8080/",
|
| + "https_proxy": "http://www.proxys.com:8080/index.html"
|
| + });
|
| + expect("PROXY www.proxys.com:8080", "https://www.google.com", {
|
| + "http_proxy": "http://www.proxy.com:8080/",
|
| + "https_proxy": "http://www.proxys.com:8080/index.html"
|
| + });
|
|
|
| - expect("PROXY [::ffff:1]:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]"});
|
| - expect("PROXY [::ffff:1]:1080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]/"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/index.html"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/",
|
| - "https_proxy": "http://[::ffff:1]:8080/"});
|
| - expect("PROXY [::ffff:2]:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/",
|
| - "https_proxy": "http://[::ffff:2]:8080/"});
|
| - expect("PROXY [::ffff:1]:8080",
|
| - "http://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/",
|
| - "https_proxy": "http://[::ffff:1]:8080/index.html"});
|
| - expect("PROXY [::ffff:2]:8080",
|
| - "https://www.google.com",
|
| - {"http_proxy": "http://[::ffff:1]:8080/",
|
| - "https_proxy": "http://[::ffff:2]:8080/index.html"});
|
| + expect("PROXY [::ffff:1]:1080", "http://www.google.com",
|
| + {"http_proxy": "http://[::ffff:1]"});
|
| + expect("PROXY [::ffff:1]:1080", "http://www.google.com",
|
| + {"http_proxy": "http://[::ffff:1]/"});
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com",
|
| + {"http_proxy": "http://[::ffff:1]:8080/"});
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com",
|
| + {"http_proxy": "http://[::ffff:1]:8080/index.html"});
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com", {
|
| + "http_proxy": "http://[::ffff:1]:8080/",
|
| + "https_proxy": "http://[::ffff:1]:8080/"
|
| + });
|
| + expect("PROXY [::ffff:2]:8080", "https://www.google.com", {
|
| + "http_proxy": "http://[::ffff:1]:8080/",
|
| + "https_proxy": "http://[::ffff:2]:8080/"
|
| + });
|
| + expect("PROXY [::ffff:1]:8080", "http://www.google.com", {
|
| + "http_proxy": "http://[::ffff:1]:8080/",
|
| + "https_proxy": "http://[::ffff:1]:8080/index.html"
|
| + });
|
| + expect("PROXY [::ffff:2]:8080", "https://www.google.com", {
|
| + "http_proxy": "http://[::ffff:1]:8080/",
|
| + "https_proxy": "http://[::ffff:2]:8080/index.html"
|
| + });
|
|
|
| expectDirect("http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": "www.google.com"});
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": "www.google.com"});
|
| expectDirect("http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": "google.com"});
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": "google.com"});
|
| expectDirect("http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": ".com"});
|
| - expectDirect("http://www.google.com",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": ",, , www.google.edu,,.com "});
|
| - expectDirect("http://www.google.edu",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": ",, , www.google.edu,,.com "});
|
| - expectDirect("http://www.google.com",
|
| - {"https_proxy": "www.proxy.com:8080"});
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": ".com"});
|
| + expectDirect("http://www.google.com", {
|
| + "http_proxy": "www.proxy.com:8080",
|
| + "no_proxy": ",, , www.google.edu,,.com "
|
| + });
|
| + expectDirect("http://www.google.edu", {
|
| + "http_proxy": "www.proxy.com:8080",
|
| + "no_proxy": ",, , www.google.edu,,.com "
|
| + });
|
| + expectDirect("http://www.google.com", {"https_proxy": "www.proxy.com:8080"});
|
|
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://[::ffff:1]",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": "["});
|
| - expect("PROXY www.proxy.com:8080",
|
| - "http://[::ffff:1]",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": "[]"});
|
| + expect("PROXY www.proxy.com:8080", "http://[::ffff:1]",
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": "["});
|
| + expect("PROXY www.proxy.com:8080", "http://[::ffff:1]",
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": "[]"});
|
|
|
| expectDirect("http://[::ffff:1]",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": "[::ffff:1]"});
|
| - expectDirect("http://[::ffff:1]",
|
| - {"http_proxy": "www.proxy.com:8080",
|
| - "no_proxy": ",, , www.google.edu,,[::ffff:1] "});
|
| + {"http_proxy": "www.proxy.com:8080", "no_proxy": "[::ffff:1]"});
|
| + expectDirect("http://[::ffff:1]", {
|
| + "http_proxy": "www.proxy.com:8080",
|
| + "no_proxy": ",, , www.google.edu,,[::ffff:1] "
|
| + });
|
| }
|
|
|