Skip to content

Commit 0f6c201

Browse files
committed
fix some warnings
1 parent 03ced16 commit 0f6c201

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

src/test/java/org/htmlunit/WebDriverTestCase.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -614,16 +614,6 @@ private FirefoxDriver createFirefoxDriver(final String geckodriverBinary, final
614614
return new FirefoxDriver(service, options);
615615
}
616616

617-
private static String getBrowserName(final BrowserVersion browserVersion) {
618-
if (browserVersion == BrowserVersion.FIREFOX) {
619-
return browserVersion.getNickname() + '-' + browserVersion.getBrowserVersionNumeric();
620-
}
621-
if (browserVersion == BrowserVersion.FIREFOX_ESR) {
622-
return browserVersion.getNickname() + '-' + browserVersion.getBrowserVersionNumeric();
623-
}
624-
return browserVersion.getNickname();
625-
}
626-
627617
/**
628618
* Starts the web server delivering response from the provided connection.
629619
* @param mockConnection the sources for responses
@@ -1152,14 +1142,14 @@ protected final WebDriver verifyTextArea2(final WebDriver driver,
11521142
final WebElement textArea = driver.findElement(By.id("myLog"));
11531143

11541144
if (expectedAlerts.length == 0) {
1155-
assertEquals("", textArea.getAttribute("value"));
1145+
assertEquals("", textArea.getDomProperty("value"));
11561146
return driver;
11571147
}
11581148

11591149
if (!useRealBrowser()
11601150
&& expectedAlerts.length == 1
11611151
&& expectedAlerts[0].startsWith("data:image/png;base64,")) {
1162-
String value = textArea.getAttribute("value");
1152+
String value = textArea.getDomProperty("value");
11631153
if (value.endsWith("\u00A7")) {
11641154
value = value.substring(0, value.length() - 1);
11651155
}
@@ -1171,7 +1161,7 @@ protected final WebDriver verifyTextArea2(final WebDriver driver,
11711161
for (int i = 0; i < expectedAlerts.length; i++) {
11721162
expected.append(expectedAlerts[i]).append('\u00A7');
11731163
}
1174-
verify(() -> textArea.getAttribute("value"), expected.toString());
1164+
verify(() -> textArea.getDomProperty("value"), expected.toString());
11751165

11761166
return driver;
11771167
}

src/test/java/org/htmlunit/svg/SvgJavaScriptTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void onclick() throws Exception {
4848
final WebDriver driver = loadPage2(html, URL_FIRST, "image/svg+xml", ISO_8859_1);
4949
final WebElement rect = driver.findElement(By.id("rect"));
5050

51-
assertEquals("blue", rect.getAttribute("fill"));
51+
assertEquals("blue", rect.getDomAttribute("fill"));
5252
rect.click();
53-
assertEquals("green", rect.getAttribute("fill"));
53+
assertEquals("green", rect.getDomAttribute("fill"));
5454
}
5555
}
5656

0 commit comments

Comments
 (0)