Harden CH-006 event-priority evidence

Author: flemming-n-larsen

compat-test/compat_test.py

@@ -493,6 +493,13 @@ def summarize_worker_result(out_file, returncode, output, timed_out, elapsed, en
 def ensure_tr_lib(opts, staging):
     lib_dir = staging / "lib"
     lib_dir.mkdir(parents=True, exist_ok=True)
+    # A previous run may have staged a different Bot API version. The generated boot scripts
+    # use a wildcard classpath, so retaining both versions silently selects the wrong one.
+    for entry in list(lib_dir.iterdir()):
+        if entry.is_dir():
+            shutil.rmtree(entry, ignore_errors=True)
+        else:
+            entry.unlink(missing_ok=True)
     for jar in (opts.bridge_api_jar, opts.bot_api_jar, opts.wrapper_jar):
         src = Path(jar)
         dst = lib_dir / src.name

compat-test/conformance-robots/conformance/probes/EventPriorityProbe.java

@@ -11,6 +11,9 @@ public class EventPriorityProbe extends AdvancedRobot {
 
     @Override
     public void run() {
+        // Establish a scan control before the wall-handler window; the full sweep reaches the
+        // stationary sample.Target regardless of the engines' unseeded starting positions.
+        turnRadarRight(360);
         while (true) {
             ahead(10);
         }
@@ -28,6 +31,7 @@ public void onHitWall(HitWallEvent event) {
 
     @Override
     public void onScannedRobot(ScannedRobotEvent event) {
+        out.println("ScanObserved!!!");
         if (wallHandlerActive) {
             out.println("ScannedDuringWallHandler!!!");
         }

conformance-test/src/test/java/dev/robocode/tankroyale/bridge/conformance/EventPriorityConformanceTest.java

@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Acceptance evidence for EVT-015 — the classic event-priority filter expectation.
@@ -17,17 +18,22 @@ class EventPriorityConformanceTest extends ConformanceTestBase {
 
     private static final String ROBOT = "conformance.probes.EventPriorityProbe";
     private static final String ENEMY = "sample.Target";
+    private static final String SCAN_OBSERVED = "ScanObserved!!!";
     private static final String SCANNED = "ScannedDuringWallHandler!!!";
     private static final java.nio.file.Path SOURCE = ConformanceHarness.repoRoot()
             .resolve("compat-test/conformance-robots/conformance/probes/EventPriorityProbe.java");
 
     @Test
     @DisplayName("EVT-015: a lower-priority scan is suppressed on both engines")
     void testEVT015_IntegrationPositive_LowerPriorityScanIsSuppressedOnBothEngines() {
-        assertOnBothEngines(ROBOT, SOURCE, ENEMY, (outcome, engine) ->
+        assertOnBothEngines(ROBOT, SOURCE, ENEMY, (outcome, engine) -> {
+                assertTrue(outcome.anyConsoleContains(SCAN_OBSERVED),
+                        () -> "the priority probe observed no scan on " + engine
+                                + " (" + outcome.summary() + ")");
                 assertFalse(outcome.anyConsoleContains(SCANNED),
                         () -> "the lower-priority scan handler ran on " + engine
-                                + " (" + outcome.summary() + ")"));
+                                + " (" + outcome.summary() + ")");
+        });
     }
 
     @Test
@@ -36,6 +42,14 @@ void testEVT015_IntegrationNegative_BridgeDoesNotReportAScanClassicDidNotSee() {
         BattleOutcome classic = outcomeFor(Engine.CLASSIC, ROBOT, SOURCE, ENEMY);
         BattleOutcome bridge = outcomeFor(Engine.BRIDGE, ROBOT, SOURCE, ENEMY);
 
+        assertTrue(classic.completed(), () -> "the classic priority-probe battle did not complete ("
+                + classic.summary() + ")");
+        assertTrue(bridge.completed(), () -> "the bridge priority-probe battle did not complete ("
+                + bridge.summary() + ")");
+        assertTrue(classic.anyConsoleContains(SCAN_OBSERVED),
+                () -> "the classic priority probe observed no scan (" + classic.summary() + ")");
+        assertTrue(bridge.anyConsoleContains(SCAN_OBSERVED),
+                () -> "the bridge priority probe observed no scan (" + bridge.summary() + ")");
         assertFalse(classic.anyConsoleContains(SCANNED),
                 () -> "the classic priority-probe baseline reported a scan ("
                         + classic.summary() + ")");