DanielWagnerHall: Reflecting r13175 in IEDriver, fixing a bug with te…

…xt getting that I'm not sure how it wasn't exposed before r13179
kostyukdg · Aug 2, 2011 · 6a17b41 · 6a17b41
1 parent 253cc7c
commit 6a17b41
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 55 deletions.
diff --git a/cpp/IEDriver/CommandHandlers/GetAlertTextCommandHandler.h b/cpp/IEDriver/CommandHandlers/GetAlertTextCommandHandler.h
@@ -49,16 +49,17 @@ class GetAlertTextCommandHandler : public IECommandHandler {
 				}
 			}
 
+      std::string alert_text_value;
 			if (label_handle == NULL) {
-				response->SetErrorResponse(EUNHANDLEDERROR, "Could not find text");
+				alert_text_value = "";
 			} else {
 				int text_length = ::GetWindowTextLength(label_handle);
 				std::vector<wchar_t> text_buffer(text_length + 1);
 				::GetWindowText(label_handle, &text_buffer[0], text_length + 1);
 				std::wstring alert_text = &text_buffer[0];
-				std::string alert_text_value = CW2A(alert_text.c_str(), CP_UTF8);
-				response->SetSuccessResponse(alert_text_value);
+				alert_text_value = CW2A(alert_text.c_str(), CP_UTF8);
 			}
+      response->SetSuccessResponse(alert_text_value);
 		}
 	}
 

diff --git a/cpp/IEDriver/CommandHandlers/SwitchToAlertCommandHandler.h b/cpp/IEDriver/CommandHandlers/SwitchToAlertCommandHandler.h
diff --git a/cpp/IEDriver/IECommandExecutor.cpp b/cpp/IEDriver/IECommandExecutor.cpp
@@ -64,7 +64,6 @@
 #include "CommandHandlers/SetAsyncScriptTimeoutCommandHandler.h"
 #include "CommandHandlers/SetImplicitWaitTimeoutCommandHandler.h"
 #include "CommandHandlers/SubmitElementCommandHandler.h"
-#include "CommandHandlers/SwitchToAlertCommandHandler.h"
 #include "CommandHandlers/SwitchToFrameCommandHandler.h"
 #include "CommandHandlers/SwitchToWindowCommandHandler.h"
 
@@ -462,7 +461,6 @@ void IECommandExecutor::PopulateCommandHandlers() {
 	this->command_handlers_[DeleteAllCookies] = CommandHandlerHandle(new DeleteAllCookiesCommandHandler);
 	this->command_handlers_[Screenshot] = CommandHandlerHandle(new ScreenshotCommandHandler);
 
-	this->command_handlers_[SwitchToAlert] = CommandHandlerHandle(new SwitchToAlertCommandHandler);
 	this->command_handlers_[AcceptAlert] = CommandHandlerHandle(new AcceptAlertCommandHandler);
 	this->command_handlers_[DismissAlert] = CommandHandlerHandle(new DismissAlertCommandHandler);
 	this->command_handlers_[GetAlertText] = CommandHandlerHandle(new GetAlertTextCommandHandler);

diff --git a/cpp/webdriver-server/command_types.h b/cpp/webdriver-server/command_types.h
@@ -70,7 +70,6 @@ enum CommandType {
   GetOrientation,
   SetOrientation,
 
-  SwitchToAlert,
   AcceptAlert,
   DismissAlert,
   GetAlertText,

diff --git a/cpp/webdriver-server/server.cc b/cpp/webdriver-server/server.cc
@@ -495,7 +495,6 @@ void Server::PopulateCommandRepository() {
   this->commands_["/session/:sessionid/orientation"]["GET"] = GetOrientation;
   this->commands_["/session/:sessionid/orientation"]["POST"] = SetOrientation;
 
-  this->commands_["/session/:sessionid/alert"]["GET"] = SwitchToAlert;
   this->commands_["/session/:sessionid/accept_alert"]["POST"] = AcceptAlert;
   this->commands_["/session/:sessionid/dismiss_alert"]["POST"] = DismissAlert;
   this->commands_["/session/:sessionid/alert_text"]["GET"] = GetAlertText;

diff --git a/java/client/test/org/openqa/selenium/SingleTestSuite.java b/java/client/test/org/openqa/selenium/SingleTestSuite.java
@@ -59,7 +59,7 @@ public class SingleTestSuite extends TestCase {
       }};
 
   public static Test suite() throws Exception {
-    String driver = FIREFOX_TEST;
+    String driver = IE;
 
     System.setProperty("jna.library.path", "..\\build;build");
     System.setProperty("webdriver.selenium.server.port", String.valueOf(findFreePort()));