From 73fa0130114a38fc550a7f67a9c1f315b485d17f Mon Sep 17 00:00:00 2001 From: Lilleman auf Larv Date: Tue, 29 Sep 2026 20:16:48 +0200 Subject: [PATCH] Survey tests: reach a table's cells through its own format, the shape New lets through --- readsurvey_test.go | 4 ++-- table_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/readsurvey_test.go b/readsurvey_test.go index a8733b0..c2d0098 100644 --- a/readsurvey_test.go +++ b/readsurvey_test.go @@ -109,7 +109,7 @@ func TestReadSurveyWalksACellByEveryRoute(t *testing.T) { fsys := fstest.MapFS{ "g.json": {Data: []byte(`{"format":"{/x.v}","drawGroup":"g2"}`)}, "r.json": {Data: []byte(`"{/g} {/x}"`)}, - "x.json": {Data: []byte(`{"format":"{/g}","rows":"x.tsv","key":"code"}`)}, + "x.json": {Data: []byte(`{"format":"{v}","rows":"x.tsv","key":"code"}`)}, "x.tsv": {Data: []byte("code\tv\n1\t{/z}\n2\t{/z.a}\n")}, "z.json": {Data: []byte(`{"format":"{a}","a":"hi"}`)}, } @@ -133,7 +133,7 @@ func TestReadSurveyWalksACellByEveryRoute(t *testing.T) { whole = whole || read.at.wholePins.used > 0 } if !pinned || !whole { - t.Errorf("{/z} gathered under a pinned row %v and a whole read's row %v, want both: {/g} reaches x's cells from the root and from inside {/x}", pinned, whole) + t.Errorf("{/z} gathered under a pinned row %v and a whole read's row %v, want both: {/g} reaches x's cells from the root, and {/x} renders them whole", pinned, whole) } } diff --git a/table_test.go b/table_test.go index 38a0e86..7af0cc4 100644 --- a/table_test.go +++ b/table_test.go @@ -1002,7 +1002,7 @@ func TestEnteredRowsAgreeWithPinning(t *testing.T) { var none pinSet for _, entered := range tables { for row := 0; row < entered.rowCount(); row++ { - whole := surveyAt{wholeTable: entered} + whole := surveyAt{} whole.wholePins.add(entered, row) s := none.entered(entered, row) for _, cand := range tables { @@ -1022,7 +1022,7 @@ func TestEnteredRowsAgreeWithPinning(t *testing.T) { if alternatives(whole, candAt) || alternatives(candAt, whole) { t.Errorf("%s rendered whole is an alternative to %s pinned, though the whole draw ignores the pin", entered.selectorSpelling(row), cand.selectorSpelling(cr)) } - other := surveyAt{wholeTable: cand} + other := surveyAt{} other.wholePins.add(cand, cr) if want := cand == entered && cr != row; alternatives(whole, other) != want { t.Errorf("alternatives(%s, %s), both rendered whole, = %v, want %v", entered.selectorSpelling(row), cand.selectorSpelling(cr), !want, want)