diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript.ui_tests | 1 | ||||
| -rw-r--r-- | chrome/test/data/npapi/execute_script_delete_in_mouse_move.html | 39 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 2 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui.vcproj | 16 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/npapi_interactive_test.cc | 78 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_test_helper.cc | 61 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_test_helper.h | 48 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cpp | 42 | ||||
| -rw-r--r-- | chrome/test/ui/ui_tests.vcproj | 8 |
9 files changed, 255 insertions, 40 deletions
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 0c587b1..0443a4d 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -129,6 +129,7 @@ ui_test_files = [ 'test/ui/ui_test.cc', 'test/ui/ui_test_suite.cc', 'test/ui/history_uitest.cc', + 'test/ui/npapi_test_helper.cc', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', ] diff --git a/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html b/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html new file mode 100644 index 0000000..a82cde7 --- /dev/null +++ b/chrome/test/data/npapi/execute_script_delete_in_mouse_move.html @@ -0,0 +1,39 @@ +<html> + +<head> +<script src="npapi.js"></script> + +<script> +function DeletePluginWithinScript() { + var plugin_div = document.getElementById("PluginDiv"); + plugin_div.innerHTML = "Object Deleted"; + onSuccess("execute_script_delete_in_mouse_move", 1); +} +</script> +</head> + +<body> +<div id="statusPanel" style="border: 1px solid red; width: 100%"> +Test running.... +</div> + + +NPObject Proxy Test<p> + +Tests the case where a plugin instance is deleted in the context +of a synchronous mouse event. + +<DIV ID=PluginDiv> +<embed type="application/vnd.npapi-test" + src="foo" + name="execute_script_delete_in_mouse_move" + id="1" + mode="np_embed" +> +</DIV> +<script> + var height = document.body.offsetHeight; +</script> + +</body> +</html> diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript index 3e79dde..603a25a 100644 --- a/chrome/test/interactive_ui/SConscript +++ b/chrome/test/interactive_ui/SConscript @@ -79,6 +79,8 @@ input_files = [ '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', '$CHROME_DIR/test/test_file_util$OBJSUFFIX', 'view_event_test_base.cc', + '$CHROME_DIR/test/ui/npapi_test_helper.cc', + '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', ] exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files) diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj index adb9663..4d96759 100644 --- a/chrome/test/interactive_ui/interactive_ui.vcproj +++ b/chrome/test/interactive_ui/interactive_ui.vcproj @@ -143,6 +143,14 @@ Name="Common" > <File + RelativePath="..\ui\npapi_test_helper.cc" + > + </File> + <File + RelativePath="..\ui\npapi_test_helper.h" + > + </File> + <File RelativePath="..\..\tools\build\win\precompiled_wtl.cc" > <FileConfiguration @@ -231,6 +239,14 @@ > </File> </Filter> + <Filter + Name="TestNPAPI" + > + <File + RelativePath=".\npapi_interactive_test.cc" + > + </File> + </Filter> </Files> <Globals> </Globals> diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc new file mode 100644 index 0000000..62b30f4 --- /dev/null +++ b/chrome/test/interactive_ui/npapi_interactive_test.cc @@ -0,0 +1,78 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// +// NPAPI interactive UI tests. +// + +#include "base/file_util.h" +#include "chrome/common/chrome_paths.h" +#include "chrome/test/automation/tab_proxy.h" +#include "chrome/test/ui/npapi_test_helper.h" +#include "net/base/net_util.h" + +const char kTestCompleteCookie[] = "status"; +const char kTestCompleteSuccess[] = "OK"; +const int kShortWaitTimeout = 5 * 1000; + +// Tests if a plugin executing a self deleting script in the context of +// a synchronous mousemove works correctly +TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) { + if (!UITest::in_process_plugins() && !UITest::in_process_renderer()) { + scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); + HWND tab_window = NULL; + tab_proxy->GetHWND(&tab_window); + + EXPECT_TRUE(IsWindow(tab_window)); + + show_window_ = true; + std::wstring test_case = L"execute_script_delete_in_mouse_move.html"; + GURL url = GetTestUrl(L"npapi", test_case); + NavigateToURL(url); + + POINT cursor_position = {130, 130}; + ClientToScreen(tab_window, &cursor_position); + + double screen_width = ::GetSystemMetrics( SM_CXSCREEN ) - 1; + double screen_height = ::GetSystemMetrics( SM_CYSCREEN ) - 1; + double location_x = cursor_position.x * (65535.0f / screen_width); + double location_y = cursor_position.y * (65535.0f / screen_height); + + INPUT input_info = {0}; + input_info.type = INPUT_MOUSE; + input_info.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input_info.mi.dx = static_cast<long>(location_x); + input_info.mi.dy = static_cast<long>(location_y); + ::SendInput(1, &input_info, sizeof(INPUT)); + + WaitForFinish("execute_script_delete_in_mouse_move", "1", url, + kTestCompleteCookie, kTestCompleteSuccess, + kShortWaitTimeout); + } +} diff --git a/chrome/test/ui/npapi_test_helper.cc b/chrome/test/ui/npapi_test_helper.cc new file mode 100644 index 0000000..83e3c5b --- /dev/null +++ b/chrome/test/ui/npapi_test_helper.cc @@ -0,0 +1,61 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// NPAPI test helper classes. + +#include "chrome/test/ui/npapi_test_helper.h" + +NPAPITester::NPAPITester() + : UITest() { +} + +void NPAPITester::SetUp() { + // We need to copy our test-plugin into the plugins directory so that + // the browser can load it. + std::wstring plugins_directory = browser_directory_ + L"\\plugins"; + std::wstring plugin_src = browser_directory_ + L"\\npapi_test_plugin.dll"; + plugin_dll_ = plugins_directory + L"\\npapi_test_plugin.dll"; + + CreateDirectory(plugins_directory.c_str(), NULL); + CopyFile(plugin_src.c_str(), plugin_dll_.c_str(), FALSE); + + UITest::SetUp(); +} + +void NPAPITester::TearDown() { + DeleteFile(plugin_dll_.c_str()); + UITest::TearDown(); +} + + +// NPAPIVisiblePluginTester members. +void NPAPIVisiblePluginTester::SetUp() { + show_window_ = true; + NPAPITester::SetUp(); +} diff --git a/chrome/test/ui/npapi_test_helper.h b/chrome/test/ui/npapi_test_helper.h new file mode 100644 index 0000000..26f4c67 --- /dev/null +++ b/chrome/test/ui/npapi_test_helper.h @@ -0,0 +1,48 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "chrome/test/ui/ui_test.h" + +// Helper class for NPAPI plugin UI tests. +class NPAPITester : public UITest { + protected: + NPAPITester(); + virtual void SetUp(); + virtual void TearDown(); + +private: + std::wstring plugin_dll_; +}; + +// Helper class for NPAPI plugin UI tests, which need the browser window +// to be visible. +class NPAPIVisiblePluginTester : public NPAPITester { + protected: + virtual void SetUp(); +}; diff --git a/chrome/test/ui/npapi_uitest.cpp b/chrome/test/ui/npapi_uitest.cpp index bce1497..2657220 100644 --- a/chrome/test/ui/npapi_uitest.cpp +++ b/chrome/test/ui/npapi_uitest.cpp @@ -48,7 +48,7 @@ #include "base/file_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/automation/tab_proxy.h" -#include "chrome/test/ui/ui_test.h" +#include "chrome/test/ui/npapi_test_helper.h" #include "net/base/net_util.h" const char kTestCompleteCookie[] = "status"; @@ -66,44 +66,6 @@ std::ostream& operator<<(std::ostream& out, const CComBSTR &str) return out << szFinal; } -class NPAPITester : public UITest { - protected: - NPAPITester() : UITest() - { - } - - virtual void SetUp() - { - // We need to copy our test-plugin into the plugins directory so that - // the browser can load it. - std::wstring plugins_directory = browser_directory_ + L"\\plugins"; - std::wstring plugin_src = browser_directory_ + L"\\npapi_test_plugin.dll"; - plugin_dll_ = plugins_directory + L"\\npapi_test_plugin.dll"; - - CreateDirectory(plugins_directory.c_str(), NULL); - CopyFile(plugin_src.c_str(), plugin_dll_.c_str(), FALSE); - - UITest::SetUp(); - } - - virtual void TearDown() - { - DeleteFile(plugin_dll_.c_str()); - UITest::TearDown(); - } - -private: - std::wstring plugin_dll_; -}; - -class NPAPIVisiblePluginTester : public NPAPITester { - protected: - virtual void SetUp() { - show_window_ = true; - NPAPITester::SetUp(); - } -}; - // Test passing arguments to a plugin. TEST_F(NPAPITester, Arguments) { std::wstring test_case = L"arguments.html"; @@ -279,4 +241,4 @@ TEST_F(NPAPIVisiblePluginTester, OpenPopupWindowWithPlugin) { WaitForFinish("plugin_popup_with_plugin_target", "1", url, kTestCompleteCookie, kTestCompleteSuccess, kShortWaitTimeout); -}
\ No newline at end of file +} diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj index f89d52d..5bfe40e 100644 --- a/chrome/test/ui/ui_tests.vcproj +++ b/chrome/test/ui/ui_tests.vcproj @@ -146,6 +146,14 @@ Name="Common" > <File + RelativePath=".\npapi_test_helper.cc" + > + </File> + <File + RelativePath=".\npapi_test_helper.h" + > + </File> + <File RelativePath="..\..\tools\build\win\precompiled_wtl.cc" > <FileConfiguration |