GODRIVER-3445 Don't require package-relative paths for spectest.Path

Author: matthewdale

internal/serverselector/server_selector_test.go

@@ -157,7 +157,7 @@ func compareServers(t *testing.T, expected []*serverDesc, actual []description.S
 	}
 }
 
-var maxStalenessTestsDir = spectest.TestPath(2, "max-staleness")
+var maxStalenessTestsDir = spectest.Path("max-staleness")
 
 // Test case for all max staleness spec tests.
 func TestMaxStalenessSpec(t *testing.T) {
@@ -176,7 +176,7 @@ func TestMaxStalenessSpec(t *testing.T) {
 	}
 }
 
-var selectorTestsDir = spectest.TestPath(2, "server-selection")
+var selectorTestsDir = spectest.Path("server-selection")
 
 func selectServers(t *testing.T, test *testCase) error {
 	servers := make([]description.Server, 0, len(test.TopologyDescription.Servers))

internal/spectest/spectest.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/internal/require"
@@ -33,19 +32,21 @@ func FindJSONFilesInDir(t *testing.T, dir string) []string {
 		files = append(files, entry.Name())
 	}
 
+	if len(files) == 0 {
+		t.Fatalf("no JSON files found in %q", dir)
+	}
+
 	return files
 }
 
-// TestPath will construct a path to a test file in the specifications git
-// submodule. The path will be relative to the current package so a depth should
-// be provided to indicate how many directories to go up.
-func TestPath(depth int, testDir string, subDirs ...string) string {
-	const basePath = "testdata/specifications/source/"
-
-	// Create a string of "../" repeated 'depth' times
-	relativePath := strings.Repeat("../", depth)
-	// Construct the full path
-	fullPath := relativePath + basePath + testDir + "/tests/" + filepath.Join(subDirs...)
+// Path returns the absolute path to the "tests" directory for the given
+// specification directory. If the spec test files are nested in a subdirectory,
+// pass the subdirectories as additional arguments after the spec directory.
+func Path(specDir string, subDirs ...string) string {
+	testPath, err := filepath.Abs("../../../testdata/specifications/source/")
+	if err != nil {
+		panic(err)
+	}
 
-	return fullPath
+	return filepath.Join(testPath, specDir, "tests", filepath.Join(subDirs...))
 }

mongo/read_write_concern_spec_test.go

@@ -36,7 +36,7 @@ var (
 		reg.RegisterTypeMapEntry(bson.TypeEmbeddedDocument, reflect.TypeOf(bson.Raw{}))
 		return reg
 	}()
-	readWriteConcernTestsDir = spectest.TestPath(1, "read-write-concern")
+	readWriteConcernTestsDir = spectest.Path("read-write-concern")
 )
 
 type connectionStringTestFile struct {

x/mongo/driver/auth/auth_spec_test.go

@@ -38,7 +38,7 @@ type testContainer struct {
 }
 
 // Note a test supporting the deprecated gssapiServiceName property was removed from data/auth/auth_tests.json
-var authTestsDir = spectest.TestPath(4, "auth", "legacy")
+var authTestsDir = spectest.Path("auth", "legacy")
 
 func runTestsInFile(t *testing.T, dirname string, filename string) {
 	filepath := path.Join(dirname, filename)

x/mongo/driver/connstring/connstring_spec_test.go

@@ -47,8 +47,8 @@ type testContainer struct {
 	Tests []testCase
 }
 
-var connstringTestsDir = spectest.TestPath(4, "connection-string")
-var urioptionsTestDir = spectest.TestPath(4, "uri-options")
+var connstringTestsDir = spectest.Path("connection-string")
+var urioptionsTestDir = spectest.Path("uri-options")
 
 func (h *host) toString() string {
 	switch h.Type {

x/mongo/driver/topology/CMAP_spec_test.go

@@ -114,7 +114,7 @@ type testInfo struct {
 	sync.Mutex
 }
 
-var cmapTestDir = spectest.TestPath(4, "connection-monitoring-and-pooling", "cmap-format")
+var cmapTestDir = spectest.Path("connection-monitoring-and-pooling", "cmap-format")
 
 func TestCMAPSpec(t *testing.T) {
 	for _, testFileName := range spectest.FindJSONFilesInDir(t, cmapTestDir) {

x/mongo/driver/topology/sdam_spec_test.go

@@ -203,7 +203,7 @@ func serverClosed(e *event.ServerClosedEvent) {
 	lock.Unlock()
 }
 
-var testsDir = spectest.TestPath(4, "server-discovery-and-monitoring")
+var testsDir = spectest.Path("server-discovery-and-monitoring")
 
 var publishedEvents []interface{}
 var lock sync.Mutex

x/mongo/driver/topology/server_rtt_test.go

@@ -27,7 +27,7 @@ func TestServerSelectionRTTSpec(t *testing.T) {
 		NewAvgRtt float64     `json:"new_avg_rtt"`
 	}
 
-	testsDir := spectest.TestPath(4, "server-selection", "rtt")
+	testsDir := spectest.Path("server-selection", "rtt")
 
 	for _, file := range spectest.FindJSONFilesInDir(t, testsDir) {
 		func(t *testing.T, filename string) {

x/mongo/driver/topology/topology_test.go

@@ -808,7 +808,7 @@ type inWindowTestCase struct {
 // can't be effectively accomplished just with server descriptions like most other server selection
 // algorithms.
 func TestServerSelectionSpecInWindow(t *testing.T) {
-	testsDir := spectest.TestPath(4, "server-selection", "in_window")
+	testsDir := spectest.Path("server-selection", "in_window")
 
 	files := spectest.FindJSONFilesInDir(t, testsDir)