Skip to content

Commit 77885e1

Browse files
rbrirbri
committed
jdk17
1 parent 9addc66 commit 77885e1

File tree

208 files changed

+372
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+372
-439
lines changed

‎src/test/java/org/htmlunit/BrowserVersionFeaturesTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.IOException;
2323
import java.lang.reflect.Field;
2424
import java.util.ArrayList;
25-
import java.util.Iterator;
2625
import java.util.LinkedList;
2726
import java.util.List;
2827

‎src/test/java/org/htmlunit/BrowserVersionTest.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import static org.junit.jupiter.api.Assertions.assertEquals;
1818
import static org.junit.jupiter.api.Assertions.assertFalse;
19+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
20+
import static org.junit.jupiter.api.Assertions.assertNotSame;
1921
import static org.junit.jupiter.api.Assertions.assertTrue;
2022

2123
import java.util.TimeZone;
@@ -54,10 +56,10 @@ public void testClone() {
5456
final BrowserVersion clone = new BrowserVersion.BrowserVersionBuilder(ff).build();
5557

5658
// Nickname is used as key for dictionaries storing browser setups
57-
assertTrue(ff.getNickname().equals(clone.getNickname()));
59+
assertEquals(ff.getNickname(), clone.getNickname());
5860

59-
assertFalse(ff == clone);
60-
assertFalse(ff.equals(clone));
61+
assertNotSame(ff, clone);
62+
assertNotEquals(ff, clone);
6163
}
6264

6365
/**
@@ -70,10 +72,10 @@ public void differentTimeZone() {
7072
.build();
7173

7274
// Nickname is used as key for dictionaries storing browser setups
73-
assertTrue(BrowserVersion.FIREFOX.getNickname().equals(ffBerlin.getNickname()));
75+
assertEquals(BrowserVersion.FIREFOX.getNickname(), ffBerlin.getNickname());
7476

75-
assertFalse(BrowserVersion.FIREFOX == ffBerlin);
76-
assertFalse(BrowserVersion.FIREFOX.equals(ffBerlin));
77+
assertNotSame(BrowserVersion.FIREFOX, ffBerlin);
78+
assertNotEquals(BrowserVersion.FIREFOX, ffBerlin);
7779

7880
Assertions.assertNotEquals(BrowserVersion.FIREFOX.getSystemTimezone(), ffBerlin.getSystemTimezone());
7981
}

‎src/test/java/org/htmlunit/CodeStyleTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,13 +761,13 @@ private static List<String> alertsToList(final String string) {
761761
currentToken.append('"');
762762
}
763763
else {
764-
startsWithBraces = token.toString().contains("{");
764+
startsWithBraces = token.contains("{");
765765
}
766766

767767
if (!insideString && token.startsWith(",") && !startsWithBraces) {
768768
list.add(currentToken.toString());
769769
currentToken.setLength(0);
770-
startsWithBraces = token.toString().contains("{");
770+
startsWithBraces = token.contains("{");
771771
}
772772

773773
if (!insideString && token.contains("}")) {

‎src/test/java/org/htmlunit/DefaultCredentialsProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void passwordNull() throws Exception {
101101
final String scheme = new BasicScheme().getSchemeName();
102102

103103
final DefaultCredentialsProvider provider = new DefaultCredentialsProvider();
104-
provider.addCredentials("username", (char[]) null, HttpHeader.HOST_LC, 80, realm);
104+
provider.addCredentials("username", null, HttpHeader.HOST_LC, 80, realm);
105105

106106
final Credentials credentials = provider.getCredentials(new AuthScope(HttpHeader.HOST_LC, 80, realm, scheme));
107107
assertEquals("username", credentials.getUserPrincipal().getName());

‎src/test/java/org/htmlunit/ExternalTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@
4747
*/
4848
public class ExternalTest {
4949

50-
static String SONATYPE_SNAPSHOT_REPO_URL_ =
50+
static final String SONATYPE_SNAPSHOT_REPO_URL_ =
5151
"https://central.sonatype.com/repository/maven-snapshots/";
52-
static String MAVEN_REPO_URL_ = "https://repo1.maven.org/maven2/";
52+
static final String MAVEN_REPO_URL_ = "https://repo1.maven.org/maven2/";
5353

5454
/** Chrome driver. */
55-
static String CHROME_DRIVER_ = "143.0.7499";
56-
static String CHROME_DRIVER_URL_ =
55+
static final String CHROME_DRIVER_ = "143.0.7499";
56+
static final String CHROME_DRIVER_URL_ =
5757
"https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json";
5858

59-
static String EDGE_DRIVER_ = "143.0.3650";
60-
static String EDGE_DRIVER_URL_ = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/";
59+
static final String EDGE_DRIVER_ = "143.0.3650";
60+
static final String EDGE_DRIVER_URL_ = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/";
6161

6262
/** Gecko driver. */
63-
static String GECKO_DRIVER_ = "0.36.0";
64-
static String GECKO_DRIVER_URL_ = "https://github.com/mozilla/geckodriver/releases/latest";
63+
static final String GECKO_DRIVER_ = "0.36.0";
64+
static final String GECKO_DRIVER_URL_ = "https://github.com/mozilla/geckodriver/releases/latest";
6565

6666
/**
6767
* Tests the current environment matches the expected setup.
@@ -100,7 +100,7 @@ public void pom() throws Exception {
100100
if (inComment) {
101101
final int endIdx = line.indexOf("-->");
102102
if (endIdx != -1) {
103-
cleaned += line.substring(endIdx + 3, line.length());
103+
cleaned += line.substring(endIdx + 3);
104104
inComment = false;
105105
}
106106
line = cleaned;

‎src/test/java/org/htmlunit/HttpWebConnection3Test.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.net.URL;
1818
import java.net.URLEncoder;
1919
import java.nio.charset.Charset;
20+
import java.nio.charset.StandardCharsets;
2021
import java.time.Duration;
2122
import java.util.Arrays;
2223

@@ -235,7 +236,7 @@ public void locationQueryUTF8Encoded() throws Exception {
235236
+ "Location: "
236237
+ url
237238
+ "test?"
238-
+ URLEncoder.encode("\u0623\u0647\u0644\u0627\u064b", "UTF-8")
239+
+ URLEncoder.encode("\u0623\u0647\u0644\u0627\u064b", StandardCharsets.UTF_8)
239240
+ "\r\n"
240241
+ "\r\n";
241242

@@ -273,7 +274,7 @@ public void locationUTF8Encoded() throws Exception {
273274
+ "Content-Length: 0\r\n"
274275
+ "Location: "
275276
+ url
276-
+ URLEncoder.encode("\u0623\u0647\u0644\u0627\u064b", "UTF-8")
277+
+ URLEncoder.encode("\u0623\u0647\u0644\u0627\u064b", StandardCharsets.UTF_8)
277278
+ "\r\n"
278279
+ "\r\n";
279280

@@ -1463,8 +1464,7 @@ public void loadJavascriptCharset() throws Exception {
14631464
final String hi = "HTTP/1.1 200 OK\r\n"
14641465
+ "Content-Length: 0\r\n"
14651466
+ "Content-Type: text/javascript\r\n"
1466-
+ "\r\n"
1467-
+ "";
1467+
+ "\r\n";
14681468

14691469
shutDownAll();
14701470
try (PrimitiveWebServer primitiveWebServer = new PrimitiveWebServer(Charset.forName("GB2312"), html, hi)) {
@@ -1485,7 +1485,7 @@ public void loadJavascriptCharset() throws Exception {
14851485

14861486
// let's try some wait on our CI server
14871487
final long endTime = System.currentTimeMillis() + Duration.ofSeconds(4).toMillis();
1488-
while (primitiveWebServer.getRequests().size() < 1
1488+
while (primitiveWebServer.getRequests().isEmpty()
14891489
&& System.currentTimeMillis() < endTime) {
14901490
Thread.sleep(100);
14911491
}

‎src/test/java/org/htmlunit/HttpWebConnectionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ public void jettyProofOfConcept() throws Exception {
179179
final WebConnection defaultConnection = client.getWebConnection();
180180
assertTrue(
181181
"HttpWebConnection should be the default",
182-
HttpWebConnection.class.isInstance(defaultConnection));
183-
assertTrue("Response should be valid HTML", HtmlPage.class.isInstance(page));
182+
defaultConnection instanceof HttpWebConnection);
183+
assertTrue("Response should be valid HTML", page instanceof HtmlPage);
184184
}
185185

186186
/**

‎src/test/java/org/htmlunit/ScriptPreProcessorTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222

23-
import org.htmlunit.html.HtmlElement;
24-
import org.htmlunit.html.HtmlPage;
2523
import org.junit.jupiter.api.Test;
2624

2725
/**
@@ -116,7 +114,7 @@ public void scriptPreProcessor_UnimplementedJavascript() throws Exception {
116114
client.getPage("http://page");
117115

118116
assertEquals(1, alerts.size());
119-
assertEquals("implemented function", alerts.get(0).toString());
117+
assertEquals("implemented function", alerts.get(0));
120118
}
121119

122120
/**

‎src/test/java/org/htmlunit/WebClient2Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void serialization_withJSBackgroundTasks() throws Exception {
169169
page.getWebClient().close();
170170

171171
// deserialize page and verify that 1 background job exists
172-
final HtmlPage clonedPage = (HtmlPage) SerializationUtils.deserialize(bytes);
172+
final HtmlPage clonedPage = SerializationUtils.deserialize(bytes);
173173
assertEquals(Integer.parseInt(expected[1]), clonedPage.getEnclosingWindow().getJobManager().getJobCount());
174174

175175
// configure a new CollectingAlertHandler (in fact it has surely already one and we could get and cast it)

‎src/test/java/org/htmlunit/WebClientOptionsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void serialization() throws Exception {
3737
final WebClientOptions original = new WebClientOptions();
3838

3939
final byte[] bytes = SerializationUtils.serialize(original);
40-
final WebClientOptions deserialized = (WebClientOptions) SerializationUtils.deserialize(bytes);
40+
final WebClientOptions deserialized = SerializationUtils.deserialize(bytes);
4141

4242
assertEquals(original.isJavaScriptEnabled(), deserialized.isJavaScriptEnabled());
4343
assertEquals(original.isCssEnabled(), deserialized.isCssEnabled());
@@ -104,7 +104,7 @@ public void serializationChanged() throws Exception {
104104
original.setFetchPolyfillEnabled(true);
105105

106106
final byte[] bytes = SerializationUtils.serialize(original);
107-
final WebClientOptions deserialized = (WebClientOptions) SerializationUtils.deserialize(bytes);
107+
final WebClientOptions deserialized = SerializationUtils.deserialize(bytes);
108108

109109
assertEquals(original.isJavaScriptEnabled(), deserialized.isJavaScriptEnabled());
110110
assertEquals(original.isCssEnabled(), deserialized.isCssEnabled());
@@ -151,7 +151,7 @@ public void serializationSSLContextProvider() throws Exception {
151151
original.setSSLContext(SSLContext.getDefault());
152152

153153
final byte[] bytes = SerializationUtils.serialize(original);
154-
final WebClientOptions deserialized = (WebClientOptions) SerializationUtils.deserialize(bytes);
154+
final WebClientOptions deserialized = SerializationUtils.deserialize(bytes);
155155

156156
assertNull(deserialized.getSSLContext());
157157
}
@@ -167,7 +167,7 @@ public void serializationSSLTrustStore() throws Exception {
167167
original.setSSLTrustStore(keyStore);
168168

169169
final byte[] bytes = SerializationUtils.serialize(original);
170-
final WebClientOptions deserialized = (WebClientOptions) SerializationUtils.deserialize(bytes);
170+
final WebClientOptions deserialized = SerializationUtils.deserialize(bytes);
171171

172172
assertNull(deserialized.getSSLTrustStore());
173173
}
@@ -183,7 +183,7 @@ public void sslClientCertificateStore() throws Exception {
183183
original.setSSLClientCertificateKeyStore(keyStore, "secret".toCharArray());
184184

185185
final byte[] bytes = SerializationUtils.serialize(original);
186-
final WebClientOptions deserialized = (WebClientOptions) SerializationUtils.deserialize(bytes);
186+
final WebClientOptions deserialized = SerializationUtils.deserialize(bytes);
187187

188188
assertNull(deserialized.getSSLClientCertificateStore());
189189
Assertions.assertArrayEquals("secret".toCharArray(), deserialized.getSSLClientCertificatePassword());

0 commit comments

Comments
 (0)