android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java - Issue 2687573002: [Android Webview] Refactor LoadUrlTest and work on embedded_test_server custom handler

Unified Diff: android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java

Issue 2687573002: [Android Webview] Refactor LoadUrlTest and work on embedded_test_server custom handler (Closed)

Patch Set: discussing patch Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« android_webview/embeddedtestserver/aw_embedded_test_server_android.cc ('K') | « android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServer.java ('k') | android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java

diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java b/android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java

similarity index 67%

copy from net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

copy to android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java

index defdd476ae2bf4fd6d3de26628367573a22c1fce..fb51f2254dd3739ffdcbfbcff8fcd74a202a9c5e 100644

--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

+++ b/android_webview/embeddedtestserver/java/src/org/chromium/net/test/AwEmbeddedTestServerImpl.java

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -26,10 +26,10 @@ import java.util.concurrent.atomic.AtomicInteger;

/**

* Java bindings for running a net::test_server::EmbeddedTestServer.

- * This should not be used directly. Use {@link EmbeddedTestServer} instead.

+ * This should not be used directly. Use {@link AwEmbeddedTestServer} instead.

@JNINamespace("net::test_server")

-public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

+public class AwEmbeddedTestServerImpl extends IAwEmbeddedTestServerImpl.Stub {

private static final String TAG = "cr_TestServer";

private static AtomicInteger sCount = new AtomicInteger();

@@ -37,10 +37,10 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

private final Context mContext;

private Handler mHandler;

private HandlerThread mHandlerThread;

- private long mNativeEmbeddedTestServer;

+ private long mNativeAwEmbeddedTestServer;

/** Create an uninitialized EmbeddedTestServer. */

- public EmbeddedTestServerImpl(Context context) {

+ public AwEmbeddedTestServerImpl(Context context) {

mContext = context;

}

@@ -63,7 +63,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

@Override

public boolean initializeNative() {

- // This is necessary as EmbeddedTestServerImpl is in a different process than the tests

+ // This is necessary as AwEmbeddedTestServerImpl is in a different process than the tests

// using it, so it needs to initialize its own application context.

ContextUtils.initApplicationContext(mContext.getApplicationContext());

try {

@@ -80,8 +80,8 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

runOnHandlerThread(new Callable<Void>() {

@Override

public Void call() {

- if (mNativeEmbeddedTestServer == 0) nativeInit(UrlUtils.getIsolatedTestRoot());

- assert mNativeEmbeddedTestServer != 0;

+ if (mNativeAwEmbeddedTestServer == 0) nativeInit(UrlUtils.getIsolatedTestRoot());

+ assert mNativeAwEmbeddedTestServer != 0;

return null;

}

});

@@ -100,7 +100,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

return runOnHandlerThread(new Callable<Boolean>() {

@Override

public Boolean call() {

- return nativeStart(mNativeEmbeddedTestServer);

+ return nativeStart(mNativeAwEmbeddedTestServer);

}

});

}

@@ -116,7 +116,35 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

runOnHandlerThread(new Callable<Void>() {

@Override

public Void call() {

- nativeAddDefaultHandlers(mNativeEmbeddedTestServer, directoryPath);

+ nativeAddDefaultHandlers(mNativeAwEmbeddedTestServer, directoryPath);

+ return null;

+ }

+ });

+ }

+ @Override

+ public long[] getCustomHandlers() {

+ return runOnHandlerThread(new Callable<long[]>() {

+ @Override

+ public long[] call() {

+ return nativeGetCustomHandlers(mNativeAwEmbeddedTestServer);

+ }

+ });

+ }

+ /** Register multiple request handlers.

+ * Handlers must be registered before starting the server.

+ *

+ * @param handlers The pointers of handlers to be registered.

+ */

+ @Override

+ public void registerRequestHandlers(final long[] handlers) {

+ runOnHandlerThread(new Callable<Void>() {

+ @Override

+ public Void call() {

+ for (int i = 0; i < handlers.length; i++) {

+ nativeRegisterRequestHandler(mNativeAwEmbeddedTestServer, handlers[i]);

+ }

return null;

}

});

@@ -131,7 +159,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

runOnHandlerThread(new Callable<Void>() {

@Override

public Void call() {

- nativeServeFilesFromDirectory(mNativeEmbeddedTestServer, directoryPath);

+ nativeServeFilesFromDirectory(mNativeAwEmbeddedTestServer, directoryPath);

return null;

}

});

@@ -147,7 +175,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

return runOnHandlerThread(new Callable<String>() {

@Override

public String call() {

- return nativeGetURL(mNativeEmbeddedTestServer, relativeUrl);

+ return nativeGetURL(mNativeAwEmbeddedTestServer, relativeUrl);

}

});

}

@@ -161,7 +189,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

return runOnHandlerThread(new Callable<Boolean>() {

@Override

public Boolean call() {

- return nativeShutdownAndWaitUntilComplete(mNativeEmbeddedTestServer);

+ return nativeShutdownAndWaitUntilComplete(mNativeAwEmbeddedTestServer);

}

});

}

@@ -172,9 +200,9 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

runOnHandlerThread(new Callable<Void>() {

@Override

public Void call() {

- assert mNativeEmbeddedTestServer != 0;

- nativeDestroy(mNativeEmbeddedTestServer);

- assert mNativeEmbeddedTestServer == 0;

+ assert mNativeAwEmbeddedTestServer != 0;

+ nativeDestroy(mNativeAwEmbeddedTestServer);

+ assert mNativeAwEmbeddedTestServer == 0;

return null;

}

});

@@ -199,23 +227,27 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

@CalledByNative

private void setNativePtr(long nativePtr) {

- assert mNativeEmbeddedTestServer == 0;

- mNativeEmbeddedTestServer = nativePtr;

+ assert mNativeAwEmbeddedTestServer == 0;

+ mNativeAwEmbeddedTestServer = nativePtr;

}

@CalledByNative

private void clearNativePtr() {

- assert mNativeEmbeddedTestServer != 0;

- mNativeEmbeddedTestServer = 0;

+ assert mNativeAwEmbeddedTestServer != 0;

+ mNativeAwEmbeddedTestServer = 0;

}

private native void nativeInit(String testDataDir);

- private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);

- private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);

- private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);

- private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);

+ private native void nativeDestroy(long nativeAwEmbeddedTestServerAndroid);

+ private native boolean nativeStart(long nativeAwEmbeddedTestServerAndroid);

+ private native boolean nativeShutdownAndWaitUntilComplete(

+ long nativeAwEmbeddedTestServerAndroid);

+ private native String nativeGetURL(long nativeAwEmbeddedTestServerAndroid, String relativeUrl);

private native void nativeAddDefaultHandlers(

- long nativeEmbeddedTestServerAndroid, String directoryPath);

+ long nativeAwEmbeddedTestServerAndroid, String directoryPath);

+ private native long[] nativeGetCustomHandlers(long nativeAwEmbeddedTestServerAndroid);

+ private native void nativeRegisterRequestHandler(

+ long nativeAwEmbeddedTestServerAndroid, long handler);

private native void nativeServeFilesFromDirectory(

- long nativeEmbeddedTestServerAndroid, String directoryPath);

+ long nativeAwEmbeddedTestServerAndroid, String directoryPath);

}