summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/delete_chrome_history_test.cc2
-rw-r--r--chrome_frame/test/mock_ie_event_sink_actions.h6
-rw-r--r--chrome_frame/test/mock_ie_event_sink_test.h4
-rw-r--r--chrome_frame/test/navigation_test.cc6
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc4
-rw-r--r--chrome_frame/test/test_with_web_server.cc2
-rw-r--r--chrome_frame/test/ui_test.cc13
-rw-r--r--chrome_frame/test/win_event_receiver.cc29
-rw-r--r--chrome_frame/test/win_event_receiver.h18
9 files changed, 58 insertions, 26 deletions
diff --git a/chrome_frame/test/delete_chrome_history_test.cc b/chrome_frame/test/delete_chrome_history_test.cc
index 48bf367..035e2ab 100644
--- a/chrome_frame/test/delete_chrome_history_test.cc
+++ b/chrome_frame/test/delete_chrome_history_test.cc
@@ -177,7 +177,7 @@ TEST_F(DeleteBrowsingHistoryTest, DISABLED_CFDeleteBrowsingHistory) {
PageLoadHelper load_helper3(&ie_mock3_);
delete_browsing_history_window_observer_mock_.WatchWindow(
- "Delete Browsing History");
+ "Delete Browsing History", "");
// For some reason, this page is occasionally being cached, so we randomize
// its name to ensure that, at least the first time we request it, it is
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 830ded7..33d55b9 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -219,8 +219,8 @@ ACTION_P2(PostCharMessagesToRenderer, mock, character_codes) {
::PostMessage(window, WM_CHAR, codes[i], 0);
}
-ACTION_P2(WatchWindow, mock, window_class) {
- mock->WatchWindow(window_class);
+ACTION_P3(WatchWindow, mock, caption, window_class) {
+ mock->WatchWindow(caption, window_class);
}
ACTION_P(StopWindowWatching, mock) {
@@ -244,7 +244,7 @@ ACTION_P2(WatchRendererProcess, mock_observer, mock) {
namespace { // NOLINT
void DoCloseWindowNow(HWND hwnd) {
- ::PostMessage(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0);
+ ::PostMessage(hwnd, WM_CLOSE, 0, 0);
}
} // namespace
diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h
index 898d14e..7e48137 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.h
+++ b/chrome_frame/test/mock_ie_event_sink_test.h
@@ -252,8 +252,8 @@ class MockWindowObserver : public WindowObserver {
MOCK_METHOD1(OnWindowOpen, void (HWND hwnd)); // NOLINT
MOCK_METHOD1(OnWindowClose, void (HWND hwnd)); // NOLINT
- void WatchWindow(std::string caption_pattern) {
- window_watcher_.AddObserver(this, caption_pattern);
+ void WatchWindow(std::string caption_pattern, std::string class_pattern) {
+ window_watcher_.AddObserver(this, caption_pattern, class_pattern);
}
private:
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index c1c2e7e..f11f3e6 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -308,7 +308,7 @@ TEST_P(FullTabNavigationTest, FLAKY_RestrictedSite) {
testing::Field(&VARIANT::bstrVal, testing::StrCaseEq(GetSimplePageUrl())),
_, _, _, _, _))
.Times(1)
- .WillOnce(WatchWindow(&win_observer_mock, kAlertDlgCaption));
+ .WillOnce(WatchWindow(&win_observer_mock, kAlertDlgCaption, ""));
if (patch_method == PATCH_METHOD_INET_PROTOCOL) {
EXPECT_CALL(ie_mock_, OnBeforeNavigate2(
@@ -742,10 +742,10 @@ void CloseWindow(HWND* window) {
// and validate that all is well.
TEST_F(FullTabDownloadTest, CF_DownloadFileFromPost) {
chrome_frame_test::MockWindowObserver download_watcher;
- download_watcher.WatchWindow("File Download");
+ download_watcher.WatchWindow("File Download", "");
chrome_frame_test::MockWindowObserver save_dialog_watcher;
- save_dialog_watcher.WatchWindow("Save As");
+ save_dialog_watcher.WatchWindow("Save As", "");
EXPECT_CALL(server_mock_, Get(_, StrEq(L"/post_source.html"), _)).WillOnce(
SendFast(
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index f81c211..8572f34 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -320,6 +320,7 @@ void CFUrlRequestUnittestRunner::Initialize() {
void CFUrlRequestUnittestRunner::Shutdown() {
DCHECK(::GetCurrentThreadId() == test_thread_id_);
NetTestSuite::Shutdown();
+ OleUninitialize();
}
void CFUrlRequestUnittestRunner::OnConnectAutomationProviderToChannel(
@@ -342,6 +343,7 @@ void CFUrlRequestUnittestRunner::OnInitialTabLoaded() {
void CFUrlRequestUnittestRunner::RunMainUIThread() {
DCHECK(MessageLoop::current());
DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
+ OleInitialize(NULL);
MessageLoop::current()->Run();
}
@@ -473,7 +475,7 @@ int main(int argc, char** argv) {
WindowWatchdog watchdog;
// See url_request_unittest.cc for these credentials.
SupplyProxyCredentials credentials("user", "secret");
- watchdog.AddObserver(&credentials, "Windows Security");
+ watchdog.AddObserver(&credentials, "Windows Security", "");
testing::InitGoogleTest(&argc, argv);
FilterDisabledTests();
PluginService::EnableChromePlugins(false);
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 1174cab..35784a4 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -1120,7 +1120,7 @@ TEST_F(ChromeFrameTestWithWebServer, FAILS_FullTabModeIE_RefreshMshtmlTest) {
// See bug 36694 for details. http://crbug.com/36694
TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {
chrome_frame_test::MockWindowObserver win_observer_mock;
- win_observer_mock.WatchWindow("File Download");
+ win_observer_mock.WatchWindow("File Download", "");
// The content of our HTML test page. This will be returned whenever
// we reply to a GET request.
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 44353e1..28398cd 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -116,7 +116,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlN) {
const char* kNewWindowTitlePattern = "*Internet Explorer*";
EXPECT_CALL(ie_mock_, OnLoad(is_cf, StrEq(GetSimplePageUrl())))
.WillOnce(testing::DoAll(
- WatchWindow(&win_observer_mock, kNewWindowTitlePattern),
+ WatchWindow(&win_observer_mock, kNewWindowTitlePattern, ""),
SetFocusToRenderer(&ie_mock_),
DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL)));
@@ -145,7 +145,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlF) {
const char* kFindDialogCaption = "Find";
EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(GetSimplePageUrl())))
.WillOnce(testing::DoAll(
- WatchWindow(&win_observer_mock, kFindDialogCaption),
+ WatchWindow(&win_observer_mock, kFindDialogCaption, ""),
SetFocusToRenderer(&ie_mock_),
DelaySendChar(&loop_, 1500, 'f', simulate_input::CONTROL)));
@@ -366,7 +366,7 @@ class ContextMenuTest : public MockIEEventSinkTest, public testing::Test {
const char* kSaveDlgCaption = "Save As";
EXPECT_CALL(acc_observer_, OnAccDocLoad(_))
.WillOnce(testing::DoAll(
- WatchWindow(&win_observer_mock, kSaveDlgCaption),
+ WatchWindow(&win_observer_mock, kSaveDlgCaption, ""),
AccRightClick(AccObjectMatcher(L"", role))));
EXPECT_CALL(acc_observer_, OnMenuPopup(_))
.WillOnce(AccLeftClick(AccObjectMatcher(menu_item_name)));
@@ -454,18 +454,19 @@ TEST_F(ContextMenuTest, CFPageInfo) {
InSequence expect_in_sequence_for_scope;
// View page information.
- const char* kPageInfoCaption = "Security Information";
EXPECT_CALL(acc_observer_, OnAccDocLoad(_))
.WillOnce(testing::DoAll(
- WatchWindow(&win_observer_mock, kPageInfoCaption),
+ WatchWindow(&win_observer_mock, "", "Chrome_WidgetWin_*"),
OpenContextMenuAsync()));
EXPECT_CALL(acc_observer_, OnMenuPopup(_))
.WillOnce(AccLeftClick(AccObjectMatcher(L"View page info")));
+ EXPECT_CALL(win_observer_mock, OnWindowOpen(_)).Times(1);
// Expect page info dialog to pop up. Dismiss the dialog with 'Esc' key
EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
.WillOnce(DoCloseWindow());
+ EXPECT_CALL(win_observer_mock, OnWindowClose(_)).Times(1);
EXPECT_CALL(win_observer_mock, OnWindowClose(_))
.WillOnce(CloseBrowserMock(&ie_mock_));
@@ -483,7 +484,7 @@ TEST_F(ContextMenuTest, CFInspector) {
const char* kPageInfoCaptionPattern = "Untitled*";
EXPECT_CALL(acc_observer_, OnAccDocLoad(_))
.WillOnce(testing::DoAll(
- WatchWindow(&win_observer_mock, kPageInfoCaptionPattern),
+ WatchWindow(&win_observer_mock, kPageInfoCaptionPattern, ""),
OpenContextMenuAsync()));
EXPECT_CALL(acc_observer_, OnMenuPopup(_))
.WillOnce(AccLeftClick(AccObjectMatcher(L"Inspect element")));
diff --git a/chrome_frame/test/win_event_receiver.cc b/chrome_frame/test/win_event_receiver.cc
index c3ae0b3..b05d807 100644
--- a/chrome_frame/test/win_event_receiver.cc
+++ b/chrome_frame/test/win_event_receiver.cc
@@ -136,7 +136,8 @@ void WindowWatchdog::ProcessExitObserver::OnObjectSignaled(
WindowWatchdog::WindowWatchdog() {}
void WindowWatchdog::AddObserver(WindowObserver* observer,
- const std::string& caption_pattern) {
+ const std::string& caption_pattern,
+ const std::string& class_name_pattern) {
if (observers_.empty()) {
// SetListenerForEvents takes an event_min and event_max.
// EVENT_OBJECT_DESTROY, EVENT_OBJECT_SHOW, and EVENT_OBJECT_HIDE are
@@ -149,6 +150,7 @@ void WindowWatchdog::AddObserver(WindowObserver* observer,
ObserverEntry new_entry = {
observer,
caption_pattern,
+ class_name_pattern,
OpenWindowList() };
observers_.push_back(new_entry);
@@ -172,8 +174,28 @@ std::string WindowWatchdog::GetWindowCaption(HWND hwnd) {
return caption;
}
+bool WindowWatchdog::MatchingWindow(const ObserverEntry& entry,
+ const std::string& caption,
+ const std::string& class_name) {
+ bool should_match_caption = !entry.caption_pattern.empty();
+ bool should_match_class = !entry.class_name_pattern.empty();
+
+ if (should_match_caption &&
+ MatchPattern(caption, entry.caption_pattern) &&
+ !should_match_class) {
+ return true;
+ }
+ if (should_match_class &&
+ MatchPattern(class_name, entry.class_name_pattern)) {
+ return true;
+ }
+ return false;
+}
+
void WindowWatchdog::HandleOnOpen(HWND hwnd) {
std::string caption = GetWindowCaption(hwnd);
+ char class_name[MAX_PATH] = {0};
+ GetClassNameA(hwnd, class_name, arraysize(class_name));
// Instantiated only if there is at least one interested observer. Each
// interested observer will maintain a reference to this object, such that it
@@ -185,7 +207,7 @@ void WindowWatchdog::HandleOnOpen(HWND hwnd) {
ObserverEntryList interested_observers;
for (ObserverEntryList::iterator entry_iter = observers_.begin();
entry_iter != observers_.end(); ++entry_iter) {
- if (MatchPattern(caption, entry_iter->caption_pattern)) {
+ if (MatchingWindow(*entry_iter, caption, class_name)) {
if (process_exit_observer == NULL) {
process_exit_observer.reset(new ProcessExitObserver(this, hwnd));
}
@@ -240,9 +262,6 @@ void WindowWatchdog::OnEventReceived(
// We need to look for top level windows and a natural check is for
// WS_CHILD. Instead, checking for WS_CAPTION allows us to filter
// out other stray popups
- if (!WS_CAPTION & GetWindowLong(hwnd, GWL_STYLE)) {
- return;
- }
if (event == EVENT_OBJECT_SHOW) {
HandleOnOpen(hwnd);
} else {
diff --git a/chrome_frame/test/win_event_receiver.h b/chrome_frame/test/win_event_receiver.h
index d91f268..7a191e50 100644
--- a/chrome_frame/test/win_event_receiver.h
+++ b/chrome_frame/test/win_event_receiver.h
@@ -87,11 +87,14 @@ class WindowWatchdog : public WinEventListener {
public:
WindowWatchdog();
// Register |observer| to be notified when windows matching |caption_pattern|
- // are opened or closed. A single observer may be registered multiple times.
- // If a single window caption matches multiple registrations of a single
- // observer, the observer will be notified once per matching registration.
+ // and/or |class_name_pattern| are opened or closed. A single observer may be
+ // registered multiple times.
+ // If a single window caption and/or class name matches multiple
+ // registrations of a single observer, the observer will be notified once per
+ // matching registration.
void AddObserver(WindowObserver* observer,
- const std::string& caption_pattern);
+ const std::string& caption_pattern,
+ const std::string& class_name_pattern);
// Remove all registrations of |observer|. The |observer| will not be notified
// during or after this call.
@@ -110,6 +113,7 @@ class WindowWatchdog : public WinEventListener {
struct ObserverEntry {
WindowObserver* observer;
std::string caption_pattern;
+ std::string class_name_pattern;
OpenWindowList open_windows;
};
@@ -125,6 +129,12 @@ class WindowWatchdog : public WinEventListener {
void HandleOnClose(HWND hwnd);
void OnHwndProcessExited(HWND hwnd);
+ // Returns true if the caption pattern and/or the class name pattern in the
+ // observer entry structure matches the caption and/or class name passed in.
+ bool MatchingWindow(const ObserverEntry& entry,
+ const std::string& caption,
+ const std::string& class_name);
+
ObserverEntryList observers_;
WinEventReceiver win_event_receiver_;
generated by cgit v1.1 at 2025-02-25 00:33:16 +0000