tests/fiinha.go: Remove unused execFn from argsT

1 files changed, 13 insertions, 26 deletions

diff --git a/tests/fiinha.go b/tests/fiinha.go
index b7a4cf5..1e77b68 100644
--- a/tests/fiinha.go
+++ b/tests/fiinha.go
@@ -5534,33 +5534,23 @@ func test_getopt() {
 	const warning = "Missing COMMAND.\n"
 	const usage   = "Usage: $0 [-f FILE] [-p PREFIX] COMMAND [OPTIONS]\n"
 
-	execFn := func(argsT, queriesT, io.Reader, io.Writer) (int, error) {
-		return 0, nil
-	}
-	commandsMap := map[string]commandT {
+	commandsMap := map[string]commandT{
 		"good": commandT{
 			name: "good",
 			getopt: func(args argsT, _ io.Writer) (argsT, bool) {
 				return args, true
 			},
-			exec: execFn,
 		},
 		"bad": commandT{
 			name: "bad",
 			getopt: func(args argsT, w io.Writer) (argsT, bool) {
 				if len(args.args) == 0 {
-					fmt.Fprintln(
-						w,
-						"no required arg",
-					)
+					fmt.Fprintln(w, "no required arg")
 					return args, false
 				}
 
 				if args.args[0] != "required" {
-					fmt.Fprintln(
-						w,
-						"not correct one",
-					)
+					fmt.Fprintln(w, "not correct one")
 					return args, false
 				}
 
@@ -5568,7 +5558,6 @@ func test_getopt() {
 				args.consumer = "a consumer"
 				return args, true
 			},
-			exec: execFn,
 		},
 	}
 
@@ -5715,9 +5704,6 @@ func test_getopt() {
 func test_runCommand() {
 	g.TestStart("runCommand()")
 
-	const usage = "Usage: $0 [-f FILE] [-p PREFIX] COMMAND [OPTIONS]\n"
-
-
 	g.Testing("returns an error on bad prefix", func() {
 		stdin := strings.NewReader("")
 		var (
@@ -5756,11 +5742,12 @@ func test_runCommand() {
 		myErr := errors.New("an error")
 		good := commandT{
 			exec: func(
-				argsT,
-				queriesT,
-				io.Reader,
-				io.Writer,
+				_ argsT,
+				_ queriesT,
+				_ io.Reader,
+				w io.Writer,
 			) (int, error) {
+				fmt.Fprintf(w, "good text\n")
 				return 0, nil
 			},
 		}
@@ -5771,19 +5758,19 @@ func test_runCommand() {
 				_ io.Reader,
 				w io.Writer,
 			) (int, error) {
-				fmt.Fprintf(w, "some text\n")
-				return 1, myErr
+				fmt.Fprintf(w, "bad text\n")
+				return 123, myErr
 			},
 		}
 		rc1 := runCommand(args1, good, stdin, &stdout1, &stderr1)
 		rc2 := runCommand(args2, bad,  stdin, &stdout2, &stderr2)
 
-		g.TAssertEqual(stdout1.String(), "")
-		g.TAssertEqual(stdout2.String(), "some text\n")
+		g.TAssertEqual(stdout1.String(), "good text\n")
+		g.TAssertEqual(stdout2.String(), "bad text\n")
 		g.TAssertEqual(stderr1.String(), "")
 		g.TAssertEqual(stderr2.String(), "an error\n")
 		g.TAssertEqual(rc1, 0)
-		g.TAssertEqual(rc2, 1)
+		g.TAssertEqual(rc2, 123)
 	})
 }