Skip to content

Commit 88fa5ba

Browse files
shs96cshs96c
committed
Normalise window and alert handling commands
The W3C and OSS webdriver wire protocols just have different end points. These are easy to migrate to the newer processing model.
1 parent d725150 commit 88fa5ba

File tree

5 files changed

+10
-60
lines changed

5 files changed

+10
-60
lines changed

‎java/client/src/org/openqa/selenium/remote/DriverCommand.java

-7
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public interface DriverCommand {
5858

5959
String GET_CURRENT_WINDOW_HANDLE = "getCurrentWindowHandle";
6060
String GET_WINDOW_HANDLES = "getWindowHandles";
61-
String GET_WINDOW_HANDLES_W3C = "getWindowHandlesW3C";
62-
String GET_CURRENT_WINDOW_HANDLE_W3C = "getCurrentWindowHandleW3C";
6361

6462
String GET_CURRENT_CONTEXT_HANDLE = "getCurrentContextHandle";
6563
String GET_CONTEXT_HANDLES = "getContextHandles";
@@ -102,11 +100,6 @@ public interface DriverCommand {
102100
String SET_ALERT_VALUE = "setAlertValue";
103101
String SET_ALERT_CREDENTIALS = "setAlertCredentials";
104102

105-
String ACCEPT_ALERT_W3C = "acceptAlertW3C";
106-
String DISMISS_ALERT_W3C = "dimissAlertW3C";
107-
String GET_ALERT_TEXT_W3C = "getAlertTextW3C";
108-
String SET_ALERT_VALUE_W3C = "setAlertValueW3C";
109-
110103
String SET_TIMEOUT = "setTimeout";
111104
String IMPLICITLY_WAIT = "implicitlyWait";
112105
String SET_SCRIPT_TIMEOUT = "setScriptTimeout";

‎java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

+4-27
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,7 @@ public void quit() {
538538

539539
@SuppressWarnings({"unchecked"})
540540
public Set<String> getWindowHandles() {
541-
Response response;
542-
if (getW3CStandardComplianceLevel() > 0) {
543-
response = execute(DriverCommand.GET_WINDOW_HANDLES_W3C);
544-
} else {
545-
response = execute(DriverCommand.GET_WINDOW_HANDLES);
546-
}
541+
Response response = execute(DriverCommand.GET_WINDOW_HANDLES);
547542
Object value = response.getValue();
548543
try {
549544
List<String> returnedValues = (List<String>) value;
@@ -555,9 +550,6 @@ public Set<String> getWindowHandles() {
555550
}
556551

557552
public String getWindowHandle() {
558-
if (getW3CStandardComplianceLevel() > 0) {
559-
return String.valueOf(execute(DriverCommand.GET_CURRENT_WINDOW_HANDLE_W3C).getValue());
560-
}
561553
return String.valueOf(execute(DriverCommand.GET_CURRENT_WINDOW_HANDLE).getValue());
562554
}
563555

@@ -1062,34 +1054,19 @@ public RemoteAlert() {
10621054
}
10631055

10641056
public void dismiss() {
1065-
if (getW3CStandardComplianceLevel() > 0) {
1066-
execute(DriverCommand.DISMISS_ALERT_W3C);
1067-
} else {
1068-
execute(DriverCommand.DISMISS_ALERT);
1069-
}
1057+
execute(DriverCommand.DISMISS_ALERT);
10701058
}
10711059

10721060
public void accept() {
1073-
if (getW3CStandardComplianceLevel() > 0) {
1074-
execute(DriverCommand.ACCEPT_ALERT_W3C);
1075-
} else {
1076-
execute(DriverCommand.ACCEPT_ALERT);
1077-
}
1061+
execute(DriverCommand.ACCEPT_ALERT);
10781062
}
10791063

10801064
public String getText() {
1081-
if (getW3CStandardComplianceLevel() > 0) {
1082-
return (String) execute(DriverCommand.GET_ALERT_TEXT_W3C).getValue();
1083-
}
10841065
return (String) execute(DriverCommand.GET_ALERT_TEXT).getValue();
10851066
}
10861067

10871068
public void sendKeys(String keysToSend) {
1088-
if (getW3CStandardComplianceLevel() > 0) {
1089-
execute(DriverCommand.SET_ALERT_VALUE_W3C, ImmutableMap.of("text", keysToSend));
1090-
} else {
1091-
execute(DriverCommand.SET_ALERT_VALUE, ImmutableMap.of("text", keysToSend));
1092-
}
1069+
execute(DriverCommand.SET_ALERT_VALUE, ImmutableMap.of("text", keysToSend));
10931070
}
10941071

10951072
@Beta

‎java/client/src/org/openqa/selenium/remote/http/JsonHttpCommandCodec.java

-7
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ public JsonHttpCommandCodec() {
9494
defineCommand(GET_CURRENT_WINDOW_SIZE, get("/session/:sessionId/window/size"));
9595
defineCommand(SET_CURRENT_WINDOW_SIZE, post("/session/:sessionId/window/size"));
9696

97-
defineCommand(GET_WINDOW_HANDLES_W3C, get("/session/:sessionId/window/handles"));
98-
defineCommand(GET_CURRENT_WINDOW_HANDLE_W3C, get("/session/:sessionId/window"));
99-
10097
defineCommand(GET_CURRENT_URL, get("/session/:sessionId/url"));
10198
defineCommand(GET, post("/session/:sessionId/url"));
10299
defineCommand(GO_BACK, post("/session/:sessionId/back"));
@@ -107,10 +104,6 @@ public JsonHttpCommandCodec() {
107104
defineCommand(DISMISS_ALERT, post("/session/:sessionId/dismiss_alert"));
108105
defineCommand(GET_ALERT_TEXT, get("/session/:sessionId/alert_text"));
109106
defineCommand(SET_ALERT_VALUE, post("/session/:sessionId/alert_text"));
110-
defineCommand(ACCEPT_ALERT_W3C, post("/session/:sessionId/alert/accept"));
111-
defineCommand(DISMISS_ALERT_W3C, post("/session/:sessionId/alert/dismiss"));
112-
defineCommand(GET_ALERT_TEXT_W3C, get("/session/:sessionId/alert/text"));
113-
defineCommand(SET_ALERT_VALUE_W3C, post("/session/:sessionId/alert/text"));
114107
defineCommand(SET_ALERT_CREDENTIALS, post("/session/:sessionId/alert/credentials"));
115108

116109
defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));

‎java/client/src/org/openqa/selenium/remote/http/W3CHttpCommandCodec.java

+6-13
Original file line numberDiff line numberDiff line change
@@ -80,36 +80,29 @@ public W3CHttpCommandCodec() {
8080
defineCommand(CLOSE, delete("/session/:sessionId/window"));
8181
defineCommand(SWITCH_TO_WINDOW, post("/session/:sessionId/window"));
8282

83-
defineCommand(GET_WINDOW_HANDLES, get("/session/:sessionId/window_handles"));
83+
defineCommand(GET_WINDOW_HANDLES, get("/session/:sessionId/window/handles"));
8484
defineCommand(MAXIMIZE_WINDOW, post("/session/:sessionId/window/:windowHandle/maximize"));
8585
defineCommand(GET_WINDOW_SIZE, get("/session/:sessionId/window/:windowHandle/size"));
8686
defineCommand(SET_WINDOW_SIZE, post("/session/:sessionId/window/:windowHandle/size"));
8787
defineCommand(GET_WINDOW_POSITION, get("/session/:sessionId/window/:windowHandle/position"));
8888
defineCommand(SET_WINDOW_POSITION, post("/session/:sessionId/window/:windowHandle/position"));
89-
defineCommand(GET_CURRENT_WINDOW_HANDLE, get("/session/:sessionId/window_handle"));
89+
defineCommand(GET_CURRENT_WINDOW_HANDLE, get("/session/:sessionId/window"));
9090

9191
defineCommand(MAXIMIZE_CURRENT_WINDOW, post("/session/:sessionId/window/maximize"));
9292
defineCommand(FULLSCREEN_CURRENT_WINDOW, post("/session/:sessionId/window/fullscreen"));
9393
defineCommand(GET_CURRENT_WINDOW_SIZE, get("/session/:sessionId/window/size"));
9494
defineCommand(SET_CURRENT_WINDOW_SIZE, post("/session/:sessionId/window/size"));
9595

96-
defineCommand(GET_WINDOW_HANDLES_W3C, get("/session/:sessionId/window/handles"));
97-
defineCommand(GET_CURRENT_WINDOW_HANDLE_W3C, get("/session/:sessionId/window"));
98-
9996
defineCommand(GET_CURRENT_URL, get("/session/:sessionId/url"));
10097
defineCommand(GET, post("/session/:sessionId/url"));
10198
defineCommand(GO_BACK, post("/session/:sessionId/back"));
10299
defineCommand(GO_FORWARD, post("/session/:sessionId/forward"));
103100
defineCommand(REFRESH, post("/session/:sessionId/refresh"));
104101

105-
defineCommand(ACCEPT_ALERT, post("/session/:sessionId/accept_alert"));
106-
defineCommand(DISMISS_ALERT, post("/session/:sessionId/dismiss_alert"));
107-
defineCommand(GET_ALERT_TEXT, get("/session/:sessionId/alert_text"));
108-
defineCommand(SET_ALERT_VALUE, post("/session/:sessionId/alert_text"));
109-
defineCommand(ACCEPT_ALERT_W3C, post("/session/:sessionId/alert/accept"));
110-
defineCommand(DISMISS_ALERT_W3C, post("/session/:sessionId/alert/dismiss"));
111-
defineCommand(GET_ALERT_TEXT_W3C, get("/session/:sessionId/alert/text"));
112-
defineCommand(SET_ALERT_VALUE_W3C, post("/session/:sessionId/alert/text"));
102+
defineCommand(ACCEPT_ALERT, post("/session/:sessionId/alert/accept"));
103+
defineCommand(DISMISS_ALERT, post("/session/:sessionId/alert/dismiss"));
104+
defineCommand(GET_ALERT_TEXT, get("/session/:sessionId/alert/text"));
105+
defineCommand(SET_ALERT_VALUE, post("/session/:sessionId/alert/text"));
113106
defineCommand(SET_ALERT_CREDENTIALS, post("/session/:sessionId/alert/credentials"));
114107

115108
defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));

‎java/server/src/org/openqa/selenium/remote/server/JsonHttpCommandHandler.java

-6
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,12 @@ private void setUpMappings() {
103103
addNewMapping(QUIT, DeleteSession.class);
104104

105105
addNewMapping(GET_CURRENT_WINDOW_HANDLE, GetCurrentWindowHandle.class);
106-
addNewMapping(GET_CURRENT_WINDOW_HANDLE_W3C, GetCurrentWindowHandle.class);
107106
addNewMapping(GET_WINDOW_HANDLES, GetAllWindowHandles.class);
108-
addNewMapping(GET_WINDOW_HANDLES_W3C, GetAllWindowHandles.class);
109107

110108
addNewMapping(DISMISS_ALERT, DismissAlert.class);
111-
addNewMapping(DISMISS_ALERT_W3C, DismissAlert.class);
112109
addNewMapping(ACCEPT_ALERT, AcceptAlert.class);
113-
addNewMapping(ACCEPT_ALERT_W3C, AcceptAlert.class);
114110
addNewMapping(GET_ALERT_TEXT, GetAlertText.class);
115-
addNewMapping(GET_ALERT_TEXT_W3C, GetAlertText.class);
116111
addNewMapping(SET_ALERT_VALUE, SetAlertText.class);
117-
addNewMapping(SET_ALERT_VALUE_W3C, SetAlertText.class);
118112
addNewMapping(SET_ALERT_CREDENTIALS, SetAlertCredentials.class);
119113

120114
addNewMapping(GET, ChangeUrl.class);

0 commit comments

Comments
 (0)