Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 061136c8 authored by Jesse Wilson's avatar Jesse Wilson Committed by Android (Google) Code Review
Browse files

Merge "Use external/mockwebserver in frameworks/base"

parents 5bc7c93c 7ad00e6f

core/tests/coretests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ LOCAL_SRC_FILES := \ 
	$(call all-java-files-under, EnabledTestApp/src)



LOCAL_DX_FLAGS := --core-library

LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib

LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib mockwebserver

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := FrameworksCoreTests

core/tests/coretests/src/android/net/http/AbstractProxyTest.java

+4 −4
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package android.net.http;



import com.google.mockwebserver.MockResponse;

import com.google.mockwebserver.MockWebServer;

import com.google.mockwebserver.RecordedRequest;

import com.google.mockwebserver.SocketPolicy;

import java.io.IOException;

import java.io.InputStreamReader;

import java.io.Reader;
@@ -33,10 +37,6 @@ import org.apache.http.conn.params.ConnRouteParams; 
import org.apache.http.conn.scheme.Scheme;

import org.apache.http.conn.ssl.AllowAllHostnameVerifier;

import org.apache.http.conn.ssl.SSLSocketFactory;

import tests.http.MockResponse;

import tests.http.MockWebServer;

import tests.http.RecordedRequest;

import tests.http.SocketPolicy;



public abstract class AbstractProxyTest extends TestCase {

core/tests/coretests/src/android/net/http/CookiesTest.java

+3 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.net.http;



import com.google.mockwebserver.MockResponse;

import com.google.mockwebserver.MockWebServer;

import com.google.mockwebserver.RecordedRequest;

import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.net.URISyntaxException;
@@ -30,9 +33,6 @@ import org.apache.http.client.HttpClient; 
import org.apache.http.client.methods.HttpGet;

import org.apache.http.conn.params.ConnRoutePNames;

import org.apache.http.impl.client.DefaultHttpClient;

import tests.http.MockResponse;

import tests.http.MockWebServer;

import tests.http.RecordedRequest;



public final class CookiesTest extends TestCase {

core/tests/coretests/src/android/net/http/DefaultHttpClientTest.java

+6 −6
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package android.net.http;



import com.google.mockwebserver.MockResponse;

import com.google.mockwebserver.MockWebServer;

import com.google.mockwebserver.SocketPolicy;

import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_END;

import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_INPUT_AT_END;

import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_OUTPUT_AT_END;

import java.io.IOException;

import java.io.InputStreamReader;

import java.io.Reader;
@@ -24,12 +30,6 @@ import junit.framework.TestCase; 
import org.apache.http.HttpResponse;

import org.apache.http.client.methods.HttpGet;

import org.apache.http.impl.client.DefaultHttpClient;

import tests.http.MockResponse;

import tests.http.MockWebServer;

import tests.http.SocketPolicy;

import static tests.http.SocketPolicy.DISCONNECT_AT_END;

import static tests.http.SocketPolicy.SHUTDOWN_INPUT_AT_END;

import static tests.http.SocketPolicy.SHUTDOWN_OUTPUT_AT_END;



public final class DefaultHttpClientTest extends TestCase {