diff options
Diffstat (limited to 'content/shell/android/browsertests_apk')
5 files changed, 20 insertions, 146 deletions
diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 index b76b293..aca8da7 100644 --- a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 +++ b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 @@ -47,6 +47,10 @@ {% endfor %} </application> + <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner" + android:label="ContentBrowserTests" + android:targetPackage="org.chromium.content_browsertests_apk"/> + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc deleted file mode 100644 index 86f43b5..0000000 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2012 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. - -// This class sets up the environment for running the content browser tests -// inside an android application. - -#include <android/log.h> -#include <unistd.h> - -#include "base/android/base_jni_registrar.h" -#include "base/android/fifo_utils.h" -#include "base/android/jni_android.h" -#include "base/android/jni_string.h" -#include "base/android/library_loader/library_loader_hooks.h" -#include "base/android/scoped_java_ref.h" -#include "base/base_switches.h" -#include "base/command_line.h" -#include "base/files/file_path.h" -#include "base/logging.h" -#include "base/strings/string_tokenizer.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "content/public/common/content_switches.h" -#include "content/public/test/test_launcher.h" -#include "content/shell/android/shell_jni_registrar.h" -#include "content/shell/app/shell_main_delegate.h" -#include "jni/ContentBrowserTestsActivity_jni.h" -#include "media/base/media_switches.h" -#include "testing/android/native_test/native_test_util.h" - -using testing::native_test_util::ArgsToArgv; -using testing::native_test_util::ParseArgsFromCommandLineFile; -using testing::native_test_util::ScopedMainEntryLogger; - -// The main function of the program to be wrapped as an apk. -extern int main(int argc, char** argv); - -namespace { - -// The test runner script writes the command line file in -// "/data/local/tmp". -static const char kCommandLineFilePath[] = - "/data/local/tmp/content-browser-tests-command-line"; - -} // namespace - -namespace content { - -// TODO(nileshagrawal): Refactor and deduplicate with -// testing/android/native_test_launcher.cc -static void RunTests(JNIEnv* env, - jobject obj, - jstring jfiles_dir, - jobject app_context) { - // Command line basic initialization, will be fully initialized later. - static const char* const kInitialArgv[] = { "ContentBrowserTestsActivity" }; - base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv); - - // Set the application context in base. - base::android::ScopedJavaLocalRef<jobject> scoped_context( - env, env->NewLocalRef(app_context)); - base::android::InitApplicationContext(env, scoped_context); - base::android::RegisterJni(env); - - std::vector<std::string> args; - ParseArgsFromCommandLineFile(kCommandLineFilePath, &args); - - std::vector<char*> argv; - int argc = ArgsToArgv(args, &argv); - - // Fully initialize command line with arguments. - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - command_line->AppendArguments(base::CommandLine(argc, &argv[0]), false); - - // Append required switches. - command_line->AppendSwitch(content::kSingleProcessTestsFlag); - command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream); - command_line->AppendSwitch(switches::kUseFakeUIForMediaStream); - // Specify a socket name to not conflict with the default one used - // in content_shell. - command_line->AppendSwitchASCII(switches::kRemoteDebuggingSocketName, - "content_browsertests_devtools_remote"); - - // Create fifo and redirect stdout and stderr to it. - base::FilePath files_dir( - base::android::ConvertJavaStringToUTF8(env, jfiles_dir)); - base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo"))); - base::android::CreateFIFO(fifo_path, 0666); - base::android::RedirectStream(stdout, fifo_path, "w+"); - dup2(STDOUT_FILENO, STDERR_FILENO); - - ScopedMainEntryLogger scoped_main_entry_logger; - main(argc, &argv[0]); -} - -bool RegisterContentBrowserTestsAndroid(JNIEnv* env) { - return RegisterNativesImpl(env); -} - -} // namespace content diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.h b/content/shell/android/browsertests_apk/content_browser_tests_android.h deleted file mode 100644 index bb80784..0000000 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.h +++ /dev/null @@ -1,16 +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. - -#ifndef CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_ANDROID_H_ -#define CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_ANDROID_H_ - -#include <jni.h> - -namespace content { - -bool RegisterContentBrowserTestsAndroid(JNIEnv* env); - -} // namespace content - -#endif // CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_ANDROID_H_ diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc index 26f93d4..8379008 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc @@ -2,21 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/android/base_jni_registrar.h" #include "base/android/jni_android.h" #include "base/bind.h" #include "content/public/app/content_jni_onload.h" #include "content/public/app/content_main.h" #include "content/public/test/nested_message_pump_android.h" -#include "content/shell/android/browsertests_apk/content_browser_tests_android.h" #include "content/shell/android/shell_jni_registrar.h" #include "content/shell/app/shell_main_delegate.h" +#include "testing/android/native_test/native_test_launcher.h" namespace { bool RegisterJNI(JNIEnv* env) { - return content::android::RegisterShellJni(env) && + return base::android::RegisterJni(env) && + content::android::RegisterShellJni(env) && content::NestedMessagePumpAndroid::RegisterJni(env) && - content::RegisterContentBrowserTestsAndroid(env); + testing::android::RegisterNativeTestJNI(env); } bool Init() { diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java index bc95f1c..d10b719 100644 --- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java +++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java @@ -4,43 +4,44 @@ package org.chromium.content_browsertests_apk; -import android.app.Activity; -import android.content.Context; import android.os.Bundle; -import android.os.Handler; -import android.util.Log; import android.view.Window; import android.view.WindowManager; -import org.chromium.base.JNINamespace; +import org.chromium.base.Log; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryProcessType; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.browser.BrowserStartupController; import org.chromium.content_shell.ShellManager; +import org.chromium.native_test.NativeBrowserTestActivity; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.WindowAndroid; /** * Android activity for running content browser tests */ -@JNINamespace("content") -public class ContentBrowserTestsActivity extends Activity { - private static final String TAG = "ChromeBrowserTestsActivity"; +public class ContentBrowserTestsActivity extends NativeBrowserTestActivity { + private static final String TAG = Log.makeTag("native_test"); private ShellManager mShellManager; private WindowAndroid mWindowAndroid; @Override - @SuppressFBWarnings("DM_EXIT") public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appendCommandLineFlags( + "--remote-debugging-socket-name content_browsertests_devtools_remote"); + } + @Override + @SuppressFBWarnings("DM_EXIT") + protected void initializeBrowserProcess() { try { LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(); } catch (ProcessInitException e) { - Log.i(TAG, "Cannot load content_browsertests:" + e); + Log.e(TAG, "Cannot load content_browsertests.", e); System.exit(-1); } BrowserStartupController.get(getApplicationContext(), LibraryProcessType.PROCESS_BROWSER) @@ -55,21 +56,5 @@ public class ContentBrowserTestsActivity extends Activity { wind.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); wind.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); wind.addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON); - - new Handler().post(new Runnable() { - @Override - public void run() { - Log.i(TAG, "Running tests"); - runTests(); - Log.i(TAG, "Tests finished."); - finish(); - } - }); - } - - private void runTests() { - nativeRunTests(getFilesDir().getAbsolutePath(), getApplicationContext()); } - - private native void nativeRunTests(String filesDir, Context appContext); } |