Cont. working on dep

Author: prestonvasquez

mongo/read_write_concern_spec_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 const (
-	readWriteConcernTestsDir = "../testdata/read-write-concern"
+	readWriteConcernTestsDir = "../testdata/source/read-write-concern/tests/"
 	connstringTestsDir       = "connection-string"
 	documentTestsDir         = "document"
 )

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
-const authTestsDir = "../../../../testdata/source/auth/tests/legacy"
+const authTestsDir = "../../../../testdata/source/auth/tests/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
 }
 
-const connstringTestsDir = "../../../../testdata/source/connection-string/"
-const urioptionsTestDir = "../../../../testdata/source/uri-options/"
+const connstringTestsDir = "../../../../testdata/source/connection-string/tests/"
+const urioptionsTestDir = "../../../../testdata/source/uri-options/tests/"
 
 func (h *host) toString() string {
 	switch h.Type {
@@ -108,8 +108,26 @@ var skipKeywords = []string{
 	"tlsDisableCertificateRevocationCheck",
 	"serverSelectionTryOnce",
 
-	// GODRIVER-2348: the wtimeoutMS write concern option is not supported.
+	// These tests violate current Go Driver behavior
+	"Empty integer option values are ignored",    // PEC-1545
+	"Empty boolean option value are ignored",     // SPEC-1545
+	"Comma in a key value pair causes a warning", // DRIVERS-2915
+
+	// Unclear ~ possible bugs
+	"maxConnecting=0 causes a warning", // DRIVERS-1943
+
+	// TODO(GODRIVER-2348): the wtimeoutMS write concern option is not supported.
 	"wTimeoutMS",
+
+	// TODO(GODRIVER-2991): make delimiting slash between hosts and options
+	// optional.
+	"Missing delimiting slash between hosts and options",
+
+	// TODO(GODRIVER-2183): Socks5 Proxy Support
+	"proxyPort",
+	"proxyHost",
+	"proxyPassword",
+	"proxyUsername",
 }
 
 func runTest(t *testing.T, test testCase, warningsError bool) {
@@ -163,7 +181,7 @@ func runTest(t *testing.T, test testCase, warningsError bool) {
 	// for options that are present.
 	var ok bool
 
-	_, ok = test.Options["maxpoolsize"]
+	_, ok = test.Options["maxPoolSize"]
 	require.Equal(t, ok, cs.MaxPoolSizeSet)
 }
 
@@ -220,13 +238,13 @@ func verifyConnStringOptions(t *testing.T, cs *connstring.ConnString, options ma
 			require.Equal(t, value, float64(cs.MaxConnIdleTime/time.Millisecond))
 		case "maxpoolsize":
 			require.True(t, cs.MaxPoolSizeSet)
-			require.Equal(t, value, cs.MaxPoolSize)
+			require.Equal(t, value, float64(cs.MaxPoolSize))
 		case "maxstalenessseconds":
 			require.True(t, cs.MaxStalenessSet)
 			require.Equal(t, value, float64(cs.MaxStaleness/time.Second))
 		case "minpoolsize":
 			require.True(t, cs.MinPoolSizeSet)
-			require.Equal(t, value, int64(cs.MinPoolSize))
+			require.Equal(t, value, float64(cs.MinPoolSize))
 		case "readpreference":
 			require.Equal(t, value, cs.ReadPreference)
 		case "readpreferencetags":
@@ -285,7 +303,12 @@ func verifyConnStringOptions(t *testing.T, cs *connstring.ConnString, options ma
 			require.Equal(t, value, cs.SSLDisableOCSPEndpointCheck)
 		case "servermonitoringmode":
 			require.Equal(t, value, cs.ServerMonitoringMode)
+		case "timeoutms":
+			require.Equal(t, value, float64(cs.Timeout/time.Millisecond))
+		case "maxconnecting":
+			require.Equal(t, value, float64(cs.MaxConnecting))
 		default:
+			fmt.Println(key)
 			opt, ok := cs.UnknownOptions[key]
 			require.True(t, ok)
 			require.Contains(t, opt, fmt.Sprint(value))

x/mongo/driver/mongocrypt/mongocrypt_test.go

@@ -23,6 +23,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/mongocrypt/options"
 )
 
+// TODO: create new directory for mongocrypt
 const resourcesDir = "../../../../testdata/mongocrypt"
 
 func noerr(t *testing.T, err error) {

x/mongo/driver/topology/CMAP_spec_test.go

@@ -114,7 +114,7 @@ type testInfo struct {
 	sync.Mutex
 }
 
-const cmapTestDir = "../../../../testdata/connection-monitoring-and-pooling/"
+const cmapTestDir = "../../../../testdata/source/connection-monitoring-and-pooling/tests/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()
 }
 
-const testsDir string = "../../../../testdata/server-discovery-and-monitoring/"
+const testsDir string = "../../../../testdata/source/server-discovery-and-monitoring/tests/"
 
 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"`
 	}
 
-	const testsDir string = "../../../../testdata/server-selection/rtt"
+	const testsDir string = "../../../../testdata/source/server-selection/tests/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) {
-	const testsDir = "../../../../testdata/server-selection/in_window"
+	const testsDir = "../../../../testdata/source/server-selection/tests/in_window/"
 
 	files := spectest.FindJSONFilesInDir(t, testsDir)