test: consolidate Go tests (#39962)

Consolidate all Go tests. Coverage is identical to before. Go tests are
around 5% faster while being 7% smaller. No non-test code is touched.

modules/httpcache/httpcache_test.go

@@ -25,76 +25,58 @@ func TestHandleGenericETagCache(t *testing.T) {
 		respEtag    string
 		reqHeaders  map[string]string
 		wantHandled bool
-		wantHeaders map[string]string
-		wantStatus  int
 	}
 	cases := []testCase{
 		{
 			name:        "No If-None-Match",
 			wantHandled: false,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": cacheControl, "Etag": matchedEtag},
 		},
 		{
 			name:        "Mismatched If-None-Match",
 			reqHeaders:  map[string]string{"If-None-Match": `"mismatched-etag"`},
 			wantHandled: false,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": cacheControl, "Etag": matchedEtag},
 		},
 		{
 			name:        "Matched If-None-Match",
 			reqHeaders:  map[string]string{"If-None-Match": matchedEtag},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": matchedEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 		{
 			name:        "Multiple Mismatched If-None-Match",
 			reqHeaders:  map[string]string{"If-None-Match": `"mismatched-etag1", "mismatched-etag2"`},
 			wantHandled: false,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": cacheControl, "Etag": matchedEtag},
 		},
 		{
 			name:        "Wildcard If-None-Match matches any current representation",
 			reqHeaders:  map[string]string{"If-None-Match": "*"},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": matchedEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 		{
 			name:        "Weak response tag matched by a strong request tag",
 			respEtag:    weakEtag,
 			reqHeaders:  map[string]string{"If-None-Match": matchedEtag},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": weakEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 		{
 			name:        "Weak response tag matched by a weak request tag",
 			respEtag:    weakEtag,
 			reqHeaders:  map[string]string{"If-None-Match": weakEtag},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": weakEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 		{
 			name:        "If-Modified-Since without If-None-Match",
 			reqHeaders:  map[string]string{"If-Modified-Since": lastModified},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": matchedEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 		{
 			name:        "Mismatched If-None-Match takes precedence over If-Modified-Since",
 			reqHeaders:  map[string]string{"If-None-Match": `"mismatched-etag"`, "If-Modified-Since": lastModified},
 			wantHandled: false,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": cacheControl, "Etag": matchedEtag},
 		},
 		{
 			name:        "Multiple Matched If-None-Match",
 			reqHeaders:  map[string]string{"If-None-Match": `"mismatched-etag", ` + matchedEtag},
 			wantHandled: true,
-			wantHeaders: map[string]string{"Last-Modified": lastModified, "Cache-Control": "", "Etag": matchedEtag},
-			wantStatus:  http.StatusNotModified,
 		},
 	}
 
@@ -107,10 +89,14 @@ func TestHandleGenericETagCache(t *testing.T) {
 			w := httptest.NewRecorder()
 			assert.Equal(t, tc.wantHandled, HandleGenericETagPrivateCache(req, w, util.IfZero(tc.respEtag, matchedEtag), lastModifiedTime))
 			resp := w.Result()
-			for k, v := range tc.wantHeaders {
+			for k, v := range map[string]string{
+				"Last-Modified": lastModified,
+				"Cache-Control": util.Iif(tc.wantHandled, "", cacheControl),
+				"Etag":          util.IfZero(tc.respEtag, matchedEtag),
+			} {
 				assert.Equal(t, v, resp.Header.Get(k))
 			}
-			assert.Equal(t, tc.wantStatus, util.Iif(resp.StatusCode == http.StatusOK, 0, resp.StatusCode))
+			assert.Equal(t, util.Iif(tc.wantHandled, http.StatusNotModified, 0), util.Iif(resp.StatusCode == http.StatusOK, 0, resp.StatusCode))
 		})
 	}
 }