use Asserts.assertNotNull rather than AssertionError

This commit is contained in:
Robert Toyonaga 2026-03-30 09:57:54 -04:00
parent e943805296
commit a6e5e6fb0a

View File

@ -27,6 +27,7 @@ import java.nio.file.Path;
import jdk.jfr.Recording;
import jdk.jfr.internal.consumer.RepositoryFiles;
import jdk.test.lib.Asserts;
/**
* @test
@ -57,22 +58,15 @@ public class TestRepositoryFilesRescan {
*/
private static void testNoOscillation(Path dir) {
RepositoryFiles rf = new RepositoryFiles(dir, false);
if (rf.firstPath(0, false) == null) {
throw new AssertionError("Call 1: expected non-null (initial discovery of .jfr files)");
}
Asserts.assertNotNull(rf.firstPath(0, false), "Call 1: expected non-null (initial discovery of .jfr files)");
Path p2 = rf.firstPath(0, false);
if (p2 != null) {
throw new AssertionError("Call 2: expected null (no new chunks), got " + p2);
}
Asserts.assertNull(p2, "Call 2: expected null (no new chunks), got " + p2);
// Call 3: still no new files. This confirms call 2 did not wipe pathLookup, making all files look "new" again.
Path p3 = rf.firstPath(0, false);
if (p3 != null) {
throw new AssertionError(
"Call 3: expected null (no new chunks), got " + p3
+ " — pathLookup is oscillating between populated and empty");
}
Asserts.assertNull(p3, "Call 3: expected null (no new chunks), got " + p3
+ " — pathLookup is oscillating between populated and empty");
}
private static void createChunkFile(Path dir, String name) throws Exception {