cue: remove duplicate test code

The removed code was a duplicated in builtin_test
(package cue_test) and build_test (package cue).
It can be removed by moving build_test to package cue_test.

Some additional simplifications.

Signed-off-by: Marcel van Lohuizen <[email protected]>

Change-Id: I72682ab5bf5f2cdb4e2f7e3a63950daaab82caf4
Signed-off-by: Marcel van Lohuizen <[email protected]>
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/530898
Reviewed-by: Paul Jolly <[email protected]>

Author: mpvl

cue/build.go

@@ -117,14 +117,8 @@ func (r *hiddenRuntime) Build(p *build.Instance) (*Instance, error) {
 	return r.complete(p, v)
 }
 
-// Build creates one Instance for each build.Instance. A returned Instance may
-// be incomplete, in which case its Err field is set.
-//
-// Example:
-//	inst := cue.Build(load.Instances(args))
-//
-// Deprecated: use Context.BuildInstances. The use of Instance is being phased
-// out.
+// Deprecated: use cuecontext.Context.BuildInstances. The use of Instance is
+// being phased out.
 func Build(instances []*build.Instance) []*Instance {
 	if len(instances) == 0 {
 		panic("cue: list of instances must not be empty")

cue/build_test.go

@@ -12,16 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cue
+package cue_test
 
 import (
 	"fmt"
 	"testing"
 
+	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/ast"
 	"cuelang.org/go/cue/build"
+	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/token"
 	"cuelang.org/go/internal/core/debug"
+	"cuelang.org/go/internal/value"
 )
 
 func TestFromExpr(t *testing.T) {
@@ -40,12 +43,12 @@ func TestFromExpr(t *testing.T) {
 	}}
 	for _, tc := range testCases {
 		t.Run("", func(t *testing.T) {
-			r := &Runtime{}
-			inst, err := r.CompileExpr(tc.expr)
-			if err != nil {
+			r := cuecontext.New()
+			v := r.BuildExpr(tc.expr)
+			if err := v.Err(); err != nil {
 				t.Fatal(err)
 			}
-			if got := fmt.Sprint(inst.Value()); got != tc.out {
+			if got := fmt.Sprint(v); got != tc.out {
 				t.Errorf("\n got: %v; want %v", got, tc.out)
 			}
 		})
@@ -194,13 +197,14 @@ func TestBuild(t *testing.T) {
 	}}
 	for _, tc := range testCases {
 		t.Run("", func(t *testing.T) {
-			insts := Build(makeInstances(tc.instances))
+			insts := cue.Build(makeInstances(tc.instances))
 			var got string
 			if err := insts[0].Err; err != nil {
 				got = err.Error()
 			} else {
 				cfg := &debug.Config{Compact: true}
-				got = debug.NodeString(insts[0].index, insts[0].Value().v, cfg)
+				r, v := value.ToInternal(insts[0].Value())
+				got = debug.NodeString(r, v, cfg)
 			}
 			if got != tc.emit {
 				t.Errorf("\n got: %s\nwant: %s", got, tc.emit)

cue/builtin_test.go

@@ -19,8 +19,6 @@ import (
 	"testing"
 
 	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/build"
-	"cuelang.org/go/cue/token"
 
 	_ "cuelang.org/go/pkg"
 )
@@ -167,52 +165,3 @@ func TestSingleBuiltin(t *testing.T) {
 		})
 	}
 }
-
-type builder struct {
-	ctxt    *build.Context
-	imports map[string]*bimport
-}
-
-func (b *builder) load(pos token.Pos, path string) *build.Instance {
-	bi := b.imports[path]
-	if bi == nil {
-		return nil
-	}
-	return b.build(bi)
-}
-
-type bimport struct {
-	path  string // "" means top-level
-	files []string
-}
-
-func makeInstances(insts []*bimport) (instances []*build.Instance) {
-	b := builder{
-		ctxt:    build.NewContext(),
-		imports: map[string]*bimport{},
-	}
-	for _, bi := range insts {
-		if bi.path != "" {
-			b.imports[bi.path] = bi
-		}
-	}
-	for _, bi := range insts {
-		if bi.path == "" {
-			instances = append(instances, b.build(bi))
-		}
-	}
-	return
-}
-
-func (b *builder) build(bi *bimport) *build.Instance {
-	path := bi.path
-	if path == "" {
-		path = "dir"
-	}
-	p := b.ctxt.NewInstance(path, b.load)
-	for i, f := range bi.files {
-		_ = p.AddFile(fmt.Sprintf("file%d.cue", i), f)
-	}
-	_ = p.Complete()
-	return p
-}

cue/types_test.go

@@ -33,14 +33,16 @@ import (
 	"cuelang.org/go/internal/core/debug"
 )
 
-func getInstance(t *testing.T, body ...string) *Instance {
+func getInstance(t *testing.T, body string) *Instance {
 	t.Helper()
 
-	insts := Build(makeInstances([]*bimport{{files: body}}))
-	if insts[0].Err != nil {
-		t.Fatalf("unexpected parse error: %v", insts[0].Err)
+	var r Runtime // TODO: use Context and return Value
+
+	inst, err := r.Compile("foo", body)
+	if err != nil {
+		t.Fatalf("unexpected parse error: %v", err)
 	}
-	return insts[0]
+	return inst
 }
 
 func TestAPI(t *testing.T) {