diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/AffectedFilesResolverITest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/AffectedFilesResolverITest.java index 7c1742600a..04129d9a1c 100644 --- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/AffectedFilesResolverITest.java +++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/steps/AffectedFilesResolverITest.java @@ -176,7 +176,7 @@ void shouldGetIoErrorBySearchingForAffectedFiles() { String consoleLog = getConsoleLog(result); assertThat(consoleLog).contains("0 copied"); - if (isWindows()) { // In Windows a file does not exist if it is unreadable + if (isWindows() && Runtime.version().feature() < 21) { // In Windows a file does not exist if it is unreadable assertThat(consoleLog).contains("4 not-found", "0 with I/O error"); } else { @@ -267,7 +267,7 @@ private void buildAndVerifyFilesResolving(final FreeStyleProject job, final Colu } private IssuesRow getIssuesModel(final AnalysisResult result, final int rowNumber) { - IssuesDetail issuesDetail = (IssuesDetail) result.getOwner().getAction(ResultAction.class).getTarget(); + IssuesDetail issuesDetail = result.getOwner().getAction(ResultAction.class).getTarget(); return (IssuesRow) issuesDetail.getTableModel("issues").getRows().get(rowNumber); } diff --git a/ui-tests/pom.xml b/ui-tests/pom.xml index 0e6703e143..cac2fc0e61 100644 --- a/ui-tests/pom.xml +++ b/ui-tests/pom.xml @@ -16,7 +16,7 @@ UI Tests of Warnings Plugin - 2.417 + 2.437 3.51 2.3 2.38.0 @@ -38,7 +38,7 @@ io.netty netty-bom - 4.1.101.Final + 4.1.104.Final pom import @@ -49,7 +49,13 @@ org.jenkins-ci acceptance-test-harness - 5504.v485694f31cdf + 5770.v81b_784f28b_d7 + + + com.fasterxml.jackson.core + jackson-databind + 2.16.0 + test org.apache.httpcomponents diff --git a/ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AnalysisResult.java b/ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AnalysisResult.java index f9b4e5db32..8466598aca 100644 --- a/ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AnalysisResult.java +++ b/ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/AnalysisResult.java @@ -10,7 +10,6 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; -import com.gargoylesoftware.htmlunit.ScriptResult; import com.google.inject.Injector; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -322,9 +321,8 @@ public String getTrendChartById(final String elementId) { "delete(window.Array.prototype.toJSON) %n" + "return JSON.stringify(echarts.getInstanceByDom(document.getElementById(\"%s\")).getOption())", elementId)); - Object scriptResult = new ScriptResult(result).getJavaScriptResult(); - if (scriptResult != null) { - return scriptResult.toString(); + if (result != null) { + return result.toString(); } elasticSleep(1000); } diff --git a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/DetailsTabUiTest.java b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/DetailsTabUiTest.java index 51315f7887..fc52c6414e 100644 --- a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/DetailsTabUiTest.java +++ b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/DetailsTabUiTest.java @@ -1,5 +1,6 @@ package io.jenkins.plugins.analysis.warnings; +import java.time.Duration; import java.util.Collection; import java.util.List; @@ -303,7 +304,6 @@ public void shouldMemorizeSelectedNumberOfRowsOnReload() { issuesPaginateButtons = issuesPaginate.findElements(By.cssSelector("ul li")); assertThat(issuesPaginateButtons.size()).isEqualTo(1); - } /** @@ -316,7 +316,7 @@ public void shouldMemorizeSelectedNumberOfRowsOnReload() { * WebElement that should contain the expected string */ private void waitUntilCondition(final WebElement target, final String expectedString) { - WebDriverWait wait = new WebDriverWait(driver, 2, 100); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(2), Duration.ofMillis(100)); wait.until(ExpectedConditions.textToBePresentInElement(target, expectedString)); } } diff --git a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java index 4734d5f228..70fa346d76 100644 --- a/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java +++ b/ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/UiTest.java @@ -189,7 +189,6 @@ protected void verifyCpd(final Build build) { "-> found 20 issues (skipped 0 duplicates)", "-> 1 copied, 0 not in workspace, 0 not-found, 0 with I/O error", "Issues delta (vs. reference build): outstanding: 0, new: 20, fixed: 0"); - } protected void verifyFindBugs(final Build build) { @@ -202,7 +201,7 @@ protected void verifyFindBugs(final Build build) { .hasFixedSize(0) .hasReferenceBuild(1) .hasInfoType(InfoType.INFO) - .hasDetails("No issues for 2 builds, i.e. since build: #1"); + .hasDetails("No issues for 2 builds, i.e. since build: Success #1"); assertThat(openInfoView(build, FINDBUGS_ID)) .hasNoErrorMessages()