Fix circular deps

web-platform-tests · Nov 12, 2018 · e170095 · e170095
2 parents 40165aa + 21b2f72
commit e170095
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 251 deletions.
diff --git a/api/query/autocomplete_medium_test.go b/api/query/autocomplete_medium_test.go
@@ -66,7 +66,7 @@ func TestAutocompleteHandler(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	// TODO(markdittmer): Should this be hitting GCS instead?
-	store := shared.NewMockReadable(mockCtrl)
+	store := sharedtest.NewMockReadable(mockCtrl)
 	rs := []*sharedtest.MockReadCloser{
 		sharedtest.NewMockReadCloser(t, summaryBytes[0]),
 		sharedtest.NewMockReadCloser(t, summaryBytes[1]),

diff --git a/api/query/query_test.go b/api/query/query_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/web-platform-tests/wpt.fyi/shared"
+	"github.com/web-platform-tests/wpt.fyi/shared/sharedtest"
 )
 
 func TestGetMemcacheKey(t *testing.T) {
@@ -44,7 +45,7 @@ func TestLoadSummaries_success(t *testing.T) {
 		getMemcacheKey(testRuns[1]),
 	}
 
-	cachedStore := shared.NewMockCachedStore(mockCtrl)
+	cachedStore := sharedtest.NewMockCachedStore(mockCtrl)
 	sh := unstructuredSearchHandler{queryHandler{dataSource: cachedStore}}
 	summaryBytes := [][]byte{
 		[]byte(`{"/a/b/c":[1,2]}`),
@@ -94,7 +95,7 @@ func TestLoadSummaries_fail(t *testing.T) {
 		getMemcacheKey(testRuns[1]),
 	}
 
-	cachedStore := shared.NewMockCachedStore(mockCtrl)
+	cachedStore := sharedtest.NewMockCachedStore(mockCtrl)
 	sh := unstructuredSearchHandler{queryHandler{dataSource: cachedStore}}
 	summaryBytes := [][]byte{
 		[]byte(`{"/a/b/c":[1,2]}`),

diff --git a/api/query/search_medium_test.go b/api/query/search_medium_test.go
@@ -67,7 +67,7 @@ func TestUnstructuredSearchHandler(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	// TODO(markdittmer): Should this be hitting GCS instead?
-	store := shared.NewMockReadable(mockCtrl)
+	store := sharedtest.NewMockReadable(mockCtrl)
 	rs := []*sharedtest.MockReadCloser{
 		sharedtest.NewMockReadCloser(t, summaryBytes[0]),
 		sharedtest.NewMockReadCloser(t, summaryBytes[1]),
@@ -187,7 +187,7 @@ func TestStructuredSearchHandler_equivalentToUnstructured(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	// TODO(markdittmer): Should this be hitting GCS instead?
-	store := shared.NewMockReadable(mockCtrl)
+	store := sharedtest.NewMockReadable(mockCtrl)
 	rs := []*sharedtest.MockReadCloser{
 		sharedtest.NewMockReadCloser(t, summaryBytes[0]),
 		sharedtest.NewMockReadCloser(t, summaryBytes[1]),

diff --git a/api/receiver/receive_results_test.go b/api/receiver/receive_results_test.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/web-platform-tests/wpt.fyi/shared"
+	"github.com/web-platform-tests/wpt.fyi/shared/sharedtest"
 	"google.golang.org/appengine/taskqueue"
 )
 
@@ -92,7 +92,7 @@ func TestHandleResultsUpload_success(t *testing.T) {
 	mockAE := NewMockAppEngineAPI(mockCtrl)
 	f := &os.File{}
 	task := &taskqueue.Task{Name: "task"}
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().IsAdmin().Return(false),
 		mockAE.EXPECT().authenticateUploader("blade-runner", "123").Return(true),
@@ -130,7 +130,7 @@ func TestHandleResultsUpload_extra_params(t *testing.T) {
 		"os_version":      "",
 	}
 	task := &taskqueue.Task{Name: "task"}
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().IsAdmin().Return(false),
 		mockAE.EXPECT().authenticateUploader("blade-runner", "123").Return(true),
@@ -171,7 +171,7 @@ func TestHandleURLPayload_single(t *testing.T) {
 	}
 
 	mockAE := NewMockAppEngineAPI(mockCtrl)
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(f, nil),
 		mockAE.EXPECT().uploadToGCS(matchRegex(`^/wptd-results-buffer/blade-runner/.*\.json$`), f, true).Return(nil),
@@ -189,7 +189,7 @@ func TestHandleURLPayload_multiple(t *testing.T) {
 	urls := []string{"http://wpt.fyi/foo.json.gz", "http://wpt.fyi/bar.json.gz"}
 
 	mockAE := NewMockAppEngineAPI(mockCtrl)
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().fetchWithTimeout(urls[0], DownloadTimeout).Return(f, nil),
 		mockAE.EXPECT().uploadToGCS(matchRegex(`^/wptd-results-buffer/blade-runner/.*/0\.json$`), f, true).Return(nil),
@@ -211,7 +211,7 @@ func TestHandleURLPayload_retry_fetching(t *testing.T) {
 	errTimeout := fmt.Errorf("server timed out")
 
 	mockAE := NewMockAppEngineAPI(mockCtrl)
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(nil, errTimeout),
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(nil, errTimeout),
@@ -230,7 +230,7 @@ func TestHandleURLPayload_fail_fetching(t *testing.T) {
 	errTimeout := fmt.Errorf("server timed out")
 
 	mockAE := NewMockAppEngineAPI(mockCtrl)
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(nil, errTimeout),
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(nil, errTimeout),
@@ -250,7 +250,7 @@ func TestHandleURLPayload_fail_uploading(t *testing.T) {
 	errGCS := fmt.Errorf("failed to upload to GCS")
 
 	mockAE := NewMockAppEngineAPI(mockCtrl)
-	mockAE.EXPECT().Context().Return(shared.NewTestContext()).AnyTimes()
+	mockAE.EXPECT().Context().Return(sharedtest.NewTestContext()).AnyTimes()
 	gomock.InOrder(
 		mockAE.EXPECT().fetchWithTimeout("http://wpt.fyi/test.json.gz", DownloadTimeout).Return(f, nil),
 		mockAE.EXPECT().uploadToGCS(matchRegex(`^/wptd-results-buffer/blade-runner/.*\.json$`), f, true).Return(errGCS),

diff --git a/shared/models_test.go b/shared/models_test.go
@@ -1,17 +1,18 @@
 // +build medium
 
-package shared
+package shared_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/web-platform-tests/wpt.fyi/shared"
 	"github.com/web-platform-tests/wpt.fyi/shared/sharedtest"
 	"google.golang.org/appengine/datastore"
 )
 
 func TestTestRunIDs_LoadTestRuns(t *testing.T) {
-	testRuns := make(TestRuns, 2)
+	testRuns := make(shared.TestRuns, 2)
 	testRuns[0].BrowserName = "chrome"
 	testRuns[0].BrowserVersion = "63.0"
 	testRuns[0].OSName = "linux"

diff --git a/shared/request_caching_test.go b/shared/request_caching_test.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package shared
+package shared_test
 
 import (
 	"context"
@@ -16,6 +16,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/web-platform-tests/wpt.fyi/shared"
 	"github.com/web-platform-tests/wpt.fyi/shared/sharedtest"
 )
 
@@ -36,9 +37,15 @@ func (okHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func TestNoCaching404(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
-	cache := NewMockReadWritable(mockCtrl)
+	cache := sharedtest.NewMockReadWritable(mockCtrl)
 	cache.EXPECT().NewReadCloser("/some/url").Return(ioutil.NopCloser(failReader{}), nil)
-	h := NewCachingHandler(context.Background(), http.NotFoundHandler(), cache, AlwaysCachable, URLAsCacheKey, CacheStatusOK)
+	h := shared.NewCachingHandler(
+		context.Background(),
+		http.NotFoundHandler(),
+		cache,
+		shared.AlwaysCachable,
+		shared.URLAsCacheKey,
+		shared.CacheStatusOK)
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest("GET", "/some/url", nil)
 	h.ServeHTTP(w, r)
@@ -48,11 +55,17 @@ func TestNoCaching404(t *testing.T) {
 func TestCaching200(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
-	cache := NewMockReadWritable(mockCtrl)
+	cache := sharedtest.NewMockReadWritable(mockCtrl)
 	cache.EXPECT().NewReadCloser("/some/url").Return(ioutil.NopCloser(failReader{}), nil)
 	wc := sharedtest.NewMockWriteCloser(t)
 	cache.EXPECT().NewWriteCloser("/some/url").Return(wc, nil)
-	h := NewCachingHandler(context.Background(), okHandler{}, cache, AlwaysCachable, URLAsCacheKey, CacheStatusOK)
+	h := shared.NewCachingHandler(
+		context.Background(),
+		okHandler{},
+		cache,
+		shared.AlwaysCachable,
+		shared.URLAsCacheKey,
+		shared.CacheStatusOK)
 	w := httptest.NewRecorder()
 	r := httptest.NewRequest("GET", "/some/url", nil)
 	h.ServeHTTP(w, r)

diff --git a/shared/sharedtest/util.go b/shared/sharedtest/util.go
@@ -8,7 +8,6 @@ import (
 	"context"
 
 	"github.com/golang/mock/gomock"
-
 	"github.com/web-platform-tests/wpt.fyi/shared"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/aetest"
@@ -66,3 +65,10 @@ func SameProductSpec(spec string) gomock.Matcher {
 		spec: spec,
 	}
 }
+
+// NewTestContext creates a new context.Context for small tests.
+func NewTestContext() context.Context {
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, shared.DefaultLoggerCtxKey(), shared.NewNilLogger())
+	return ctx
+}