From bf2c69921e16fc5bd5ca5fe794e93aea6cd6f264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 26 Feb 2023 16:23:12 +0100 Subject: [PATCH] Fix merge --- .../java/net/sourceforge/pmd/it/AnalysisCacheIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AnalysisCacheIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AnalysisCacheIT.java index ef010cb850..b9a4478ec3 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AnalysisCacheIT.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AnalysisCacheIT.java @@ -4,6 +4,7 @@ package net.sourceforge.pmd.it; +import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; @@ -25,7 +26,7 @@ class AnalysisCacheIT extends AbstractBinaryDistributionTest { // Ensure we have violations and a non-empty cache file assertTrue(cacheFile.toFile().length() > 0, "cache file is empty after run"); - result.assertExecutionResult(4, "", srcDir + File.separator + "JumbledIncrementer.java:8:\tJumbledIncrementer:\t"); + result.assertExitCode(4).assertReport(containsString(srcDir + File.separator + "JumbledIncrementer.java:8:\tJumbledIncrementer:\t")); // rerun from cache ExecutionResult resultFromCache = PMDExecutor.runPMD(createTemporaryReportFile(), tempDir, "-d", srcDir, "-R", "src/test/resources/rulesets/sample-ruleset.xml", @@ -45,7 +46,8 @@ class AnalysisCacheIT extends AbstractBinaryDistributionTest { // Ensure we have violations and a non-empty cache file assertTrue(cacheFile.toFile().length() > 0, "cache file is empty after run"); - result.assertExecutionResult(4, "", srcDir + File.separator + "JumbledIncrementer.java:8:\tJumbledIncrementer:\t"); + result.assertExitCode(4) + .assertReport(containsString(srcDir + File.separator + "JumbledIncrementer.java:8:\tJumbledIncrementer:\t")); // rerun from cache with relativized paths ExecutionResult resultFromCache = PMDExecutor.runPMD(createTemporaryReportFile(), tempDir, "-d", Paths.get(".").toAbsolutePath().relativize(Paths.get(srcDir)).toString(), "-R", "src/test/resources/rulesets/sample-ruleset.xml", @@ -54,7 +56,8 @@ class AnalysisCacheIT extends AbstractBinaryDistributionTest { resultFromCache.assertErrorOutputContains("Incremental Analysis cache HIT"); // An error with the relative path should exist, but no with the absolute one - resultFromCache.assertExecutionResult(4, "", "src/test/resources/sample-source/java/JumbledIncrementer.java:8:\tJumbledIncrementer:\t".replace('/', File.separatorChar)); + result.assertExitCode(4) + .assertReport(containsString("src/test/resources/sample-source/java/JumbledIncrementer.java:8:\tJumbledIncrementer:\t".replace('/', File.separatorChar))); resultFromCache.assertNoErrorInReport(srcDir + File.separator + "JumbledIncrementer.java:8:\tJumbledIncrementer:\t"); } }