Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3765)

Unified Diff: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java

Issue 1210973002: Revert of [Android] Add a Java version of net::test_server::EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
Download patch
« no previous file with comments | « net/net.gyp ('k') | net/test/android/net_test_jni_onload.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
deleted file mode 100644
index 06ab79e6e4ced09ddfe856c000a0f00997c29f44..0000000000000000000000000000000000000000
--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.net.test;
-
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-
-import java.io.File;
-
-/**
- * Java bindings for the native embedded test server.
- *
- * An example use:
- * EmbeddedTestServer s = new EmbeddedTestServer();
- * s.initializeNative();
- * s.serveFilesFromDirectory("/path/to/my/directory");
- * if (!s.initializeAndWaitUntilReady()) {
- * throw new SomeKindOfException("Unable to initialize EmbeddedTestServer.");
- * }
- *
- * // serve requests...
- *
- * s.shutdownAndWait();
- * s.destroy();
- */
-@JNINamespace("net::test_server")
-public class EmbeddedTestServer {
- private long mNativeEmbeddedTestServer;
-
- /** Create an uninitialized EmbeddedTestServer. */
- public EmbeddedTestServer() {}
-
- /** Initialize the native EmbeddedTestServer object. */
- public void initializeNative() {
- if (mNativeEmbeddedTestServer == 0) nativeInit();
- assert mNativeEmbeddedTestServer != 0;
- }
-
- /** Serve files from the provided directory.
- *
- * @param directory The directory from which files should be served.
- */
- public void serveFilesFromDirectory(File directory) {
- nativeServeFilesFromDirectory(mNativeEmbeddedTestServer, directory.getPath());
- }
-
- /** Serve files from the provided directory.
- *
- * @param directoryPath The path of the directory from which files should be served.
- */
- public void serveFilesFromDirectory(String directoryPath) {
- nativeServeFilesFromDirectory(mNativeEmbeddedTestServer, directoryPath);
- }
-
- /** Initialize the server.
- *
- * Note that this should be called after handlers are set up, including any relevant calls
- * serveFilesFromDirectory.
- *
- * @return Whether the server was successfully initialized.
- */
- public boolean initializeAndWaitUntilReady() {
- return nativeInitializeAndWaitUntilReady(mNativeEmbeddedTestServer);
- }
-
- /** Get the full URL for the given relative URL.
- *
- * @param relativeUrl The relative URL for which a full URL will be obtained.
- * @return The URL as a String.
- */
- public String getURL(String relativeUrl) {
- return nativeGetURL(mNativeEmbeddedTestServer, relativeUrl);
- }
-
- /** Shutdown the server.
- *
- * @return Whether the server was successfully shut down.
- */
- public boolean shutdownAndWaitUntilComplete() {
- return nativeShutdownAndWaitUntilComplete(mNativeEmbeddedTestServer);
- }
-
- /** Destroy the native EmbeddedTestServer object. */
- public void destroy() {
- assert mNativeEmbeddedTestServer != 0;
- nativeDestroy(mNativeEmbeddedTestServer);
- assert mNativeEmbeddedTestServer == 0;
- }
-
- @CalledByNative
- private void setNativePtr(long nativePtr) {
- assert mNativeEmbeddedTestServer == 0;
- mNativeEmbeddedTestServer = nativePtr;
- }
-
- @CalledByNative
- private void clearNativePtr() {
- assert mNativeEmbeddedTestServer != 0;
- mNativeEmbeddedTestServer = 0;
- }
-
- private native void nativeInit();
- private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);
- private native boolean nativeInitializeAndWaitUntilReady(long nativeEmbeddedTestServerAndroid);
- private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);
- private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
- private native void nativeServeFilesFromDirectory(
- long nativeEmbeddedTestServerAndroid, String directoryPath);
-}
« no previous file with comments | « net/net.gyp ('k') | net/test/android/net_test_jni_onload.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698