Compare commits

...
2 Commits
Author SHA1 Message Date
dmg cee4690be9 fix(great-sword): stabilize transferred recovery test
Release / release (push) Successful in 19m38s
2026-09-27 14:16:58 -04:00
dmg 9ed5dea830 fix(events): avoid transient pending files in JSONL tests
Release / release (push) Failing after 10m47s
2026-09-27 13:55:31 -04:00
2 changed files with 48 additions and 4 deletions

No files matched your search

@@ -701,12 +701,39 @@ class FantasyStickLifecycleNativeTest {
}
}
@Test void nativeJsonlReaderSeesExportedUtcSegmentsButNotTransientPendingArea() throws Exception {
var root=data.resolve("events");
var first=java.nio.file.Files.createDirectories(root.resolve("2026-09-27"));
var second=java.nio.file.Files.createDirectories(root.resolve("2026-09-28"));
var pending=java.nio.file.Files.createDirectories(root.resolve("pending"));
java.nio.file.Files.writeString(first.resolve("events-first-0.jsonl"),"{\"id\":\"first\"}\n");
java.nio.file.Files.writeString(second.resolve("events-second-0.jsonl"),"{\"id\":\"second\"}\n");
// This is never an exported segment, even if a transient file resembles one.
java.nio.file.Files.writeString(pending.resolve("decoy.jsonl"),"{\"id\":\"pending\"}\n");
java.nio.file.Files.writeString(pending.resolve("in-flight.pending"),"uncommitted");
assertEquals(List.of("first","second"),localRecords(data).stream()
.map(record->record.get("id").getAsString()).sorted().toList());
java.nio.file.Files.writeString(second.resolve("events-second-0.jsonl"),"{\"broken\":\n");
assertThrows(com.google.gson.JsonParseException.class,()->localRecords(data),
"a malformed exported record must not be hidden by excluding pending files");
}
private static java.util.List<com.google.gson.JsonObject> localRecords(Path directory) throws IOException {
var events = new java.util.ArrayList<com.google.gson.JsonObject>();
try (var files = java.nio.file.Files.walk(directory.resolve("events"))) {
for (var path : files.filter(p -> p.getFileName().toString().endsWith(".jsonl")).toList())
for (var line : java.nio.file.Files.readAllLines(path))
if (!line.isBlank()) events.add(com.google.gson.JsonParser.parseString(line).getAsJsonObject());
// Exported segments live directly under UTC-date directories. Never traverse
// pending/: its files can disappear while the asynchronous writer exports them.
try (var dates = java.nio.file.Files.list(directory.resolve("events"))) {
for (var date : dates.filter(java.nio.file.Files::isDirectory)
.filter(p -> p.getFileName().toString().matches("\\d{4}-\\d{2}-\\d{2}"))
.toList()) {
try (var segments = java.nio.file.Files.list(date)) {
for (var path : segments.filter(java.nio.file.Files::isRegularFile)
.filter(p -> p.getFileName().toString().startsWith("events-")
&& p.getFileName().toString().endsWith(".jsonl")).toList())
for (var line : java.nio.file.Files.readAllLines(path))
if (!line.isBlank()) events.add(com.google.gson.JsonParser.parseString(line).getAsJsonObject());
}
}
}
return events;
}
@@ -483,6 +483,11 @@ class GreatSwordNativeTest {
@Test void restartAndDifferentHolderCannotReapplyACompletedChargedStrike() throws Exception {
org.bukkit.inventory.ItemStack sheet;
java.time.Instant persistedDeadline;
java.util.UUID characterId;
// This scenario checks an unexpired persisted recovery, not the packaged
// 0.75-second wall-clock boundary (covered by the fixed-clock test below).
java.nio.file.Files.writeString(data.resolve("config.yml"),"great-sword-recovery-seconds: 600\n");
try (var f = new FantasyStickLifecycleNativeTest.Fixture(data)) {
f.plugin.setEnabled(true);
var a = new FantasyStickLifecycleNativeTest.Actor(data); withGreatSword(data, a, 12);
@@ -502,6 +507,12 @@ class GreatSwordNativeTest {
f.dispatcher.accept(new io.papermc.paper.event.player.PrePlayerAttackEntityEvent(a.player, target, true));
PartyBookNativeTest.drain(f); PartyBookNativeTest.drain(f);
verify(target, times(1)).damage(anyDouble(), any(org.bukkit.damage.DamageSource.class));
characterId=a.core.record.id();
var stored=(games.dmg.fantasystick.persistence.CharacterStorage)
FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"characters");
persistedDeadline=stored.find(characterId).join().orElseThrow().cooldowns().get("great_sword");
assertTrue(persistedDeadline.isAfter(java.time.Instant.now().plusSeconds(300)),
"This restart/transfer check must still be before its acknowledged recovery deadline");
sheet = a.core.inventory.getItemInOffHand().clone();
a.core.inventory.setItemInOffHand(null); f.changed(a); PartyBookNativeTest.drain(f); f.awaitCharacterAndReceipt(a);
f.plugin.setEnabled(false);
@@ -511,6 +522,12 @@ class GreatSwordNativeTest {
var b = new FantasyStickLifecycleNativeTest.Actor(data);
b.core.inventory.setItemInOffHand(sheet);
f.players.put(b.core.id, b.player); f.activate(b);
var restored=(games.dmg.fantasystick.persistence.CharacterStorage)
FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"characters");
assertEquals(persistedDeadline,restored.find(characterId).join().orElseThrow()
.cooldowns().get("great_sword"));
assertTrue(persistedDeadline.isAfter(java.time.Instant.now().plusSeconds(300)),
"The transferred holder must attack before the same persisted recovery expires");
when(b.player.getAttackCooldown()).thenReturn(1.0f);
var target = mock(org.bukkit.entity.LivingEntity.class);
when(target.getUniqueId()).thenReturn(java.util.UUID.randomUUID());