ast/astutil: add test for resolving imports with major version suffix

Currently astutil.Resolve does not understand major version suffixes, leading to problems with round-tripping files through astutil.Sanitize. We a test for this to be fixed by a subsequent CL. Signed-off-by: Roger Peppe <[email protected]> Change-Id: I89e49348cc357cc84ffb059facfa70e632bfdf4f Dispatch-Trailer: {"type":"trybot","CL":1207986,"patchset":6,"ref":"refs/changes/86/1207986/6","targetBranch":"master"}
cue-lang · Jan 30, 2025 · b94d842 · b94d842
1 parent 0434f70
commit b94d842
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/cue/ast/astutil/resolve_test.go b/cue/ast/astutil/resolve_test.go
@@ -32,7 +32,7 @@ func TestResolve(t *testing.T) {
 	}
 
 	test.Run(t, func(t *cuetxtar.Test) {
-		a := t.Instance()
+		a := t.RawInstances()[0]
 
 		for _, f := range a.Files {
 			if filepath.Ext(f.Filename) != ".cue" {

diff --git a/cue/ast/astutil/testdata/resolve/import.txtar b/cue/ast/astutil/testdata/resolve/import.txtar
@@ -0,0 +1,19 @@
+-- in.cue --
+import (
+	"foo.com/bar"
+	"foo.com/bar:baz"
+	"other.org/p@v1"
+	"other.org/p@v2:q"
+)
+refs: [
+	bar,
+	baz,
+	p,
+	q,
+]
+-- out/resolve/in --
+7[refs]: Scope: 0[<nil>] Node: 0[]
+8[bar]:  Scope: 0[<nil>] Node: 2["foo.com/bar"]
+9[baz]:  Scope: 0[<nil>] Node: 3["foo.com/bar:baz"]
+10[p]:   Scope: 0[<nil>] Node: 0[]
+11[q]:   Scope: 0[<nil>] Node: 5["other.org/p@v2:q"]