Update for testing functions.

docs/testing.md

@@ -0,0 +1,79 @@
+# Testing Functions
+
+`fn` has testing built in that allows you to create inputs and expected outputs and verify the expected output with actual output. 
+
+## Write a Test File
+
+Create a file called `test.json` in your functions directory (beside your `func.yaml` file). Here's a simple example:
+
+```json
+{
+    "tests": [
+        {
+            "input": {
+                "body": {
+                    "name": "Johnny"
+                }
+            },
+            "output": {
+                "body": {
+                    "message": "Hello Johnny"
+                }
+            }
+        },
+        {
+            "input": {
+                "body": ""
+            },
+            "output": {
+                "body": {
+                    "message": "Hello World"
+                }
+            }
+        }
+    ]
+}
+```
+
+The example above has two tests, one with the following input:
+
+```json
+{
+    "name": "Johnny"
+}
+```
+
+and a second one with no input. 
+
+The first one is expected to return a json response with the following:
+
+```json
+{
+    "message": "Hello Johnny"
+}
+```
+
+And the second should return:
+
+```json
+{
+    "message": "Hello World"
+}
+```
+
+## Run Tests
+
+This is simply running:
+
+```sh
+fn test
+```
+
+in your function directory. 
+
+You can also test against a remote `fn` server by using the `--remote` flag. eg:
+
+```sh
+fn test --remote myapp
+```
+

examples/tutorial/hello/go/func.go

@@ -14,7 +14,10 @@ type Person struct {
 func main() {
 	p := &Person{Name: "World"}
 	json.NewDecoder(os.Stdin).Decode(p)
-	fmt.Printf("Hello %v!\n", p.Name)
+	// fmt.Printf("Hello %v!\n", p.Name)
+	mapD := map[string]string{"message": fmt.Sprintf("Hello %s", p.Name)}
+	mapB, _ := json.Marshal(mapD)
+	fmt.Println(string(mapB))
 
 	log.Println("---> stderr goes to the server logs.")
 	log.Println("---> LINE 2")

examples/tutorial/hello/go/test.json

@@ -0,0 +1,26 @@
+{
+    "tests": [
+        {
+            "input": {
+                "body": {
+                    "name": "Johnny"
+                }
+            },
+            "output": {
+                "body": {
+                    "message": "Hello Johnny"
+                }
+            }
+        },
+        {
+            "input": {
+                "body": ""
+            },
+            "output": {
+                "body": {
+                    "message": "Hello World"
+                }
+            }
+        }
+    ]
+}

fn/funcfile.go

@@ -23,10 +23,17 @@ var (
 	errUnexpectedFileFormat = errors.New("unexpected file format for function file")
 )
 
+type inputMap struct {
+	Body interface{}
+}
+type outputMap struct {
+	Body interface{}
+}
+
 type fftest struct {
 	Name   string            `yaml:"name,omitempty" json:"name,omitempty"`
-	In   *string           `yaml:"in,omitempty" json:"in,omitempty"`
+	Input  *inputMap         `yaml:"input,omitempty" json:"input,omitempty"`
-	Out  *string           `yaml:"out,omitempty" json:"out,omitempty"`
+	Output *outputMap        `yaml:"outoutput,omitempty" json:"output,omitempty"`
 	Err    *string           `yaml:"err,omitempty" json:"err,omitempty"`
 	Env    map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
 }

fn/main.go

@@ -79,6 +79,7 @@ GLOBAL OPTIONS:
 		lambda(),
 		version(),
 		calls(),
+		testfn(),
 	}
 	app.Commands = append(app.Commands, aliasesFn()...)
 

fn/testfn.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/url"
@@ -12,10 +13,15 @@ import (
 	"time"
 
 	functions "github.com/funcy/functions_go"
+	"github.com/onsi/gomega"
 	"github.com/urfave/cli"
 	"gitlab-odx.oracle.com/odx/functions/fn/client"
 )
 
+type testStruct struct {
+	Tests []fftest `yaml:"tests,omitempty" json:"tests,omitempty"`
+}
+
 func testfn() cli.Command {
 	cmd := testcmd{RoutesApi: functions.NewRoutesApi()}
 	return cli.Command{
@@ -35,11 +41,11 @@ type testcmd struct {
 
 func (t *testcmd) flags() []cli.Flag {
 	return []cli.Flag{
-		cli.BoolFlag{
+		// cli.BoolFlag{
-			Name:        "b",
+		// 	Name:        "b",
-			Usage:       "build before test",
+		// 	Usage:       "build before test",
-			Destination: &t.build,
+		// 	Destination: &t.build,
-		},
+		// },
 		cli.StringFlag{
 			Name:        "remote",
 			Usage:       "run tests by calling the function on Oracle Functions daemon on `appname`",
@@ -49,23 +55,46 @@ func (t *testcmd) flags() []cli.Flag {
 }
 
 func (t *testcmd) test(c *cli.Context) error {
-	if t.build {
+	gomega.RegisterFailHandler(func(message string, callerSkip ...int) {
-		b := &buildcmd{verbose: true}
+		fmt.Println("In gomega FailHandler:", message)
-		if err := b.build(c); err != nil {
+	})
+
+	// First, build it
+	err := c.App.Command("build").Run(c)
+	if err != nil {
 		return err
 	}
-		fmt.Println()
-	}
 
 	ff, err := loadFuncfile()
 	if err != nil {
 		return err
 	}
 
-	if len(ff.Tests) == 0 {
+	var tests []fftest
+
+	// Look for test.json file too
+	tfile := "test.json"
+	if exists(tfile) {
+		f, err := os.Open(tfile)
+		if err != nil {
+			return fmt.Errorf("could not open %s for parsing. Error: %v", tfile, err)
+		}
+		ts := &testStruct{}
+		err = json.NewDecoder(f).Decode(ts)
+		if err != nil {
+			fmt.Println("Invalid tests.json file:", err)
+			return err
+		}
+		tests = ts.Tests
+	} else {
+		tests = ff.Tests
+	}
+	if len(tests) == 0 {
 		return errors.New("no tests found for this function")
 	}
 
+	fmt.Printf("Running %v tests...", len(tests))
+
 	target := ff.FullName()
 	runtest := runlocaltest
 	if t.remote != "" {
@@ -86,18 +115,16 @@ func (t *testcmd) test(c *cli.Context) error {
 		runtest = runremotetest
 	}
 
-	var foundErr bool
+	errorCount := 0
 	fmt.Println("running tests on", ff.FullName(), ":")
-	for _, tt := range ff.Tests {
+	for i, tt := range tests {
+		fmt.Printf("\nTest %v\n", i+1)
 		start := time.Now()
 		var err error
-		err = runtest(target, tt.In, tt.Out, tt.Err, tt.Env)
+		err = runtest(target, tt.Input, tt.Output, tt.Err, tt.Env)
-
-		fmt.Print("\t - ", tt.Name, " (", time.Since(start), "): ")
-
 		if err != nil {
-			fmt.Println()
+			fmt.Print("FAILED")
-			foundErr = true
+			errorCount += 1
 			scanner := bufio.NewScanner(strings.NewReader(err.Error()))
 			for scanner.Scan() {
 				fmt.Println("\t\t", scanner.Text())
@@ -106,24 +133,29 @@ func (t *testcmd) test(c *cli.Context) error {
 				fmt.Fprintln(os.Stderr, "reading test result:", err)
 				break
 			}
-			continue
+		} else {
+			fmt.Print("PASSED")
 		}
+		fmt.Println(" - ", tt.Name, " (", time.Since(start), ")")
 
-		fmt.Println("OK")
 	}
-
+	fmt.Printf("\n%v tests passed, %v tests failed.\n", len(tests)-errorCount, errorCount)
-	if foundErr {
+	if errorCount > 0 {
-		return errors.New("errors found")
+		return errors.New("tests failed, errors found")
 	}
 	return nil
 }
 
-func runlocaltest(target string, in, expectedOut, expectedErr *string, env map[string]string) error {
+func runlocaltest(target string, in *inputMap, expectedOut *outputMap, expectedErr *string, env map[string]string) error {
+	inBytes, _ := json.Marshal(in.Body)
 	stdin := &bytes.Buffer{}
 	if in != nil {
-		stdin = bytes.NewBufferString(*in)
+		stdin = bytes.NewBuffer(inBytes)
 	}
+	expectedB, _ := json.Marshal(expectedOut.Body)
+	expectedString := string(expectedB)
 
+	// TODO: use the same run as `fn run` so we don't have to dupe all the config and env vars that get passed in
 	var stdout, stderr bytes.Buffer
 	var restrictedEnv []string
 	for k, v := range env {
@@ -143,25 +175,30 @@ func runlocaltest(target string, in, expectedOut, expectedErr *string, env map[s
 	out := stdout.String()
 	if expectedOut == nil && out != "" {
 		return fmt.Errorf("unexpected output found: %s", out)
-	} else if expectedOut != nil && *expectedOut != out {
-		return fmt.Errorf("mismatched output found.\nexpected (%d bytes):\n%s\ngot (%d bytes):\n%s\n", len(*expectedOut), *expectedOut, len(out), out)
 	}
-
+	if gomega.Expect(out).To(gomega.MatchJSON(expectedString)) { //  *expectedString != out {
-	err := stderr.String()
+		// PASS!
-	if expectedErr == nil && err != "" {
-		return fmt.Errorf("unexpected error output found: %s", err)
-	} else if expectedErr != nil && *expectedErr != err {
-		return fmt.Errorf("mismatched error output found.\nexpected (%d bytes):\n%s\ngot (%d bytes):\n%s\n", len(*expectedErr), *expectedErr, len(err), err)
-	}
-
 		return nil
+	}
+
+	// don't think we should test error output, it's just for logging
+	// err := stderr.String()
+	// if expectedErr == nil && err != "" {
+	// 	return fmt.Errorf("unexpected error output found: %s", err)
+	// } else if expectedErr != nil && *expectedErr != err {
+	// 	return fmt.Errorf("mismatched error output found.\nexpected (%d bytes):\n%s\ngot (%d bytes):\n%s\n", len(*expectedErr), *expectedErr, len(err), err)
+	// }
+
+	return fmt.Errorf("mismatched output found.\nexpected:\n%s\ngot:\n%s\n", expectedString, out)
 }
 
-func runremotetest(target string, in, expectedOut, expectedErr *string, env map[string]string) error {
+func runremotetest(target string, in *inputMap, expectedOut *outputMap, expectedErr *string, env map[string]string) error {
+	inBytes, _ := json.Marshal(in)
 	stdin := &bytes.Buffer{}
 	if in != nil {
-		stdin = bytes.NewBufferString(*in)
+		stdin = bytes.NewBuffer(inBytes)
 	}
+	expectedString, _ := json.Marshal(expectedOut.Body)
 
 	var stdout bytes.Buffer
 
@@ -181,12 +218,10 @@ func runremotetest(target string, in, expectedOut, expectedErr *string, env map[
 	out := stdout.String()
 	if expectedOut == nil && out != "" {
 		return fmt.Errorf("unexpected output found: %s", out)
-	} else if expectedOut != nil && *expectedOut != out {
-		return fmt.Errorf("mismatched output found.\nexpected (%d bytes):\n%s\ngot (%d bytes):\n%s\n", len(*expectedOut), *expectedOut, len(out), out)
 	}
-
+	if gomega.Expect(out).To(gomega.MatchJSON(expectedString)) { //  *expectedString != out {
-	if expectedErr != nil {
+		// PASS!
-		return fmt.Errorf("cannot process stderr in remote calls")
+		return nil
 	}
 
 	return nil