Fix android.net.cts.ProxyTest
Bug 3188260
Remove the code that was trying to write to secure settings
and take off the BrokenTest annotation.
Change-Id: I0759db38225a9822b25c987e66a7590c555b5e9e
diff --git a/tests/tests/net/src/android/net/cts/ProxyTest.java b/tests/tests/net/src/android/net/cts/ProxyTest.java
index 357935a..184a07c 100644
--- a/tests/tests/net/src/android/net/cts/ProxyTest.java
+++ b/tests/tests/net/src/android/net/cts/ProxyTest.java
@@ -16,29 +16,17 @@
package android.net.cts;
-import android.content.Context;
-import android.net.Proxy;
-import android.provider.Settings.Secure;
-import android.test.AndroidTestCase;
-
-import dalvik.annotation.BrokenTest;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.net.Proxy;
+import android.test.AndroidTestCase;
+
@TestTargetClass(Proxy.class)
public class ProxyTest extends AndroidTestCase {
- private Context mContext;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- mContext = getContext();
- }
-
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "Proxy",
@@ -59,18 +47,7 @@
method = "getDefaultHost",
args = {}
),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getPort",
- args = {Context.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getHost",
- args = {Context.class}
- )
})
- @BrokenTest("Cannot write secure settings table")
public void testAccessProperties() {
final int minValidPort = 0;
final int maxValidPort = 65535;
@@ -80,12 +57,5 @@
} else {
assertTrue(defaultPort >= minValidPort && defaultPort <= maxValidPort);
}
-
- final String host = "proxy.example.com";
- final int port = 2008;
-
- Secure.putString(mContext.getContentResolver(), Secure.HTTP_PROXY, host + ":" + port);
- assertEquals(host, Proxy.getHost(mContext));
- assertEquals(port, Proxy.getPort(mContext));
}
}