Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java] Java language level aids #13834

Merged
merged 12 commits into from
May 3, 2024
Merged
2 changes: 1 addition & 1 deletion java/test/org/openqa/selenium/ExecutingJavascriptTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ void testShouldBeAbleToExecuteABigChunkOfJavascriptCode() throws IOException {
driver.get(pages.javascriptPage);

Path jqueryFile = InProject.locate("common/src/web/js/jquery-3.5.1.min.js");
String jquery = new String(Files.readAllBytes(jqueryFile), US_ASCII);
String jquery = Files.readString(jqueryFile, US_ASCII);
assertThat(jquery.length())
.describedAs("The javascript code should be at least 50 KB.")
.isGreaterThan(50000);
Expand Down
6 changes: 3 additions & 3 deletions java/test/org/openqa/selenium/ProxyTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void testManualProxy() {
assertThat(proxy.getHttpProxy()).isEqualTo("http.proxy:1234");
assertThat(proxy.getSslProxy()).isEqualTo("ssl.proxy");
assertThat(proxy.getSocksProxy()).isEqualTo("socks.proxy:65555");
assertThat(proxy.getSocksVersion()).isEqualTo(Integer.valueOf(5));
assertThat(proxy.getSocksVersion()).isEqualTo(5);
assertThat(proxy.getSocksUsername()).isEqualTo("test1");
assertThat(proxy.getSocksPassword()).isEqualTo("test2");
assertThat(proxy.getNoProxy()).isEqualTo("localhost,127.0.0.*");
Expand Down Expand Up @@ -184,7 +184,7 @@ void manualProxyFromMap() {
assertThat(proxy.getHttpProxy()).isEqualTo("http.proxy:1234");
assertThat(proxy.getSslProxy()).isEqualTo("ssl.proxy");
assertThat(proxy.getSocksProxy()).isEqualTo("socks.proxy:65555");
assertThat(proxy.getSocksVersion()).isEqualTo(Integer.valueOf(5));
assertThat(proxy.getSocksVersion()).isEqualTo(5);
assertThat(proxy.getSocksUsername()).isEqualTo("test1");
assertThat(proxy.getSocksPassword()).isEqualTo("test2");
assertThat(proxy.getNoProxy()).isEqualTo("localhost,127.0.0.*");
Expand All @@ -209,7 +209,7 @@ void longSocksVersionFromMap() {

Proxy proxy = new Proxy(proxyData);

assertThat(proxy.getSocksVersion()).isEqualTo(Integer.valueOf(5));
assertThat(proxy.getSocksVersion()).isEqualTo(5);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.openqa.selenium.environment.webserver;

import static java.nio.charset.StandardCharsets.UTF_8;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -51,7 +49,7 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {

return new HttpResponse()
.setHeader("Content-Type", "text/html; charset=UTF-8")
.setContent(Contents.utf8String(new String(Files.readAllBytes(target), UTF_8)));
.setContent(Contents.utf8String(Files.readString(target)));
} catch (IOException e) {
throw new UncheckedIOException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void shouldBeAbleToRegisterALocalNode() throws URISyntaxException {
wait.until(obj -> distributor.getStatus().hasCapacity());

NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
assertEquals(1, getStereotypes(status).get(CAPS).intValue());
assertEquals(1, getStereotypes(status).get(CAPS));
}

@Test
Expand Down Expand Up @@ -192,7 +192,7 @@ void shouldBeAbleToRegisterACustomNode() throws URISyntaxException {
wait.until(obj -> distributor.getStatus().hasCapacity());

NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
assertEquals(1, getStereotypes(status).get(CAPS).intValue());
assertEquals(1, getStereotypes(status).get(CAPS));
}
}

Expand Down Expand Up @@ -231,7 +231,7 @@ void shouldBeAbleToRegisterNodesByListeningForEvents() throws URISyntaxException
wait.until(obj -> distributor.getStatus().hasCapacity());

NodeStatus status = getOnlyElement(distributor.getStatus().getNodes());
assertEquals(1, getStereotypes(status).get(CAPS).intValue());
assertEquals(1, getStereotypes(status).get(CAPS));
}
}

Expand Down Expand Up @@ -323,7 +323,7 @@ void distributorShouldUpdateStateOfExistingNodeWhenNodePublishesStateChange()
wait.until(obj -> distributor.getStatus().hasCapacity());

NodeStatus nodeStatus = getOnlyElement(distributor.getStatus().getNodes());
assertEquals(1, getStereotypes(nodeStatus).get(CAPS).intValue());
assertEquals(1, getStereotypes(nodeStatus).get(CAPS));

// Craft a status that makes it look like the node is busy, and post it on the bus.
NodeStatus status = node.getStatus();
Expand Down
2 changes: 1 addition & 1 deletion java/test/org/openqa/selenium/json/JsonOutputTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ void shouldConvertUnhandledAlertException() {
@Test
void shouldConvertDatesToMillisecondsInUtcTime() {
String jsonStr = convert(new Date(0));
assertThat(valueOf(jsonStr).intValue()).isZero();
assertThat(valueOf(jsonStr)).isZero();
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions java/test/org/openqa/selenium/json/JsonTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ void canReadBooleans() {

@Test
void canReadANumber() {
assertThat((Number) new Json().toType("42", Number.class)).isEqualTo(Long.valueOf(42));
assertThat((Integer) new Json().toType("42", Integer.class)).isEqualTo(Integer.valueOf(42));
assertThat((Double) new Json().toType("42", Double.class)).isEqualTo(Double.valueOf(42));
assertThat((Number) new Json().toType("42", Number.class)).isEqualTo(42L);
assertThat((Integer) new Json().toType("42", Integer.class)).isEqualTo(42);
assertThat((Double) new Json().toType("42", Double.class)).isEqualTo(42.0);
}

@Test
Expand Down Expand Up @@ -285,7 +285,7 @@ void canHandleValueBeingAnArray() {

assertThat(response.getSessionId()).isEqualTo("bar");
assertThat(((List<?>) converted.getValue())).hasSize(2);
assertThat(response.getStatus().intValue()).isEqualTo(1512);
assertThat(response.getStatus()).isEqualTo(1512);
}

@Test
Expand Down Expand Up @@ -426,7 +426,7 @@ void decodingResponseWithNumbersInValueObject() {
void shouldRecognizeNumericStatus() {
Response response = new Json().toType("{\"status\":0,\"value\":\"cheese\"}", Response.class);

assertThat(response.getStatus().intValue()).isZero();
assertThat(response.getStatus()).isZero();
assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(0));
String value = (String) response.getValue();
assertThat(value).isEqualTo("cheese");
Expand All @@ -437,7 +437,7 @@ void shouldRecognizeStringStatus() {
Response response =
new Json().toType("{\"status\":\"success\",\"value\":\"cheese\"}", Response.class);

assertThat(response.getStatus().intValue()).isZero();
assertThat(response.getStatus()).isZero();
assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(0));
String value = (String) response.getValue();
assertThat(value).isEqualTo("cheese");
Expand All @@ -450,7 +450,7 @@ void shouldConvertInvalidSelectorError() {
.toType(
"{\"state\":\"invalid selector\",\"message\":\"invalid xpath selector\"}",
Response.class);
assertThat(response.getStatus().intValue()).isEqualTo(32);
assertThat(response.getStatus()).isEqualTo(32);
assertThat(response.getState()).isEqualTo(new ErrorCodes().toState(32));
}

Expand All @@ -459,7 +459,7 @@ void shouldRecognizeStringState() {
Response response =
new Json().toType("{\"state\":\"success\",\"value\":\"cheese\"}", Response.class);
assertThat(response.getState()).isEqualTo("success");
assertThat(response.getStatus().intValue()).isZero();
assertThat(response.getStatus()).isZero();
String value = (String) response.getValue();
assertThat(value).isEqualTo("cheese");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ void canCompareCapabilities() {
}

private String createString(int length) {
StringBuilder outputBuffer = new StringBuilder(length);
for (int i = 0; i < length; i++) {
outputBuffer.append("x");
}
return outputBuffer.toString();
return "x".repeat(Math.max(0, length));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void shouldBeAbleToHandleGatewayTimeoutError() {

Response decoded = new W3CHttpResponseCodec().decode(response);

assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
assertThat(decoded.getStatus()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
assertThat(decoded.getValue()).isEqualTo(responseString);
}

Expand All @@ -104,7 +104,7 @@ void shouldBeAbleToHandleBadGatewayError() {

Response decoded = new W3CHttpResponseCodec().decode(response);

assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
assertThat(decoded.getStatus()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
assertThat(decoded.getValue()).isEqualTo(responseString);
}

Expand All @@ -120,7 +120,7 @@ void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForNonCompliantImplementa
Response decoded = new W3CHttpResponseCodec().decode(response);

assertThat(decoded.getState()).isEqualTo("unsupported operation");
assertThat(decoded.getStatus().intValue()).isEqualTo(METHOD_NOT_ALLOWED);
assertThat(decoded.getStatus()).isEqualTo(METHOD_NOT_ALLOWED);

assertThat(decoded.getValue()).isInstanceOf(UnsupportedCommandException.class);
assertThat(((WebDriverException) decoded.getValue()).getMessage()).contains("I like peas");
Expand All @@ -140,7 +140,7 @@ void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForConformingImplementati
Response decoded = new W3CHttpResponseCodec().decode(response);

assertThat(decoded.getState()).isEqualTo("unsupported operation");
assertThat(decoded.getStatus().intValue()).isEqualTo(METHOD_NOT_ALLOWED);
assertThat(decoded.getStatus()).isEqualTo(METHOD_NOT_ALLOWED);

assertThat(decoded.getValue()).isInstanceOf(UnsupportedCommandException.class);
assertThat(((WebDriverException) decoded.getValue()).getMessage()).contains("I like peas");
Expand Down
Loading