Allow multiple needles in Contains and DoesNotContain

Signed-off-by: apostasie <[email protected]>

Author: apostasie

mod/tigron/expect/comparators.go

@@ -41,18 +41,28 @@ func All(comparators ...test.Comparator) test.Comparator {
 
 // Contains can be used as a parameter for expected.Output and ensures a comparison string is found contained in the
 // output.
-func Contains(compare string) test.Comparator {
+func Contains(compare string, more ...string) test.Comparator {
 	return func(stdout, _ string, t *testing.T) {
 		t.Helper()
+
 		assertive.Contains(assertive.WithFailLater(t), stdout, compare, "Inspecting output (contains)")
+
+		for _, m := range more {
+			assertive.Contains(assertive.WithFailLater(t), stdout, m, "Inspecting output (contains)")
+		}
 	}
 }
 
 // DoesNotContain is to be used for expected.Output to ensure a comparison string is NOT found in the output.
-func DoesNotContain(compare string) test.Comparator {
+func DoesNotContain(compare string, more ...string) test.Comparator {
 	return func(stdout, _ string, t *testing.T) {
 		t.Helper()
+
 		assertive.DoesNotContain(assertive.WithFailLater(t), stdout, compare, "Inspecting output (does not contain)")
+
+		for _, m := range more {
+			assertive.DoesNotContain(assertive.WithFailLater(t), stdout, m, "Inspecting output (does not contain)")
+		}
 	}
 }
 

mod/tigron/expect/comparators_test.go

@@ -30,6 +30,7 @@ import (
 )
 
 func TestExpect(t *testing.T) {
+	// TODO: write more tests once we can mock t in Comparator signature
 	t.Parallel()
 
 	expect.Contains("b")("a b c", "contains works", t)
@@ -39,7 +40,9 @@ func TestExpect(t *testing.T) {
 
 	expect.All(
 		expect.Contains("b"),
+		expect.Contains("b", "c"),
 		expect.DoesNotContain("d"),
+		expect.DoesNotContain("d", "e"),
 		expect.Equals("a b c"),
 		expect.Match(regexp.MustCompile("[a-z ]+")),
 	)("a b c", "all", t)

mod/tigron/expect/doc.md

@@ -53,8 +53,8 @@ The last parameter of `test.Expects` accepts a `test.Comparator`, which allows t
 output on `stdout`.
 
 The following ready-made `test.Comparator` generators are provided:
-- `expect.Contains(string)`: verifies that stdout contains the string parameter
-- `expect.DoesNotContain(string)`: negation of above
+- `expect.Contains(string, ...string)`: verifies that stdout does contain the provided parameters
+- `expect.DoesNotContain(string, ...string)`: verifies that stdout does not contain any of the passed parameters
 - `expect.Equals(string)`: strict equality
 - `expect.Match(*regexp.Regexp)`: regexp matching
 - `expect.All(comparators ...Comparator)`: allows to bundle together a bunch of other comparators