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

Commit a88fdbb4 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Tidy up MockWebServer usage" am: 294ab080 am: d0dc9013 am: 47eedc35 

am: cfc82ac0

Change-Id: I9a27fe8d2769efee97e2d5be719d783ac1a34de1
parents 1efa7cbc cfc82ac0

core/tests/coretests/src/android/app/DownloadManagerBaseTest.java

+6 −0
Original line number Diff line number Diff line
@@ -244,6 +244,12 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { 
        // Note: callers overriding this should call mServer.play() with the desired port #

    }



    @Override

    public void tearDown() throws Exception {

        mServer.shutdown();

        super.tearDown();

    }



    /**

     * Helper to build a response from the MockWebServer with no body.

     *

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

+7 −1
Original line number Diff line number Diff line
@@ -36,7 +36,13 @@ import org.apache.http.impl.client.DefaultHttpClient; 


public final class CookiesTest extends TestCase {



    private MockWebServer server = new MockWebServer();

    private MockWebServer server;



    @Override

    protected void setUp() throws Exception {

        super.setUp();

        server = new MockWebServer();

    }



    @Override protected void tearDown() throws Exception {

        server.shutdown();

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

+7 −1
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ import org.apache.http.message.BasicHeader; 
 */

public final class DefaultHttpClientTest extends TestCase {



    private MockWebServer server = new MockWebServer();

    private MockWebServer server;



    @Override

    public void setUp() throws Exception {

        super.setUp();

        server = new MockWebServer();

    }



    @Override protected void tearDown() throws Exception {

        server.shutdown();