task: removing the approval test workaround (#49071)

closes: #48976

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2026-05-19 02:09:10 -04:00
committed by GitHub
parent ce38c5b135
commit 2f6befa9bd
2 changed files with 1 additions and 25 deletions
+1 -1
View File
@@ -37,7 +37,7 @@
<properties>
<kc.quarkus.tests.dist>raw</kc.quarkus.tests.dist>
<kc.quarkus.tests.groups>!invalid</kc.quarkus.tests.groups>
<approvaltests.version>26.1.0</approvaltests.version>
<approvaltests.version>30.1.1</approvaltests.version>
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
</properties>
@@ -20,7 +20,6 @@ package org.keycloak.it.cli.dist;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Stream;
import org.keycloak.it.junit5.extension.CLIResult;
import org.keycloak.it.junit5.extension.DistributionTest;
@@ -43,11 +42,6 @@ import org.keycloak.quarkus.runtime.cli.command.UpdateCompatibilityMetadata;
import io.quarkus.test.junit.main.Launch;
import org.apache.commons.io.FileUtils;
import org.approvaltests.Approvals;
import org.approvaltests.core.ApprovalFailureReporter;
import org.approvaltests.reporters.intellij.IntelliJReporter;
import org.approvaltests.reporters.linux.LinuxDiffReporter;
import org.approvaltests.reporters.macosx.MacDiffReporter;
import org.approvaltests.reporters.windows.WindowsDiffReporter;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -235,24 +229,6 @@ public class HelpCommandDistTest {
}
try {
// on failure with java 25, the intellijreporter seems to work, but really just throws
// an exception later - https://github.com/approvals/ApprovalTests.Java/issues/800
if (IntelliJReporter.findJetBrainsIdes().equals("")) {
Stream.of(WindowsDiffReporter.INSTANCE, LinuxDiffReporter.INSTANCE, MacDiffReporter.INSTANCE).forEach(reporter -> {
var reporters = reporter.getReporters();
for (int i = 0; i < reporters.length; i++) {
if (reporters[i] instanceof IntelliJReporter) {
reporters[i] = new ApprovalFailureReporter() {
@Override
public boolean report(String received, String approved) {
return false;
}
};
}
}
});
}
Approvals.verify(output);
} catch (Error cause) {
if ("true".equals(System.getenv(REPLACE_EXPECTED))) {