Merge pull request #13135 from owen-mc/go/fix-unit-test

Go: fix unit test

Author: owen-mc

go/Makefile

@@ -113,9 +113,9 @@ ql/lib/go.dbscheme.stats: ql/lib/go.dbscheme build/stats/src.stamp extractor
 
 test: all build/testdb/check-upgrade-path
 	codeql test run -j0 ql/test --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
-  #	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
+#	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
 	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path build/codeql-extractor-go --consistency-queries ql/test/consistency --compilation-cache=$(cache)
-	cd extractor; go test -mod=vendor ./... | grep -vF "[no test files]"
+	cd extractor; go test -mod=vendor ./...
 	bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
 
 .PHONY: build/testdb/check-upgrade-path

go/extractor/cli/go-autobuilder/go-autobuilder_test.go

@@ -36,45 +36,37 @@ func TestParseGoVersion(t *testing.T) {
 
 func TestGetVersionToInstall(t *testing.T) {
 	tests := map[versionInfo]string{
-		// checkForUnsupportedVersions()
-
-		// go.mod version below minGoVersion
-		{"0.0", true, "1.20.3", true}: "",
-		{"0.0", true, "9999.0", true}: "",
-		{"0.0", true, "1.2.2", true}:  "",
-		{"0.0", true, "", false}:      "",
-		// go.mod version above maxGoVersion
-		{"9999.0", true, "1.20.3", true}:   "",
-		{"9999.0", true, "9999.0.1", true}: "",
-		{"9999.0", true, "1.1", true}:      "",
-		{"9999.0", true, "", false}:        "",
-		// Go installation found with version below minGoVersion
-		{"1.20", true, "1.2.2", true}: "1.20",
-		{"1.11", true, "1.2.2", true}: "1.11",
+		// getVersionWhenGoModVersionNotFound()
+		{"", false, "", false}:        maxGoVersion,
 		{"", false, "1.2.2", true}:    maxGoVersion,
-		// Go installation found with version above maxGoVersion
-		{"1.20", true, "9999.0.1", true}: "1.20",
-		{"1.11", true, "9999.0.1", true}: "1.11",
-		{"", false, "9999.0.1", true}:    maxGoVersion,
+		{"", false, "9999.0.1", true}: maxGoVersion,
+		{"", false, "1.11.13", true}:  "",
+		{"", false, "1.20.3", true}:   "",
 
-		// checkForVersionsNotFound()
+		// getVersionWhenGoModVersionTooHigh()
+		{"9999.0", true, "", false}:           maxGoVersion,
+		{"9999.0", true, "9999.0.1", true}:    "",
+		{"9999.0", true, "1.1", true}:         maxGoVersion,
+		{"9999.0", true, minGoVersion, false}: maxGoVersion,
+		{"9999.0", true, maxGoVersion, true}:  "",
 
-		// Go installation not found, go.mod version in supported range
-		{"1.20", true, "", false}: "1.20",
-		{"1.11", true, "", false}: "1.11",
-		// Go installation not found, go.mod not found
-		{"", false, "", false}: maxGoVersion,
-		// Go installation found with version in supported range, go.mod not found
-		{"", false, "1.11.13", true}: "",
-		{"", false, "1.20.3", true}:  "",
-
-		// compareVersions()
+		// getVersionWhenGoModVersionTooLow()
+		{"0.0", true, "", false}:      minGoVersion,
+		{"0.0", true, "9999.0", true}: minGoVersion,
+		{"0.0", true, "1.2.2", true}:  minGoVersion,
+		{"0.0", true, "1.20.3", true}: "",
 
-		// Go installation found with version in supported range, go.mod version in supported range and go.mod version > go installation version
+		// getVersionWhenGoModVersionSupported()
+		{"1.20", true, "", false}:        "1.20",
+		{"1.11", true, "", false}:        "1.11",
+		{"1.20", true, "1.2.2", true}:    "1.20",
+		{"1.11", true, "1.2.2", true}:    "1.11",
+		{"1.20", true, "9999.0.1", true}: "1.20",
+		{"1.11", true, "9999.0.1", true}: "1.11",
+		// go.mod version > go installation version
 		{"1.20", true, "1.11.13", true}: "1.20",
 		{"1.20", true, "1.12", true}:    "1.20",
-		// Go installation found with version in supported range, go.mod version in supported range and go.mod version <= go installation version
-		// (Note comparisons ignore the patch version)
+		// go.mod version <= go installation version (Note comparisons ignore the patch version)
 		{"1.11", true, "1.20", true}:   "",
 		{"1.11", true, "1.20.3", true}: "",
 		{"1.20", true, "1.20.3", true}: "",