fix(tests): lower cyclomatic complexity of Checklist

Matthew Fisher · Matthew Fisher · commit ea765c82524d · 2015-03-20T13:32:05.000-07:00
It was a little confusing to read the different cases, so I lowered
the complexity in order to read through the code for future readers.
diff --git a/tests/utils/itutils.go b/tests/utils/itutils.go
@@ -196,11 +196,10 @@ func CheckList(
 	if err != nil {
 		t.Fatal(err)
 	}
-	if strings.Contains(stdout.String(), contain) == notflag {
-		if notflag {
-			t.Fatalf(
-				"Didn't expect '%s' in command output:\n%v", contain, stdout)
-		}
+	if notflag && strings.Contains(stdout.String(), contain) {
+		t.Fatalf("Didn't expect '%s' in command output:\n%v", contain, stdout)
+	}
+	if !notflag && !strings.Contains(stdout.String(), contain) {
 		t.Fatalf("Expected '%s' in command output:\n%v", contain, stdout)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,10 @@ func CheckList(`
`196`	`196`	`if err != nil {`
`197`	`197`	`t.Fatal(err)`
`198`	`198`	`}`
`199`		`- if strings.Contains(stdout.String(), contain) == notflag {`
`200`		`- if notflag {`
`201`		`- t.Fatalf(`
`202`		`- "Didn't expect '%s' in command output:\n%v", contain, stdout)`
`203`		`- }`
	`199`	`+ if notflag && strings.Contains(stdout.String(), contain) {`
	`200`	`+ t.Fatalf("Didn't expect '%s' in command output:\n%v", contain, stdout)`
	`201`	`+ }`
	`202`	`+ if !notflag && !strings.Contains(stdout.String(), contain) {`
`204`	`203`	`t.Fatalf("Expected '%s' in command output:\n%v", contain, stdout)`
`205`	`204`	`}`
`206`	`205`	`}`