Harden Go resolver version tests

Co-authored-by: jketema <93738568+jketema@users.noreply.github.com>

Author: Copilot

go/extractor/autobuilder/build-environment_test.go

@@ -1,16 +1,29 @@
 package autobuilder
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/github/codeql-go/extractor/util"
 )
 
+func addMinorVersions(t *testing.T, version util.SemVer, count int) string {
+	t.Helper()
+
+	var major, minor int
+	if _, err := fmt.Sscanf(version.StandardSemVer(), "%d.%d", &major, &minor); err != nil {
+		t.Fatalf("Unable to parse Go version %q: %s", version, err)
+	}
+	return fmt.Sprintf("%d.%d", major, minor+count)
+}
+
 func TestGetVersionToInstall(t *testing.T) {
 	type inputVersions struct {
 		modVersion string
 		envVersion string
 	}
+	versionAboveMax := addMinorVersions(t, maxGoVersion, 1)
+	versionTwoAboveMax := addMinorVersions(t, maxGoVersion, 2)
 	tests := map[inputVersions]string{
 		// getVersionWhenGoModVersionNotFound()
 		{"", ""}:         maxGoVersion.String(),
@@ -20,15 +33,13 @@ func TestGetVersionToInstall(t *testing.T) {
 		{"", "1.20.3"}:   "",
 
 		// getVersionWhenGoModVersionTooHigh()
-		{"1.28", ""}:                      "1.28",
-		{"1.28", "1.1"}:                   "1.28",
-		{"1.28", "1.20"}:                  "1.28",
-		{"1.28", maxGoVersion.String()}:   "1.28",
-		{"1.29", "1.28"}:                  "1.29",
-		{"1.28", "1.28"}:                  "",
-		{"1.28", "1.29"}:                  "",
-		{"9999.0", "9999.0.1"}:            "",
-		{"9999.0", minGoVersion.String()}: "9999.0",
+		{versionAboveMax, ""}:                    versionAboveMax,
+		{versionAboveMax, "1.1"}:                 versionAboveMax,
+		{versionAboveMax, minGoVersion.String()}: versionAboveMax,
+		{versionAboveMax, maxGoVersion.String()}: versionAboveMax,
+		{versionTwoAboveMax, versionAboveMax}:    versionTwoAboveMax,
+		{versionAboveMax, versionAboveMax}:       "",
+		{versionAboveMax, versionTwoAboveMax}:    "",
 
 		// getVersionWhenGoModVersionTooLow()
 		{"0.0", ""}:       minGoVersion.String(),

go/ql/test/library-tests/semmle/go/dependencies/sweb/go.mod

@@ -35,3 +35,29 @@ replace google.golang.org/appengine => github.com/golang/appengine v1.6.1
 replace golang.org/x/mobile => github.com/golang/mobile v0.0.0-20190607214518-6fa95d984e88
 
 replace golang.org/x/image => github.com/golang/image v0.0.0-20190622003408-7e034cad6442
+
+require (
+	github.com/Joker/jade v1.0.0 // indirect
+	github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 // indirect
+	github.com/aymerick/raymond v2.0.2+incompatible // indirect
+	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect
+	github.com/iris-contrib/blackfriday v2.0.0+incompatible // indirect
+	github.com/iris-contrib/formBinder v0.0.0-20190104093907-fbd5963f41e1 // indirect
+	github.com/iris-contrib/go.uuid v2.0.0+incompatible // indirect
+	github.com/json-iterator/go v1.1.6 // indirect
+	github.com/kataras/golog v0.0.0-20190624001437-99c81de45f40 // indirect
+	github.com/kataras/iris v11.1.1+incompatible
+	github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d // indirect
+	github.com/klauspost/compress v1.7.2 // indirect
+	github.com/klauspost/cpuid v1.2.1 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.2 // indirect
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/ryanuber/columnize v2.1.0+incompatible // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/spf13/cobra v0.0.5
+	github.com/spf13/viper v1.4.0
+)