/hg/icedtea-web: Spawn Java side during C++ unit tests. Many new...
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Fri Aug 23 13:35:47 PDT 2013
changeset 94ebabfba6ab in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=94ebabfba6ab
author: Adam Domurad <adomurad at redhat.com>
date: Fri Aug 23 16:35:37 2013 -0400
Spawn Java side during C++ unit tests. Many new tests.
diffstat:
ChangeLog | 34 +
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 7 +-
plugin/icedteanp/IcedTeaNPPlugin.cc | 118 +-
plugin/icedteanp/IcedTeaNPPlugin.h | 9 +
tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc | 416 ++++++++++++++
tests/cpp-unit-tests/IcedTeaNPPluginTest.cc | 32 +-
tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 4 +-
tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 33 +
tests/cpp-unit-tests/MemoryLeakDetector.h | 2 +-
tests/cpp-unit-tests/browser_mock.cc | 56 +-
tests/cpp-unit-tests/browser_mock.h | 4 +-
tests/cpp-unit-tests/browser_mock_npidentifier.cc | 117 +++
tests/cpp-unit-tests/browser_mock_npidentifier.h | 57 +
tests/cpp-unit-tests/checked_allocations.h | 6 +-
tests/cpp-unit-tests/main.cc | 27 +-
15 files changed, 835 insertions(+), 87 deletions(-)
diffs (truncated from 1207 to 500 lines):
diff -r 7885b846e290 -r 94ebabfba6ab ChangeLog
--- a/ChangeLog Fri Aug 23 16:03:49 2013 -0400
+++ b/ChangeLog Fri Aug 23 16:35:37 2013 -0400
@@ -1,3 +1,37 @@
+2013-08-23 Adam Domurad <adomurad at redhat.com>
+
+ Spawn Java side during C++ unit tests. Many new tests.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (hasPackage): Minor cleanup.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (initialize_data_directory): New, extracted function.
+ (NP_Initialize): Calls extracted function.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: Expose more functions for
+ testing purposes.
+ * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc
+ (get_scriptable_package_object): Test binding of java package
+ (get_scriptable_java_object): Test binding of java object
+ * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc
+ (NPIdentifierAsString): Update to create npidentifier properly.
+ * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc
+ (getProperty): Test loading java.lang.Integer.MAX_VALUE from C++.
+ * tests/cpp-unit-tests/MemoryLeakDetector.h
+ (reset_global_state): Made public
+ * tests/cpp-unit-tests/checked_allocations.h
+ (SafeAllocator): New, typedef for allocator that avoids leak detection.
+ * tests/cpp-unit-tests/browser_mock.cc
+ (browsermock_setup_functions): Renamed to (browsermock_create_table).
+ (browsermock_create_table): Now returns browser table, additional
+ object release and identifier methods added.
+ * tests/cpp-unit-tests/browser_mock.h: Update for rename.
+ * tests/cpp-unit-tests/main.cc: Now clears state via
+ (reset_global_state)
+ * tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc: New,
+ contains unit tests that cover all of JavaRequestProcessor's methods.
+ * tests/cpp-unit-tests/browser_mock_npidentifier.cc: Allocation-safe
+ npidentifier mocking, adheres to NPAPI spec.
+ * tests/cpp-unit-tests/browser_mock_npidentifier.h: Same.
+
2013-08-23 Adam Domurad <adomurad at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc: Refactor plugin data creation.
diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Aug 23 16:03:49 2013 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Aug 23 16:35:37 2013 -0400
@@ -1279,7 +1279,6 @@
{
JavaResultData* java_result;
JavaRequestProcessor* java_request = new JavaRequestProcessor();
- std::string message = std::string();
std::string plugin_instance_id_str = std::string();
IcedTeaPluginUtilities::itoa(plugin_instance_id, &plugin_instance_id_str);
@@ -1288,11 +1287,9 @@
this->instance = 0; // context is always 0 (needed for java-side backwards compat.)
this->reference = IcedTeaPluginUtilities::getReference();
+ std::string message;
IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &message);
- message.append(" HasPackage ");
- message.append(plugin_instance_id_str);
- message.append(" ");
- message.append(java_result->return_string->c_str());
+ message += " HasPackage " + plugin_instance_id_str + " " + *java_result->return_string;
postAndWaitForResponse(message);
diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:03:49 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 23 16:35:37 2013 -0400
@@ -190,8 +190,6 @@
static pthread_t plugin_request_processor_thread3;
// Static instance helper functions.
-// Have the browser allocate a new ITNPPluginData structure.
-static ITNPPluginData* plugin_data_new ();
// Retrieve the current document's documentbase.
static std::string plugin_get_documentbase (NPP instance);
// Callback used to monitor input pipe status.
@@ -202,16 +200,12 @@
static gboolean plugin_out_pipe_callback (GIOChannel* source,
GIOCondition condition,
gpointer plugin_data);
-static NPError plugin_start_appletviewer (ITNPPluginData* data);
std::string plugin_parameters_string (int argc, char* argn[], char* argv[]);
static void plugin_stop_appletviewer ();
-// Uninitialize ITNPPluginData structure
-static void plugin_data_destroy (NPP instance);
NPError get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len);
NPError get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len);
void consume_message(gchar* message);
-void start_jvm_if_needed();
static void appletviewer_monitor(GPid pid, gint status, gpointer data);
void plugin_send_initialization_message(char* instance, gulong handle,
int width, int height,
@@ -922,7 +916,7 @@
// HELPER FUNCTIONS
-static ITNPPluginData*
+ITNPPluginData*
plugin_data_new ()
{
PLUGIN_DEBUG ("plugin_data_new\n");
@@ -1366,7 +1360,7 @@
return error;
}
-static NPError
+NPError
plugin_start_appletviewer (ITNPPluginData* data)
{
PLUGIN_DEBUG ("plugin_start_appletviewer\n");
@@ -1707,7 +1701,7 @@
PLUGIN_DEBUG ("appletviewer_monitor return\n");
}
-static void
+void
plugin_data_destroy (NPP instance)
{
PLUGIN_DEBUG ("plugin_data_destroy\n");
@@ -1792,6 +1786,61 @@
return true;
}
+// Make sure the plugin data directory exists, creating it if necessary.
+NPError
+initialize_data_directory()
+{
+ const char* tmpdir_env = getenv("TMPDIR");
+ if (tmpdir_env != NULL && g_file_test (tmpdir_env,
+ (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+ {
+ data_directory = tmpdir_env;
+ }
+ else if (g_file_test (P_tmpdir,
+ (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+ {
+ data_directory = P_tmpdir;
+ }
+ else
+ {
+ // If TMPDIR and P_tmpdir do not exist, try /tmp directly
+ data_directory = "/tmp";
+ }
+
+ data_directory += "/icedteaplugin-";
+ if (getenv("USER") != NULL)
+ data_directory += getenv("USER");
+
+ // Now create a icedteaplugin subdir
+ if (!g_file_test (data_directory.c_str(),
+ (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+ {
+ int file_error = 0;
+
+ file_error = g_mkdir (data_directory.c_str(), 0700);
+ if (file_error != 0)
+ {
+ PLUGIN_ERROR_THREE ("Failed to create data directory",
+ data_directory.c_str(),
+ strerror (errno));
+ return NPERR_GENERIC_ERROR;
+ }
+ }
+
+
+ // If data directory doesn't exist by this point, bail
+ if (!g_file_test (data_directory.c_str(),
+ (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+ {
+ PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
+ data_directory.c_str(),
+ strerror (errno));
+ return NPERR_GENERIC_ERROR;
+ }
+
+ return NPERR_NO_ERROR;
+}
+
// FACTORY FUNCTIONS
// Provides the browser with pointers to the plugin functions that we
@@ -1860,56 +1909,7 @@
NPError np_error = NPERR_NO_ERROR;
- // Make sure the plugin data directory exists, creating it if
- // necessary.
-
- const char* tmpdir_env = getenv("TMPDIR");
- if (tmpdir_env != NULL && g_file_test (tmpdir_env,
- (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
- {
- data_directory = tmpdir_env;
- }
- else if (g_file_test (P_tmpdir,
- (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
- {
- data_directory = P_tmpdir;
- }
- else
- {
- // If TMPDIR and P_tmpdir do not exist, try /tmp directly
- data_directory = "/tmp";
- }
-
- data_directory += "/icedteaplugin-";
- if (getenv("USER") != NULL)
- data_directory += getenv("USER");
-
- // Now create a icedteaplugin subdir
- if (!g_file_test (data_directory.c_str(),
- (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
- {
- int file_error = 0;
-
- file_error = g_mkdir (data_directory.c_str(), 0700);
- if (file_error != 0)
- {
- PLUGIN_ERROR_THREE ("Failed to create data directory",
- data_directory.c_str(),
- strerror (errno));
- return NPERR_GENERIC_ERROR;
- }
- }
-
-
- // If data directory doesn't exist by this point, bail
- if (!g_file_test (data_directory.c_str(),
- (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
- {
- PLUGIN_ERROR_THREE ("Temp directory does not exist: ",
- data_directory.c_str(),
- strerror (errno));
- return NPERR_GENERIC_ERROR;
- }
+ initialize_data_directory();
// Set appletviewer_executable.
PLUGIN_DEBUG("Executing java at %s\n", get_plugin_executable().c_str());
diff -r 7885b846e290 -r 94ebabfba6ab plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Fri Aug 23 16:03:49 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h Fri Aug 23 16:35:37 2013 -0400
@@ -99,6 +99,13 @@
}
};
+// Have the browser allocate a new ITNPPluginData structure.
+ITNPPluginData* plugin_data_new ();
+void plugin_data_destroy (NPP instance);
+
+NPError initialize_data_directory();
+void start_jvm_if_needed();
+
// Condition on which the queue processor waits
extern pthread_cond_t cond_message_available;
@@ -144,4 +151,6 @@
/* Creates a new scriptable plugin object and returns it */
NPObject* allocate_scriptable_object(NPP npp, NPClass *aClass);
+NPError plugin_start_appletviewer (ITNPPluginData* data);
+
#endif /* __ICEDTEANPPLUGIN_H__ */
diff -r 7885b846e290 -r 94ebabfba6ab tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/cpp-unit-tests/IcedTeaJavaRequestProcessorTest.cc Fri Aug 23 16:35:37 2013 -0400
@@ -0,0 +1,416 @@
+/* Copyright (C) 2013 Red Hat
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ IcedTea is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version. */
+
+#include <cstdio>
+
+#include <vector>
+#include <string>
+
+#include <npapi.h>
+
+#include <UnitTest++.h>
+
+#include "MemoryLeakDetector.h"
+
+#include "IcedTeaJavaRequestProcessor.h"
+
+/******************************************************************************
+ * Simple helper methods to keep the tests clean. *
+ ******************************************************************************/
+
+static const char* TEST_SOURCE = "[System]";
+
+static std::string checked_return(JavaResultData* result) {
+ CHECK(!result->error_occurred);
+ return *result->return_string;
+}
+
+// Packages
+
+static bool jrp_has_package(std::string package_name) {
+ JavaRequestProcessor processor;
+ JavaResultData* result = processor.hasPackage(0, package_name);
+ CHECK(!result->error_occurred);
+ return (result->return_identifier != 0);
+}
+
+// Classes
+
+static std::string jrp_find_class(std::string name) {
+ return checked_return(
+ JavaRequestProcessor().findClass(0, name)
+ );
+}
+
+// Object creation
+
+static std::string jrp_new_object_with_constructor(std::string class_id,
+ std::string method_id,
+ std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().newObjectWithConstructor(TEST_SOURCE,
+ class_id, method_id, args)
+ );
+}
+
+static std::string jrp_new_array(std::string class_id, std::string len) {
+ return checked_return(
+ JavaRequestProcessor().newArray(class_id, len)
+ );
+}
+
+static std::string jrp_new_string(std::string str) {
+ return checked_return(
+ JavaRequestProcessor().newString(str)
+ );
+}
+
+static std::string jrp_new_object(std::string class_id,
+ std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().newObject(TEST_SOURCE, class_id, args)
+ );
+}
+
+static std::string jrp_get_value(std::string object_id) {
+ return checked_return(
+ JavaRequestProcessor().getValue(object_id)
+ );
+}
+
+// Inheritance
+
+static bool jrp_is_instance_of(std::string object_id, std::string class_id) {
+ JavaRequestProcessor processor;
+ JavaResultData* result = processor.isInstanceOf(object_id, class_id);
+
+ CHECK(!result->error_occurred);
+ return (result->return_identifier != 0);
+}
+
+
+// Java methods operations.
+
+static std::string jrp_get_method_id(std::string class_id,
+ std::string method_name,
+ std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().getMethodID(class_id,
+ browser_functions.getstringidentifier(method_name.c_str()), args)
+ );
+}
+
+static std::string jrp_get_static_method_id(std::string class_id,
+ std::string method_name,
+ std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().getStaticMethodID(class_id,
+ browser_functions.getstringidentifier(method_name.c_str()), args)
+ );
+}
+
+static std::string jrp_call_method(std::string object_id,
+ std::string method_name, std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().callMethod(TEST_SOURCE, object_id,
+ method_name, args)
+ );
+}
+
+static std::string jrp_call_static_method(std::string class_id,
+ std::string method_name, std::vector<std::string> args = std::vector<std::string>()) {
+ return checked_return(
+ JavaRequestProcessor().callStaticMethod(TEST_SOURCE, class_id,
+ method_name, args)
+ );
+}
+
+static std::string jrp_get_string(std::string object_id) {
+ return checked_return(
+ JavaRequestProcessor().getString(object_id)
+ );
+}
+
+static std::string jrp_get_class_id(std::string object_id) {
+ return checked_return(
+ JavaRequestProcessor().getClassID(object_id)
+ );
+}
+
+
+// Java field operations.
+
+static std::string jrp_get_field(std::string object_id,
+ std::string field_name) {
+ return checked_return(
+ JavaRequestProcessor().getField(TEST_SOURCE,
+ jrp_get_class_id(object_id), object_id, field_name)
+ );
+}
+
+static std::string jrp_get_field_id(std::string class_id,
+ std::string field_name) {
+ return checked_return(
+ JavaRequestProcessor().getFieldID(class_id, field_name)
+ );
+}
+
+static std::string jrp_get_static_field_id(std::string class_id,
+ std::string field_name) {
+ return checked_return(
+ JavaRequestProcessor().getStaticFieldID(class_id, field_name)
+ );
+}
+
+static std::string jrp_get_static_field(std::string class_id,
+ std::string field_name) {
+ return checked_return(
+ JavaRequestProcessor().getStaticField(TEST_SOURCE, class_id, field_name)
+ );
+}
+
+static std::string jrp_set_field(std::string object_id, std::string field_name,
+ std::string value_id) {
+ return checked_return(
+ JavaRequestProcessor().setField(TEST_SOURCE,
+ jrp_get_class_id(object_id), object_id, field_name, value_id)
+ );
+}
+
+static std::string jrp_set_static_field(std::string class_id, std::string field_name,
+ std::string value_id) {
+ return checked_return(
+ JavaRequestProcessor().setStaticField(TEST_SOURCE, class_id, field_name, value_id)
+ );
+}
+
+// Java array operations.
+
+static std::string jrp_set_slot(std::string object_id, std::string index,
+ std::string value_id) {
+ return checked_return(
+ JavaRequestProcessor().setSlot(object_id, index, value_id)
+ );
+}
+
+static std::string jrp_get_slot(std::string object_id, std::string index) {
+ return checked_return(
More information about the distro-pkg-dev
mailing list