Change order of "yoda conditions" (1 != foo) (letsencrypt#4756)

jsha · web-flow · commit 8d99ada705f8 · 2020-04-08T17:19:56.000-07:00
staticcheck cleanup: https://staticcheck.io/docs/checks#ST1017
diff --git a/web/context_test.go b/web/context_test.go
@@ -31,7 +31,7 @@ func TestLogCode(t *testing.T) {
 	}
 	th.ServeHTTP(httptest.NewRecorder(), req)
 	expected := `INFO: GET /endpoint 0 201 0 0.0.0.0 JSON={}`
-	if 1 != len(mockLog.GetAllMatching(expected)) {
+	if len(mockLog.GetAllMatching(expected)) != 1 {
 		t.Errorf("Expected exactly one log line matching %q. Got \n%s",
 			expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))
 	}
@@ -53,7 +53,7 @@ func TestStatusCodeLogging(t *testing.T) {
 	}
 	th.ServeHTTP(httptest.NewRecorder(), req)
 	expected := `INFO: GET /endpoint 0 200 0 0.0.0.0 JSON={}`
-	if 1 != len(mockLog.GetAllMatching(expected)) {
+	if len(mockLog.GetAllMatching(expected)) != 1 {
 		t.Errorf("Expected exactly one log line matching %q. Got \n%s",
 			expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))
 	}
@@ -69,7 +69,7 @@ func TestOrigin(t *testing.T) {
 	req.Header.Add("Origin", "https://example.com")
 	th.ServeHTTP(httptest.NewRecorder(), req)
 	expected := `INFO: GET /endpoint 0 201 0 0.0.0.0 JSON={.*"Origin":"https://example.com"}`
-	if 1 != len(mockLog.GetAllMatching(expected)) {
+	if len(mockLog.GetAllMatching(expected)) != 1 {
 		t.Errorf("Expected exactly one log line matching %q. Got \n%s",
 			expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func TestLogCode(t *testing.T) {`
`31`	`31`	`}`
`32`	`32`	`th.ServeHTTP(httptest.NewRecorder(), req)`
`33`	`33`	expected := `INFO: GET /endpoint 0 201 0 0.0.0.0 JSON={}`
`34`		`- if 1 != len(mockLog.GetAllMatching(expected)) {`
	`34`	`+ if len(mockLog.GetAllMatching(expected)) != 1 {`
`35`	`35`	`t.Errorf("Expected exactly one log line matching %q. Got \n%s",`
`36`	`36`	`expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))`
`37`	`37`	`}`
`@@ -53,7 +53,7 @@ func TestStatusCodeLogging(t *testing.T) {`
`53`	`53`	`}`
`54`	`54`	`th.ServeHTTP(httptest.NewRecorder(), req)`
`55`	`55`	expected := `INFO: GET /endpoint 0 200 0 0.0.0.0 JSON={}`
`56`		`- if 1 != len(mockLog.GetAllMatching(expected)) {`
	`56`	`+ if len(mockLog.GetAllMatching(expected)) != 1 {`
`57`	`57`	`t.Errorf("Expected exactly one log line matching %q. Got \n%s",`
`58`	`58`	`expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))`
`59`	`59`	`}`
`@@ -69,7 +69,7 @@ func TestOrigin(t *testing.T) {`
`69`	`69`	`req.Header.Add("Origin", "https://example.com")`
`70`	`70`	`th.ServeHTTP(httptest.NewRecorder(), req)`
`71`	`71`	expected := `INFO: GET /endpoint 0 201 0 0.0.0.0 JSON={.*"Origin":"https://example.com"}`
`72`		`- if 1 != len(mockLog.GetAllMatching(expected)) {`
	`72`	`+ if len(mockLog.GetAllMatching(expected)) != 1 {`
`73`	`73`	`t.Errorf("Expected exactly one log line matching %q. Got \n%s",`
`74`	`74`	`expected, strings.Join(mockLog.GetAllMatching(".*"), "\n"))`
`75`	`75`	`}`