Improve D&D validation reliability

internal/modules/dnd/extract/enemyevents/extractor_test.go

@@ -59,14 +59,14 @@ func TestExtractMapsEnemyEventsInSourceOrder(t *testing.T) {
 
 func TestExtractPreservesSemanticCandidatesAndResponseOwnership(t *testing.T) {
 	client := &fakeEnemyEventsLLMClient{response: extractionResponse{Events: []enemyEventResponse{{
-		Name: " ", Kind: "unsupported", SourceRefs: []enemySourceRefResponse{{StartUnitID: 99, EndUnitID: 0}},
+		Name: " ", Kind: "engaged", SourceRefs: []enemySourceRefResponse{{StartUnitID: 99, EndUnitID: 0}},
 	}}}}
 	result, err := newEnemyExtractor(t, client).Extract(context.Background(), enemyExtractionRequest(t))
 	if err != nil {
 		t.Fatal(err)
 	}
 	event := result.Value.Events[0]
-	if event.Name != " " || event.Kind != "unsupported" || event.SourceRefs[0] != (source.SourceRef{SourceID: "combat-session", StartUnitID: 99}) {
+	if event.Name != " " || event.Kind != "engaged" || event.SourceRefs[0] != (source.SourceRef{SourceID: "combat-session", StartUnitID: 99}) {
 		t.Fatalf("semantic candidate = %#v", event)
 	}
 	result.Value.Events[0].SourceRefs[0].StartUnitID = 7

internal/modules/dnd/extract/enemyevents/schema_test.go

@@ -7,6 +7,8 @@ import (
 	"testing"
 
 	"github.com/santhosh-tekuri/jsonschema/v6"
+
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 )
 
 func TestResponseSchemaDefinesPrivateStructuralBoundary(t *testing.T) {
@@ -28,13 +30,12 @@ func TestResponseSchemaDefinesPrivateStructuralBoundary(t *testing.T) {
 	semantic := validEnemyResponse()
 	event := semantic["events"].([]any)[0].(map[string]any)
 	event["name"] = ""
-	event["kind"] = "unsupported"
 	ref := event["source_refs"].([]any)[0].(map[string]any)
 	ref["start_unit_id"] = 0
 	ref["end_unit_id"] = -1
 	content, err = json.Marshal(semantic)
 	if err != nil || validateEnemySchema(content, schema.JSONSchema) != nil {
-		t.Fatalf("validator-owned semantics were rejected: %v", err)
+		t.Fatalf("non-categorical validator-owned semantics were rejected: %v", err)
 	}
 }
 
@@ -46,6 +47,7 @@ func TestResponseSchemaRejectsInvalidStructure(t *testing.T) {
 	for _, mutate := range []func(map[string]any){
 		func(event map[string]any) { delete(event, "name") },
 		func(event map[string]any) { event["kind"] = 1 },
+		func(event map[string]any) { event["kind"] = "unsupported" },
 		func(event map[string]any) { event["unexpected"] = true },
 		func(event map[string]any) { event["source_refs"].([]any)[0].(map[string]any)["source_id"] = "session" },
 	} {
@@ -70,6 +72,24 @@ func TestResponseSchemaRejectsInvalidStructure(t *testing.T) {
 	}
 }
 
+func TestResponseSchemaAcceptsEverySupportedKind(t *testing.T) {
+	schema, err := loadResponseSchema()
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, kind := range []string{string(dnd.EnemyEventKindEngaged), string(dnd.EnemyEventKindKilled), string(dnd.EnemyEventKindFled), string(dnd.EnemyEventKindCaptured), string(dnd.EnemyEventKindIncapacitated)} {
+		candidate := validEnemyResponse()
+		candidate["events"].([]any)[0].(map[string]any)["kind"] = kind
+		content, err := json.Marshal(candidate)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := validateEnemySchema(content, schema.JSONSchema); err != nil {
+			t.Fatalf("supported enemy-event kind %q was rejected: %v", kind, err)
+		}
+	}
+}
+
 func validEnemyResponse() map[string]any {
 	return map[string]any{"events": []any{map[string]any{
 		"name": "Ashfang", "kind": "engaged", "source_refs": []any{map[string]any{"start_unit_id": 1, "end_unit_id": 1}},