cue/load: add test case for issue 3306

This adds a test case for using `cue/load.Config.PkgName` as `*`, showing extra files and instances that should not be present. This behavior will be fixed in a subsequent CL. For #3306 Signed-off-by: Roger Peppe <[email protected]> Change-Id: Ibf19e020ecdfa58e6841d517f5fcf0282615504a Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1198685 Reviewed-by: Daniel Martí <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
cue-lang · Jul 31, 2024 · f472fd2 · f472fd2
1 parent 88306e2
commit f472fd2
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 2 deletions.
diff --git a/cue/load/loader_test.go b/cue/load/loader_test.go
@@ -564,8 +564,105 @@ path:   ""
 module: ""
 root:   ""
 dir:    ""
-display:""`},
-	}
+display:""`}, {
+		// This test checks that files in parent directories
+		// do not result in irrelevant instances appearing
+		// in the result of Instances.
+		name: "Issue3306",
+		cfg: &Config{
+			Dir:     testdataDir,
+			Package: "*",
+		},
+		args: []string{"./issue3306/..."},
+		want: `path:   mod.test/test/issue3306@v0:_
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306
+display:./issue3306
+files:
+    $CWD/testdata/testmod/anon.cue
+
+path:   mod.test/test/issue3306@v0:test
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306
+display:./issue3306
+files:
+    $CWD/testdata/testmod/test.cue
+
+path:   mod.test/test/issue3306@v0:x
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306
+display:./issue3306
+files:
+    $CWD/testdata/testmod/issue3306/x.cue
+
+path:   mod.test/test/issue3306/a@v0:_
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/a
+display:./issue3306/a
+files:
+    $CWD/testdata/testmod/anon.cue
+
+path:   mod.test/test/issue3306/a@v0:a
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/a
+display:./issue3306/a
+files:
+    $CWD/testdata/testmod/issue3306/a/a.cue
+
+path:   mod.test/test/issue3306/a@v0:b
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/a
+display:./issue3306/a
+files:
+    $CWD/testdata/testmod/issue3306/a/b.cue
+
+path:   mod.test/test/issue3306/a@v0:test
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/a
+display:./issue3306/a
+files:
+    $CWD/testdata/testmod/test.cue
+
+path:   mod.test/test/issue3306/a@v0:x
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/a
+display:./issue3306/a
+files:
+    $CWD/testdata/testmod/issue3306/x.cue
+    $CWD/testdata/testmod/issue3306/a/x.cue
+
+path:   mod.test/test/issue3306/x@v0:_
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/x
+display:./issue3306/x
+files:
+    $CWD/testdata/testmod/anon.cue
+
+path:   mod.test/test/issue3306/x@v0:test
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/x
+display:./issue3306/x
+files:
+    $CWD/testdata/testmod/test.cue
+
+path:   mod.test/test/issue3306/x@v0:x
+module: mod.test/test@v0
+root:   $CWD/testdata/testmod
+dir:    $CWD/testdata/testmod/issue3306/x
+display:./issue3306/x
+files:
+    $CWD/testdata/testmod/issue3306/x.cue
+    $CWD/testdata/testmod/issue3306/x/x.cue`}}
 	tdtest.Run(t, testCases, func(t *tdtest.T, tc *loadTest) {
 		pkgs := Instances(tc.args, tc.cfg)
 

diff --git a/cue/load/testdata/testmod/issue3306/a/a.cue b/cue/load/testdata/testmod/issue3306/a/a.cue
@@ -0,0 +1,3 @@
+package a
+
+a: 4
diff --git a/cue/load/testdata/testmod/issue3306/a/b.cue b/cue/load/testdata/testmod/issue3306/a/b.cue
@@ -0,0 +1,3 @@
+package b
+
+b: 3
diff --git a/cue/load/testdata/testmod/issue3306/a/x.cue b/cue/load/testdata/testmod/issue3306/a/x.cue
@@ -0,0 +1 @@
+package x
diff --git a/cue/load/testdata/testmod/issue3306/x.cue b/cue/load/testdata/testmod/issue3306/x.cue
@@ -0,0 +1,3 @@
+package x
+
+x: 5
diff --git a/cue/load/testdata/testmod/issue3306/x/x.cue b/cue/load/testdata/testmod/issue3306/x/x.cue
@@ -0,0 +1 @@
+package x