diff --git a/hold_test.go b/hold_test.go index 8f375b5..8efadfe 100644 --- a/hold_test.go +++ b/hold_test.go @@ -232,7 +232,7 @@ func TestACalcOperandIsHeldAgainstEveryRoute(t *testing.T) { } for name, c := range rejected { _, err := New(WithoutShippedData(), WithDataPath(writeData(t, c.files))) - if err == nil || !strings.Contains(err.Error(), "a {calc()} also reads") { + if err == nil || !strings.Contains(err.Error(), "holds to one draw for this expansion; drop ") { t.Errorf("%s: New = %v, want the second route to the operand rejected", name, err) continue } diff --git a/inline_test.go b/inline_test.go index c908c50..c46920c 100644 --- a/inline_test.go +++ b/inline_test.go @@ -110,7 +110,8 @@ func TestFakeTemplateErrors(t *testing.T) { {`{"format":"x"}`, "is a string"}, {`{/misc.territory} {/misc.territory.alpha2}`, "{/misc.territory} renders its own draw of what {/misc.territory.alpha2} reads a path through; name the fields you want instead, or move {/misc.territory.alpha2} into a field with a drawGroup"}, {`{"format":"{/misc.territory.alpha2} {x}","x":"{/misc.territory}"}`, "renders its own draw of what"}, - {`{/misc.territory} {/misc.territory} {/misc.territory.alpha2}`, "{/misc.territory} renders its own draw of what {/misc.territory.alpha2} reads"}, + {`{/misc.territory} {/misc.territory} {/misc.territory.alpha2}`, "{/misc.territory} renders its own draw of what {/misc.territory.alpha2} reads a path through; name the fields you want instead, or move {/misc.territory.alpha2} into a field with a drawGroup"}, + {`{"format":"{uppercase(/misc.territory)} {y}","y":"{/misc.territory}"}`, `{y} renders "/misc.territory", which {uppercase(/misc.territory)} holds to one draw for this expansion; drop {y}, or write {/misc.territory} in this format to read that draw`}, {`{"format":"{/misc.territory.alpha2}","drawGroup":"g"}`, "nothing can reference"}, } { _, err := f.FakeTemplate(c.input)