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

Commit 6f04b2e7 authored by Neil Fuller's avatar Neil Fuller
Browse files

Tidy up MockWebServer usage 

Delay creation of MockWebServer until setUp() and
add shutdown logic in one case.

Bug: 29820565
Change-Id: Iea43f8692b8425d05405a8fe86382d6d12197b2d
parent 4eea3a7f

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

+6 −0
Original line number Diff line number Diff line
@@ -245,6 +245,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();