OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-26 19:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up obsolete Java version checks in tests (#27523)

Browse Source
This commit is contained in:
Rauneet Singh authored and GitHub committed 2026-10-11 08:58:03 +01:00
1 parent 379584d636
commit 4386cf394a
5 files changed
+36 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/src/test/java/jenkins/model/JenkinsLogRecordsTest.java
+13 -18
View File
@@ -6,13 +6,11 @@ import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.not;
import hudson.util.VersionNumber;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import jenkins.util.java.JavaUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.jvnet.hudson.test.JenkinsRule;
@@ -35,22 +33,19 @@ class JenkinsLogRecordsTest {
assertThat("Records are displayed in reverse order",
logRecords.stream().map(LogRecord::getMessage).collect(Collectors.toList()),
containsInRelativeOrder("Completed initialization", "Started initialization"));
VersionNumber javaVersion = new VersionNumber(JavaUtils.getCurrentRuntimeJavaVersion());
if (javaVersion.isNewerThanOrEqualTo(new VersionNumber("17"))) { // TODO https://github.com/jenkinsci/jenkins-test-harness/issues/359
Object x = new Object() {
@Override
public String toString() {
return "collect me";
}
};
use(x);
WeakReference<Object> ref = new WeakReference<>(x);
x = null;
MemoryAssert.assertGC(ref, true);
assertThat("Record parameters formatted before collection",
logRecords.stream().map(LogRecord::getMessage).collect(Collectors.toList()),
hasItem("formatting collect me"));
}
Object x = new Object() {
@Override
public String toString() {
return "collect me";
}
};
use(x);
WeakReference<Object> ref = new WeakReference<>(x);
x = null;
MemoryAssert.assertGC(ref, true);
assertThat("Record parameters formatted before collection",
logRecords.stream().map(LogRecord::getMessage).collect(Collectors.toList()),
hasItem("formatting collect me"));
}
private static void use(Object x) {