args: inverse the methods in ExactValidArgs

umarcor · umarcor · commit b3982ec9bc06 · 2022-08-30T19:46:05.000+02:00
diff --git a/args.go b/args.go
@@ -113,5 +113,5 @@ func MatchAll(pargs ...PositionalArgs) PositionalArgs {
 //
 // Deprecated: use MatchAll(OnlyValidArgs, ExactArgs(n)) instead
 func ExactValidArgs(n int) PositionalArgs {
-	return MatchAll(OnlyValidArgs, ExactArgs(n))
+	return MatchAll(ExactArgs(n), OnlyValidArgs)
 }
diff --git a/args_test.go b/args_test.go
@@ -488,7 +488,7 @@ func TestExactValidArgs_WithInvalidCount(t *testing.T) {
 func TestExactValidArgs_WithInvalidCount_WithInvalidArgs(t *testing.T) {
 	c := getCommand(ExactValidArgs(3), true)
 	_, err := executeCommand(c, "three", "a", "two")
-	validOnlyWithInvalidArgs(err, t)
+	exactArgsWithInvalidCount(err, t)
 }
 
 func TestExactValidArgs_WithInvalidArgs(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ func MatchAll(pargs ...PositionalArgs) PositionalArgs {`
`113`	`113`	`//`
`114`	`114`	`// Deprecated: use MatchAll(OnlyValidArgs, ExactArgs(n)) instead`
`115`	`115`	`func ExactValidArgs(n int) PositionalArgs {`
`116`		`- return MatchAll(OnlyValidArgs, ExactArgs(n))`
	`116`	`+ return MatchAll(ExactArgs(n), OnlyValidArgs)`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ func TestExactValidArgs_WithInvalidCount(t *testing.T) {`
`488`	`488`	`func TestExactValidArgs_WithInvalidCount_WithInvalidArgs(t *testing.T) {`
`489`	`489`	`c := getCommand(ExactValidArgs(3), true)`
`490`	`490`	`_, err := executeCommand(c, "three", "a", "two")`
`491`		`- validOnlyWithInvalidArgs(err, t)`
	`491`	`+ exactArgsWithInvalidCount(err, t)`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`func TestExactValidArgs_WithInvalidArgs(t *testing.T) {`