From cbdec383f28a9b11795b0fceab58c72cfac769ff Mon Sep 17 00:00:00 2001 From: Qiwen Zhao Date: Mon, 30 Mar 2015 10:51:01 -0700 Subject: [PATCH] DO NOT MERGE ANYWHERE. Revert "DO NOT MERGE ANYWHERE." This reverts commit b7c798f9b84c7c100aa37e6aa77e7f31460c7bd7, reversing changes made to 4e8ecc32db5d3a17ccec099681425c34b630d23b. --- tests/cts/net/Android.mk | 6 +- tests/cts/net/jni/NativeDnsJni.c | 1 - .../src/android/net/cts/LocalSocketTest.java | 4 +- .../cts/SSLCertificateSocketFactoryTest.java | 4 +- .../net/http/cts/HttpResponseCacheTest.java | 158 ------------------ .../android/net/wifi/cts/NsdManagerTest.java | 3 + 6 files changed, 10 insertions(+), 166 deletions(-) delete mode 100644 tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index f6e5c90951..46d4d819ac 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -26,15 +26,15 @@ LOCAL_MULTILIB := both LOCAL_JAVA_LIBRARIES := voip-common conscrypt -LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni +LOCAL_JNI_SHARED_LIBRARIES := libnativedns_jni # include CtsTestServer as a temporary hack to free net.cts from cts.stub. LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsNetTestCases -LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support ctsdeviceutil \ - ctstestrunner ctstestserver mockwebserver +LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctsdeviceutil ctstestrunner \ + core-tests-support # uncomment when b/13249961 is fixed #LOCAL_SDK_VERSION := current diff --git a/tests/cts/net/jni/NativeDnsJni.c b/tests/cts/net/jni/NativeDnsJni.c index 4eb3c7aebc..b975594b26 100644 --- a/tests/cts/net/jni/NativeDnsJni.c +++ b/tests/cts/net/jni/NativeDnsJni.c @@ -18,7 +18,6 @@ #include #include #include -#include #include const char *GoogleDNSIpV4Address="8.8.8.8"; diff --git a/tests/cts/net/src/android/net/cts/LocalSocketTest.java b/tests/cts/net/src/android/net/cts/LocalSocketTest.java index 865ec21da3..0a4bc0d4f2 100644 --- a/tests/cts/net/src/android/net/cts/LocalSocketTest.java +++ b/tests/cts/net/src/android/net/cts/LocalSocketTest.java @@ -126,8 +126,8 @@ public class LocalSocketTest extends AndroidTestCase{ socket.setReceiveBufferSize(1999); assertEquals(1999 << 1, socket.getReceiveBufferSize()); - socket.setSendBufferSize(3998); - assertEquals(3998 << 1, socket.getSendBufferSize()); + socket.setSendBufferSize(1998); + assertEquals(1998 << 1, socket.getSendBufferSize()); // Timeout is not support at present, so set is ignored socket.setSoTimeout(1996); diff --git a/tests/cts/net/src/android/net/cts/SSLCertificateSocketFactoryTest.java b/tests/cts/net/src/android/net/cts/SSLCertificateSocketFactoryTest.java index 60ac226440..6175923e46 100644 --- a/tests/cts/net/src/android/net/cts/SSLCertificateSocketFactoryTest.java +++ b/tests/cts/net/src/android/net/cts/SSLCertificateSocketFactoryTest.java @@ -26,7 +26,7 @@ import javax.net.ssl.SSLPeerUnverifiedException; import android.net.SSLCertificateSocketFactory; import android.test.AndroidTestCase; -import libcore.javax.net.ssl.SSLConfigurationAsserts; +import libcore.javax.net.ssl.SSLDefaultConfigurationAsserts; public class SSLCertificateSocketFactoryTest extends AndroidTestCase { private SSLCertificateSocketFactory mFactory; @@ -40,7 +40,7 @@ public class SSLCertificateSocketFactoryTest extends AndroidTestCase { } public void testDefaultConfiguration() throws Exception { - SSLConfigurationAsserts.assertSSLSocketFactoryDefaultConfiguration(mFactory); + SSLDefaultConfigurationAsserts.assertSSLSocketFactory(mFactory); } public void testAccessProperties() throws Exception { diff --git a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java b/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java deleted file mode 100644 index 545541d68b..0000000000 --- a/tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net.http.cts; - -import com.google.mockwebserver.MockResponse; -import com.google.mockwebserver.MockWebServer; - -import junit.framework.TestCase; - -import android.cts.util.FileUtils; -import android.net.http.HttpResponseCache; - -import java.io.File; -import java.io.InputStream; -import java.net.CacheRequest; -import java.net.CacheResponse; -import java.net.ResponseCache; -import java.net.URI; -import java.net.URLConnection; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public final class HttpResponseCacheTest extends TestCase { - - private File cacheDir; - private MockWebServer server = new MockWebServer(); - - @Override public void setUp() throws Exception { - super.setUp(); - String tmp = System.getProperty("java.io.tmpdir"); - cacheDir = new File(tmp, "HttpCache-" + UUID.randomUUID()); - cacheDir.mkdirs(); - // Make the cache directory read / writable. - FileUtils.setPermissions(cacheDir.getPath(), 0777); - } - - @Override protected void tearDown() throws Exception { - ResponseCache.setDefault(null); - server.shutdown(); - super.tearDown(); - } - - public void testInstall() throws Exception { - HttpResponseCache installed = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - assertNotNull(installed); - assertSame(installed, ResponseCache.getDefault()); - assertSame(installed, HttpResponseCache.getDefault()); - } - - public void testSecondEquivalentInstallDoesNothing() throws Exception { - HttpResponseCache first = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - HttpResponseCache another = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - assertSame(first, another); - } - - public void testInstallClosesPreviouslyInstalled() throws Exception { - HttpResponseCache first = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - initializeCache(first); - - HttpResponseCache another = HttpResponseCache.install(cacheDir, 8 * 1024 * 1024); - initializeCache(first); - - assertNotSame(first, another); - try { - first.flush(); - fail(); - } catch (IllegalStateException expected) { - } - } - - public void testGetInstalledWithWrongTypeInstalled() { - ResponseCache.setDefault(new ResponseCache() { - @Override public CacheResponse get(URI uri, String requestMethod, - Map> requestHeaders) { - return null; - } - @Override public CacheRequest put(URI uri, URLConnection connection) { - return null; - } - }); - assertNull(HttpResponseCache.getInstalled()); - } - - public void testCloseCloses() throws Exception { - HttpResponseCache cache = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - initializeCache(cache); - - cache.close(); - try { - cache.flush(); - fail(); - } catch (IllegalStateException expected) { - } - } - - public void testCloseUninstalls() throws Exception { - HttpResponseCache cache = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - cache.close(); - assertNull(ResponseCache.getDefault()); - } - - public void testDeleteUninstalls() throws Exception { - HttpResponseCache cache = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - cache.delete(); - assertNull(ResponseCache.getDefault()); - } - - /** - * Make sure that statistics tracking are wired all the way through the - * wrapper class. http://code.google.com/p/android/issues/detail?id=25418 - */ - public void testStatisticsTracking() throws Exception { - HttpResponseCache cache = HttpResponseCache.install(cacheDir, 10 * 1024 * 1024); - - server.enqueue(new MockResponse() - .addHeader("Cache-Control: max-age=60") - .setBody("A")); - server.play(); - - URLConnection c1 = server.getUrl("/").openConnection(); - InputStream inputStream1 = c1.getInputStream(); - assertEquals('A', inputStream1.read()); - inputStream1.close(); - - assertEquals(1, cache.getRequestCount()); - assertEquals(1, cache.getNetworkCount()); - assertEquals(0, cache.getHitCount()); - - URLConnection c2 = server.getUrl("/").openConnection(); - assertEquals('A', c2.getInputStream().read()); - - URLConnection c3 = server.getUrl("/").openConnection(); - assertEquals('A', c3.getInputStream().read()); - assertEquals(3, cache.getRequestCount()); - assertEquals(1, cache.getNetworkCount()); - assertEquals(2, cache.getHitCount()); - } - - private void initializeCache(HttpResponseCache cache) { - // Ensure the cache is initialized, otherwise various methods are no-ops. - cache.size(); - } -} diff --git a/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java index e132cce25f..d43472805b 100644 --- a/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/NsdManagerTest.java @@ -372,6 +372,8 @@ public class NsdManagerTest extends AndroidTestCase { assertTrue(lastEvent != null); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); + assertTrue(eventCacheSize() == 2); + // Register service again to see if we discover it checkForAdditionalEvents(); clearEventCache(); @@ -403,6 +405,7 @@ public class NsdManagerTest extends AndroidTestCase { lastEvent.mInfo.getServiceName()); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); + assertTrue(checkCacheSize(2)); checkForAdditionalEvents(); clearEventCache();