From 3f919f2371ea5a10622979bf8ed1374f0ae3944b Mon Sep 17 00:00:00 2001
From: Michael Eischer <michael.eischer@fau.de>
Date: Fri, 28 Jul 2023 19:20:46 +0200
Subject: [PATCH] forget: simplify test

---
 cmd/restic/cmd_forget_test.go | 79 +++++++++++++++++------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/cmd/restic/cmd_forget_test.go b/cmd/restic/cmd_forget_test.go
index d59419d06..ddeef028a 100644
--- a/cmd/restic/cmd_forget_test.go
+++ b/cmd/restic/cmd_forget_test.go
@@ -41,51 +41,50 @@ func TestForgetOptionValues(t *testing.T) {
 	const negValErrorMsg = "Fatal: negative values other than -1 are not allowed for --keep-*"
 	const negDurationValErrorMsg = "Fatal: durations containing negative values are not allowed for --keep-within*"
 	testCases := []struct {
-		input        ForgetOptions
-		expectsError bool
-		errorMsg     string
+		input    ForgetOptions
+		errorMsg string
 	}{
-		{ForgetOptions{Last: 1}, false, ""},
-		{ForgetOptions{Hourly: 1}, false, ""},
-		{ForgetOptions{Daily: 1}, false, ""},
-		{ForgetOptions{Weekly: 1}, false, ""},
-		{ForgetOptions{Monthly: 1}, false, ""},
-		{ForgetOptions{Yearly: 1}, false, ""},
-		{ForgetOptions{Last: 0}, false, ""},
-		{ForgetOptions{Hourly: 0}, false, ""},
-		{ForgetOptions{Daily: 0}, false, ""},
-		{ForgetOptions{Weekly: 0}, false, ""},
-		{ForgetOptions{Monthly: 0}, false, ""},
-		{ForgetOptions{Yearly: 0}, false, ""},
-		{ForgetOptions{Last: -1}, false, ""},
-		{ForgetOptions{Hourly: -1}, false, ""},
-		{ForgetOptions{Daily: -1}, false, ""},
-		{ForgetOptions{Weekly: -1}, false, ""},
-		{ForgetOptions{Monthly: -1}, false, ""},
-		{ForgetOptions{Yearly: -1}, false, ""},
-		{ForgetOptions{Last: -2}, true, negValErrorMsg},
-		{ForgetOptions{Hourly: -2}, true, negValErrorMsg},
-		{ForgetOptions{Daily: -2}, true, negValErrorMsg},
-		{ForgetOptions{Weekly: -2}, true, negValErrorMsg},
-		{ForgetOptions{Monthly: -2}, true, negValErrorMsg},
-		{ForgetOptions{Yearly: -2}, true, negValErrorMsg},
-		{ForgetOptions{Within: restic.ParseDurationOrPanic("1y2m3d3h")}, false, ""},
-		{ForgetOptions{WithinHourly: restic.ParseDurationOrPanic("1y2m3d3h")}, false, ""},
-		{ForgetOptions{WithinDaily: restic.ParseDurationOrPanic("1y2m3d3h")}, false, ""},
-		{ForgetOptions{WithinWeekly: restic.ParseDurationOrPanic("1y2m3d3h")}, false, ""},
-		{ForgetOptions{WithinMonthly: restic.ParseDurationOrPanic("2y4m6d8h")}, false, ""},
-		{ForgetOptions{WithinYearly: restic.ParseDurationOrPanic("2y4m6d8h")}, false, ""},
-		{ForgetOptions{Within: restic.ParseDurationOrPanic("-1y2m3d3h")}, true, negDurationValErrorMsg},
-		{ForgetOptions{WithinHourly: restic.ParseDurationOrPanic("1y-2m3d3h")}, true, negDurationValErrorMsg},
-		{ForgetOptions{WithinDaily: restic.ParseDurationOrPanic("1y2m-3d3h")}, true, negDurationValErrorMsg},
-		{ForgetOptions{WithinWeekly: restic.ParseDurationOrPanic("1y2m3d-3h")}, true, negDurationValErrorMsg},
-		{ForgetOptions{WithinMonthly: restic.ParseDurationOrPanic("-2y4m6d8h")}, true, negDurationValErrorMsg},
-		{ForgetOptions{WithinYearly: restic.ParseDurationOrPanic("2y-4m6d8h")}, true, negDurationValErrorMsg},
+		{ForgetOptions{Last: 1}, ""},
+		{ForgetOptions{Hourly: 1}, ""},
+		{ForgetOptions{Daily: 1}, ""},
+		{ForgetOptions{Weekly: 1}, ""},
+		{ForgetOptions{Monthly: 1}, ""},
+		{ForgetOptions{Yearly: 1}, ""},
+		{ForgetOptions{Last: 0}, ""},
+		{ForgetOptions{Hourly: 0}, ""},
+		{ForgetOptions{Daily: 0}, ""},
+		{ForgetOptions{Weekly: 0}, ""},
+		{ForgetOptions{Monthly: 0}, ""},
+		{ForgetOptions{Yearly: 0}, ""},
+		{ForgetOptions{Last: -1}, ""},
+		{ForgetOptions{Hourly: -1}, ""},
+		{ForgetOptions{Daily: -1}, ""},
+		{ForgetOptions{Weekly: -1}, ""},
+		{ForgetOptions{Monthly: -1}, ""},
+		{ForgetOptions{Yearly: -1}, ""},
+		{ForgetOptions{Last: -2}, negValErrorMsg},
+		{ForgetOptions{Hourly: -2}, negValErrorMsg},
+		{ForgetOptions{Daily: -2}, negValErrorMsg},
+		{ForgetOptions{Weekly: -2}, negValErrorMsg},
+		{ForgetOptions{Monthly: -2}, negValErrorMsg},
+		{ForgetOptions{Yearly: -2}, negValErrorMsg},
+		{ForgetOptions{Within: restic.ParseDurationOrPanic("1y2m3d3h")}, ""},
+		{ForgetOptions{WithinHourly: restic.ParseDurationOrPanic("1y2m3d3h")}, ""},
+		{ForgetOptions{WithinDaily: restic.ParseDurationOrPanic("1y2m3d3h")}, ""},
+		{ForgetOptions{WithinWeekly: restic.ParseDurationOrPanic("1y2m3d3h")}, ""},
+		{ForgetOptions{WithinMonthly: restic.ParseDurationOrPanic("2y4m6d8h")}, ""},
+		{ForgetOptions{WithinYearly: restic.ParseDurationOrPanic("2y4m6d8h")}, ""},
+		{ForgetOptions{Within: restic.ParseDurationOrPanic("-1y2m3d3h")}, negDurationValErrorMsg},
+		{ForgetOptions{WithinHourly: restic.ParseDurationOrPanic("1y-2m3d3h")}, negDurationValErrorMsg},
+		{ForgetOptions{WithinDaily: restic.ParseDurationOrPanic("1y2m-3d3h")}, negDurationValErrorMsg},
+		{ForgetOptions{WithinWeekly: restic.ParseDurationOrPanic("1y2m3d-3h")}, negDurationValErrorMsg},
+		{ForgetOptions{WithinMonthly: restic.ParseDurationOrPanic("-2y4m6d8h")}, negDurationValErrorMsg},
+		{ForgetOptions{WithinYearly: restic.ParseDurationOrPanic("2y-4m6d8h")}, negDurationValErrorMsg},
 	}
 
 	for _, testCase := range testCases {
 		err := verifyForgetOptions(&testCase.input)
-		if testCase.expectsError {
+		if testCase.errorMsg != "" {
 			rtest.Assert(t, err != nil, "should have returned error for input %+v", testCase.input)
 			rtest.Equals(t, testCase.errorMsg, err.Error())
 		} else {