Move import mapper test into main test

Author: spinillos

generate_test.go

@@ -46,13 +46,14 @@ func TestGenerateWithImports(t *testing.T) {
 		ToDo: map[string]string{
 			"imports/oneref_verbose": "Figure out how to disambiguate struct literals from the struct-with-braces-and-one-element case",
 		},
-		ImportMappers: map[string]func(string) (string, error){
-			"imports/imports": func(s string) (string, error) {
-				if s == "example.com/dep" {
-					return "@example/deps", nil
-				}
-				return s, nil
-			},
+	}
+
+	importMappers := map[string]func(s string) (string, error){
+		"imports/imports": func(s string) (string, error) {
+			if s == "example.com/dep" {
+				return "@example/deps", nil
+			}
+			return s, nil
 		},
 	}
 
@@ -64,9 +65,16 @@ func TestGenerateWithImports(t *testing.T) {
 			t.Fatal(v.Err())
 		}
 
+		im := func(s string) (string, error) {
+			return "", nil
+		}
+		if i, ok := importMappers[t.Name]; ok {
+			im = i
+		}
+
 		b, err := cuetsy.Generate(v, cuetsy.Config{
 			Export:       true,
-			ImportMapper: t.ImportMapperFn,
+			ImportMapper: im,
 		})
 		if err != nil {
 			errors.Print(t, err, nil)

internal/cuetxtar/cuetxtar.go

@@ -59,8 +59,6 @@ type TxTarTest struct {
 
 	// ToDo is a map of tests that should be skipped now, but should be fixed.
 	ToDo map[string]string
-
-	ImportMappers map[string]func(string) (string, error)
 }
 
 // A Test represents a single test based on a .txtar file.
@@ -86,7 +84,7 @@ type Test struct {
 
 	hasGold bool
 
-	ImportMapperFn func(s string) (string, error)
+	Name string
 }
 
 func (t *Test) Write(b []byte) (n int, err error) {
@@ -270,6 +268,7 @@ func (x *TxTarTest) Run(t *testing.T, f func(tc *Test)) {
 				T:       t,
 				Archive: a,
 				Dir:     filepath.Dir(filepath.Join(dir, fullpath)),
+				Name:    testName,
 
 				prefix: path.Join("out", x.Name),
 			}
@@ -292,14 +291,6 @@ func (x *TxTarTest) Run(t *testing.T, f func(tc *Test)) {
 				t.Skip(msg)
 			}
 
-			if im, ok := x.ImportMappers[testName]; ok {
-				tc.ImportMapperFn = im
-			} else {
-				tc.ImportMapperFn = func(s string) (string, error) {
-					return "", nil
-				}
-			}
-
 			f(tc)
 
 			update := false