diff options
author | jbudorick <jbudorick@chromium.org> | 2015-05-19 13:08:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-19 20:08:45 +0000 |
commit | 6cdb69279cb4f83fd8d1f31f58eb0edf44d2bec3 (patch) | |
tree | 408014d351f591963004c5241d8c4ade4b170832 /components/test | |
parent | 08051efe5a27ee82248a45eee41a99a0943c33cf (diff) | |
download | chromium_src-6cdb69279cb4f83fd8d1f31f58eb0edf44d2bec3.zip chromium_src-6cdb69279cb4f83fd8d1f31f58eb0edf44d2bec3.tar.gz chromium_src-6cdb69279cb4f83fd8d1f31f58eb0edf44d2bec3.tar.bz2 |
Revert of [Android] Refactor the native test wrappers. (patchset #7 id:120001 of https://codereview.chromium.org/1126543009/)
Reason for revert:
broke http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android
e.g. http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android/builds/1922
Original issue's description:
> [Android] Refactor the native test wrappers.
>
> BUG=476410
>
> Committed: https://crrev.com/581d25e509e4a2b1e8927c6d8accc0c90ea86090
> Cr-Commit-Position: refs/heads/master@{#330531}
TBR=jochen@chromium.org,cjhopman@chromium.org,jaekyun@chromium.org,perezju@chromium.org,tedchoc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=476410
Review URL: https://codereview.chromium.org/1138993009
Cr-Commit-Position: refs/heads/master@{#330591}
Diffstat (limited to 'components/test')
5 files changed, 145 insertions, 21 deletions
diff --git a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 index 97dae9e..3ac010d 100644 --- a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 +++ b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 @@ -47,10 +47,6 @@ {% endfor %} </application> - <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner" - android:label="ComponentsBrowserTests" - android:targetPackage="org.chromium.components_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/components/test/android/browsertests_apk/components_browser_tests_android.cc b/components/test/android/browsertests_apk/components_browser_tests_android.cc new file mode 100644 index 0000000..baf8efe --- /dev/null +++ b/components/test/android/browsertests_apk/components_browser_tests_android.cc @@ -0,0 +1,99 @@ +// 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. + +// 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 "jni/ComponentsBrowserTestsActivity_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/components-browser-tests-command-line"; + +} // namespace + +namespace components { + +// TODO(jaekyun): Refactor and deduplicate with +// testing/android/native_test/native_test_launcher.cc (http://crbug.com/476410) +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[] = {"ComponentsBrowserTestsActivity"}; + 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, + "components_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 RegisterComponentsBrowserTestsAndroid(JNIEnv* env) { + return RegisterNativesImpl(env); +} + +} // namespace components diff --git a/components/test/android/browsertests_apk/components_browser_tests_android.h b/components/test/android/browsertests_apk/components_browser_tests_android.h new file mode 100644 index 0000000..a989706 --- /dev/null +++ b/components/test/android/browsertests_apk/components_browser_tests_android.h @@ -0,0 +1,16 @@ +// 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 COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_ +#define COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_ + +#include <jni.h> + +namespace components { + +bool RegisterComponentsBrowserTestsAndroid(JNIEnv* env); + +} // namespace components + +#endif // COMPONENTS_TEST_ANDROID_BROWSERTESTS_APK_COMPONENTS_BROWSER_TESTS_ANDROID_H_ diff --git a/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc index 6b15e3c..e47b840 100644 --- a/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc +++ b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc @@ -2,23 +2,21 @@ // 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 "components/test/android/browsertests_apk/components_browser_tests_android.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/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 base::android::RegisterJni(env) && - content::android::RegisterShellJni(env) && - content::NestedMessagePumpAndroid::RegisterJni(env) && - testing::android::RegisterNativeTestJNI(env); + return content::android::RegisterShellJni(env) && + content::NestedMessagePumpAndroid::RegisterJni(env) && + components::RegisterComponentsBrowserTestsAndroid(env); } bool Init() { diff --git a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java index ae94edc..bbf2461 100644 --- a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java +++ b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java @@ -4,44 +4,43 @@ package org.chromium.components_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.Log; +import org.chromium.base.JNINamespace; 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 components browser tests */ -public class ComponentsBrowserTestsActivity extends NativeBrowserTestActivity { - private static final String TAG = Log.makeTag("native_test"); +@JNINamespace("components") +public class ComponentsBrowserTestsActivity extends Activity { + private static final String TAG = "ComponentsBrowserTestsActivity"; private ShellManager mShellManager; private WindowAndroid mWindowAndroid; @Override + @SuppressFBWarnings("DM_EXIT") public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - appendCommandLineFlags( - "--remote-debugging-socket-name components_browsertests_devtools_remote"); - } - @Override - @SuppressFBWarnings("DM_EXIT") - protected void initializeBrowserProcess() { try { LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(); } catch (ProcessInitException e) { - Log.e(TAG, "Cannot load components_browsertests.", e); + Log.i(TAG, "Cannot load components_browsertests:" + e); System.exit(-1); } BrowserStartupController.get(getApplicationContext(), LibraryProcessType.PROCESS_BROWSER) @@ -56,5 +55,21 @@ public class ComponentsBrowserTestsActivity extends NativeBrowserTestActivity { 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); } |