From 610ecaa4ceb9ab0a5199714757cf15317a55821d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:39:42 +0000 Subject: [PATCH 1/2] Bump io.jenkins.plugins:analysis-model-api from 11.14.0 to 11.15.0 Bumps [io.jenkins.plugins:analysis-model-api](https://github.com/jenkinsci/analysis-model) from 11.14.0 to 11.15.0. - [Release notes](https://github.com/jenkinsci/analysis-model/releases) - [Changelog](https://github.com/jenkinsci/analysis-model/blob/main/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/analysis-model/compare/v11.14.0...v11.15.0) --- updated-dependencies: - dependency-name: io.jenkins.plugins:analysis-model-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index a1c9ca0439..b55371efc4 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -25,7 +25,7 @@ -SNAPSHOT ${project.groupId}.warnings.ng - 11.14.0 + 11.15.0 ${analysis-model-api.version} 1.7.8 From f95b14054dc65eb92014e7e7e8b9e9df93b6b7c0 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Mon, 15 Jan 2024 10:56:38 +0100 Subject: [PATCH 2/2] Fix import of moved parent test class. --- .../warnings/groovy/DynamicDocumentParserTest.java | 2 +- .../analysis/warnings/groovy/DynamicLineParserTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicDocumentParserTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicDocumentParserTest.java index 04fcf28fb0..a4c1788b7c 100644 --- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicDocumentParserTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicDocumentParserTest.java @@ -1,11 +1,11 @@ package io.jenkins.plugins.analysis.warnings.groovy; -import edu.hm.hafner.analysis.AbstractParserTest; import edu.hm.hafner.analysis.Issue; import edu.hm.hafner.analysis.Report; import edu.hm.hafner.analysis.Severity; import edu.hm.hafner.analysis.assertions.Assertions; import edu.hm.hafner.analysis.assertions.SoftAssertions; +import edu.hm.hafner.analysis.registry.AbstractParserTest; /** * Tests the class {@link DynamicDocumentParser}. Creates a new Eclipse parser in Groovy. All Eclipse test cases are diff --git a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicLineParserTest.java b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicLineParserTest.java index c790944f91..3065b1c241 100644 --- a/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicLineParserTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/analysis/warnings/groovy/DynamicLineParserTest.java @@ -2,10 +2,10 @@ import org.junit.jupiter.api.Test; -import edu.hm.hafner.analysis.AbstractParserTest; import edu.hm.hafner.analysis.Report; import edu.hm.hafner.analysis.Severity; import edu.hm.hafner.analysis.assertions.SoftAssertions; +import edu.hm.hafner.analysis.registry.AbstractParserTest; import static edu.hm.hafner.analysis.assertions.Assertions.*; @@ -43,13 +43,13 @@ protected void assertThatIssuesArePresent(final Report report, final SoftAsserti public DynamicLineParser createParser() { return new DynamicLineParser("(.*):(\\d+):(\\d+): (\\D\\d*) (.*)", toString("pep8.groovy")); } - + @Test void shouldScanAllLinesAndAssignLineNumberAndFileName() { - DynamicLineParser parser = new DynamicLineParser("^(.*)$", + DynamicLineParser parser = new DynamicLineParser("^(.*)$", "return builder.setFileName(fileName).setLineStart(lineNumber).setMessage(matcher.group(1)).buildOptional()"); Report report = parser.parse(createReaderFactory(FILE_NAME)); - + assertThat(report).hasSize(3); for (int i = 0; i < 3; i++) { assertThat(report.get(i)).hasBaseName(FILE_NAME).hasLineStart(i + 1).hasMessage(String.valueOf(i + 1));