Merge pull request #8 from gotwarlost/cue-test-fix

Fix bugs in the cue unit tester after the refactor

internal/cuetools/testdata/runtime/impl.cue

@@ -1,7 +1,7 @@
 package runtime
 
 response: desired:resources: main: resource: {
-	foo: request.observed.composite.resource.foo
+	foo: #request.observed.composite.resource.foo
 	bar: "baz"
 }
 

internal/cuetools/testdata/runtime/init.cue

@@ -4,4 +4,4 @@ import(
 	"github.com/crossplane-contrib/function-cue/testdata/runtime/util"
 )
 
-request: util.#RequestSchema
+#request: util.#RequestSchema

internal/cuetools/testdata/runtime/tests/correct.cue

@@ -1,7 +1,7 @@
 @if(correct)
 package tests
 
-request: observed: composite: resource: {
+#request: observed: composite: resource: {
 	foo: "bar"
 }
 

internal/cuetools/testdata/runtime/tests/incorrect.cue

@@ -1,7 +1,7 @@
 @if(incorrect)
 package tests
 
-request: observed: composite: resource: {
+#request: observed: composite: resource: {
 	foo: "foo2"
 }
 

internal/cuetools/testdata/runtime2/impl.cue

@@ -0,0 +1,7 @@
+package runtime
+
+resources: main: resource: {
+	foo: _request.observed.composite.resource.foo
+	bar: "baz"
+}
+

internal/cuetools/testdata/runtime2/init.cue

@@ -0,0 +1,7 @@
+package runtime
+
+import(
+	"github.com/crossplane-contrib/function-cue/testdata/runtime/util"
+)
+
+_request: util.#RequestSchema

internal/cuetools/testdata/runtime2/tests/correct.cue

@@ -0,0 +1,11 @@
+@if(correct)
+package tests
+
+_request: observed: composite: resource: {
+	foo: "bar"
+}
+
+resources: main: resource: {
+		foo: "bar"
+		bar: "baz"
+}

internal/cuetools/testdata/runtime2/tests/incorrect.cue

@@ -0,0 +1,11 @@
+@if(incorrect)
+package tests
+
+_request: observed: composite: resource: {
+	foo: "foo2"
+}
+
+resources: main: resource: {
+		foo: "bar"
+		bar: "baz"
+}

internal/cuetools/testdata/runtime2/util/util.cue

@@ -0,0 +1,3 @@
+package util
+
+#RequestSchema: {...}

internal/cuetools/tester.go

@@ -183,7 +183,7 @@ func (t *Tester) runTest(f *fn.Cue, codeBytes []byte, tag string) (finalErr erro
 		}
 	}()
 
-	requestVar := "request"
+	requestVar := "#request"
 	if t.config.RequestVar != "" {
 		requestVar = t.config.RequestVar
 	}
@@ -199,7 +199,13 @@ func (t *Tester) runTest(f *fn.Cue, codeBytes []byte, tag string) (finalErr erro
 	}
 
 	var expected fnv1beta1.RunFunctionResponse
-	err := evalPackage(t.config.TestPackage, tag, responseVar, &expected)
+	var err error
+	if t.config.LegacyDesiredOnlyResponse {
+		expected.Desired = &fnv1beta1.State{}
+		err = evalPackage(t.config.TestPackage, tag, responseVar, expected.Desired)
+	} else {
+		err = evalPackage(t.config.TestPackage, tag, responseVar, &expected)
+	}
 	if err != nil {
 		return errors.Wrap(err, "evaluate expected")
 	}
@@ -210,12 +216,13 @@ func (t *Tester) runTest(f *fn.Cue, codeBytes []byte, tag string) (finalErr erro
 		return errors.Wrap(err, "evaluate request")
 	}
 
-	actual, err := f.Eval(&req, string(codeBytes), fn.EvalOptions{
+	opts := fn.EvalOptions{
 		RequestVar:          requestVar,
 		ResponseVar:         responseVar,
 		DesiredOnlyResponse: t.config.LegacyDesiredOnlyResponse,
 		Debug:               fn.DebugOptions{Enabled: t.config.Debug},
-	})
+	}
+	actual, err := f.Eval(&req, string(codeBytes), opts)
 	if err != nil {
 		return errors.Wrap(err, "evaluate package with test request")
 	}

internal/cuetools/tester_test.go

@@ -56,7 +56,48 @@ func TestTester(t *testing.T) {
 		Package: "./runtime",
 	})
 	require.NoError(t, err)
-	envDiff := "XP_FUNCTION_CUE_DIFF"
+	envDiff := ExternalDiffEnvVar
+	diffProgram := os.Getenv(envDiff)
+	if diffProgram != "" {
+		err = os.Unsetenv(envDiff) // we expect a specific diff format
+		require.NoError(t, err)
+		defer func() { _ = os.Setenv(envDiff, diffProgram) }()
+	}
+	err = tester.Run()
+	expected := `
+running test tags: correct, incorrect
+> run test "correct"
+PASS correct
+> run test "incorrect"
+diffs found:
+--- expected
++++ actual
+@@ -3,5 +3,5 @@
+     main:
+       resource:
+         bar: baz
+-        foo: bar
++        foo: foo2
+FAIL incorrect: expected did not match actual
+`
+	require.Error(t, err)
+	assert.Equal(t, "1 of 2 tests had errors", err.Error())
+	assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buf.String()))
+}
+
+func TestTesterLegacyOptions(t *testing.T) {
+	fn := chdirCueRoot(t)
+	defer fn()
+	buf, reset := getOutput()
+	defer reset()
+	tester, err := NewTester(TestConfig{
+		Package:                   "./runtime2",
+		RequestVar:                "_request",
+		ResponseVar:               ".",
+		LegacyDesiredOnlyResponse: true,
+	})
+	require.NoError(t, err)
+	envDiff := ExternalDiffEnvVar
 	diffProgram := os.Getenv(envDiff)
 	if diffProgram != "" {
 		err = os.Unsetenv(envDiff) // we expect a specific diff format