Move fuzz env to fuzz_env.go

Author: antonmedv

test/fuzz/fuzz_coverage_test.go

@@ -2,6 +2,7 @@ package fuzz_test
 
 import (
 	_ "embed"
+	"github.com/antonmedv/expr/test/fuzz"
 	"github.com/stretchr/testify/require"
 	"strings"
 	"testing"
@@ -15,28 +16,7 @@ var fuzzCorpus string
 func TestFuzzExpr_Coverage(t *testing.T) {
 	inputs := strings.Split(strings.TrimSpace(fuzzCorpus), "\n")
 
-	var env = map[string]any{
-		"ok":    true,
-		"f64":   .5,
-		"f32":   float32(.5),
-		"i":     1,
-		"i64":   int64(1),
-		"i32":   int32(1),
-		"array": []int{1, 2, 3, 4, 5},
-		"list":  []Foo{{"bar"}, {"baz"}},
-		"foo":   Foo{"bar"},
-		"add":   func(a, b int) int { return a + b },
-		"div":   func(a, b int) int { return a / b },
-		"half":  func(a float64) float64 { return a / 2 },
-		"score": func(a int, x ...int) int {
-			s := a
-			for _, n := range x {
-				s += n
-			}
-			return s
-		},
-		"greet": func(name string) string { return "Hello, " + name },
-	}
+	var env = fuzz.NewEnv()
 
 	for _, code := range inputs {
 		t.Run(code, func(t *testing.T) {
@@ -48,15 +28,3 @@ func TestFuzzExpr_Coverage(t *testing.T) {
 		})
 	}
 }
-
-type Foo struct {
-	Bar string
-}
-
-func (f Foo) String() string {
-	return "foo"
-}
-
-func (f Foo) Qux(s string) string {
-	return f.Bar + s
-}

test/fuzz/fuzz_env.go

@@ -0,0 +1,38 @@
+package fuzz
+
+func NewEnv() map[string]any {
+	return map[string]any{
+		"ok":    true,
+		"f64":   .5,
+		"f32":   float32(.5),
+		"i":     1,
+		"i64":   int64(1),
+		"i32":   int32(1),
+		"array": []int{1, 2, 3, 4, 5},
+		"list":  []Foo{{"bar"}, {"baz"}},
+		"foo":   Foo{"bar"},
+		"add":   func(a, b int) int { return a + b },
+		"div":   func(a, b int) int { return a / b },
+		"half":  func(a float64) float64 { return a / 2 },
+		"score": func(a int, x ...int) int {
+			s := a
+			for _, n := range x {
+				s += n
+			}
+			return s
+		},
+		"greet": func(name string) string { return "Hello, " + name },
+	}
+}
+
+type Foo struct {
+	Bar string
+}
+
+func (f Foo) String() string {
+	return "foo"
+}
+
+func (f Foo) Qux(s string) string {
+	return f.Bar + s
+}

test/fuzz/fuzz_test.go

@@ -18,29 +18,6 @@ func FuzzExpr(f *testing.F) {
 		f.Add(s)
 	}
 
-	var env = map[string]any{
-		"ok":    true,
-		"f64":   .5,
-		"f32":   float32(.5),
-		"i":     1,
-		"i64":   int64(1),
-		"i32":   int32(1),
-		"array": []int{1, 2, 3, 4, 5},
-		"list":  []Foo{{"bar"}, {"baz"}},
-		"foo":   Foo{"bar"},
-		"add":   func(a, b int) int { return a + b },
-		"div":   func(a, b int) int { return a / b },
-		"half":  func(a float64) float64 { return a / 2 },
-		"score": func(a int, x ...int) int {
-			s := a
-			for _, n := range x {
-				s += n
-			}
-			return s
-		},
-		"greet": func(name string) string { return "Hello, " + name },
-	}
-
 	skip := []*regexp.Regexp{
 		regexp.MustCompile(`cannot fetch .* from .*`),
 		regexp.MustCompile(`cannot get .* from .*`),
@@ -71,6 +48,8 @@ func FuzzExpr(f *testing.F) {
 		regexp.MustCompile(`cannot parse .* as .*`),
 	}
 
+	env := NewEnv()
+
 	f.Fuzz(func(t *testing.T, code string) {
 		program, err := expr.Compile(code, expr.Env(env))
 		if err != nil {
@@ -89,15 +68,3 @@ func FuzzExpr(f *testing.F) {
 		}
 	})
 }
-
-type Foo struct {
-	Bar string
-}
-
-func (f Foo) String() string {
-	return "foo"
-}
-
-func (f Foo) Qux(s string) string {
-	return f.Bar + s
-}