internal/lsp: move gopls/internal/regtest -> internal/lsp/regtest

myitcv · findleyr · commit a8e7c0c9c2a7 · 2021-04-23T16:19:37.000Z
Note: this only moves the regtest framework, not the gopls regtest tests. Change-Id: Ia70d2e97df8a8bd48a042e5b037c1e56a210b594 Reviewed-on: https://go-review.googlesource.com/c/tools/+/312412 Trust: Paul Jolly <paul@myitcv.org.uk> Run-TryBot: Paul Jolly <paul@myitcv.org.uk> gopls-CI: kokoro <noreply+kokoro@google.com> Reviewed-by: Robert Findley <rfindley@google.com> TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/gopls/internal/regtest/bench/bench_test.go b/gopls/internal/regtest/bench/bench_test.go
@@ -9,13 +9,14 @@ import (
 	"fmt"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/protocol"
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 func printBenchmarkResults(result testing.BenchmarkResult) {
diff --git a/gopls/internal/regtest/bench/completion_bench_test.go b/gopls/internal/regtest/bench/completion_bench_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/fake"
 )
diff --git a/gopls/internal/regtest/bench/stress_test.go b/gopls/internal/regtest/bench/stress_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 // Pilosa is a repository that has historically caused significant memory
diff --git a/gopls/internal/regtest/codelens/codelens_test.go b/gopls/internal/regtest/codelens/codelens_test.go
@@ -10,7 +10,8 @@ import (
 	"testing"
 	"time"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/command"
 	"golang.org/x/tools/internal/lsp/fake"
@@ -20,7 +21,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 func TestDisablingCodeLens(t *testing.T) {
diff --git a/gopls/internal/regtest/completion/completion_test.go b/gopls/internal/regtest/completion/completion_test.go
@@ -9,15 +9,16 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/fake"
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/testenv"
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 const proxy = `
diff --git a/gopls/internal/regtest/completion/postfix_snippet_test.go b/gopls/internal/regtest/completion/postfix_snippet_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 	"golang.org/x/tools/internal/lsp/source"
 )
 
diff --git a/gopls/internal/regtest/diagnostics/diagnostics_test.go b/gopls/internal/regtest/diagnostics/diagnostics_test.go
@@ -10,7 +10,8 @@ import (
 	"log"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp"
 	"golang.org/x/tools/internal/lsp/fake"
@@ -19,7 +20,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 // Use mod.com for all go.mod files due to golang/go#35230.
diff --git a/gopls/internal/regtest/misc/configuration_test.go b/gopls/internal/regtest/misc/configuration_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/fake"
 	"golang.org/x/tools/internal/testenv"
diff --git a/gopls/internal/regtest/misc/definition_test.go b/gopls/internal/regtest/misc/definition_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/fake"
 	"golang.org/x/tools/internal/lsp/tests"
diff --git a/gopls/internal/regtest/misc/embed_test.go b/gopls/internal/regtest/misc/embed_test.go
@@ -6,7 +6,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 	"golang.org/x/tools/internal/testenv"
 )
 
diff --git a/gopls/internal/regtest/misc/failures_test.go b/gopls/internal/regtest/misc/failures_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 // This test passes (TestHoverOnError in definition_test.go) without
diff --git a/gopls/internal/regtest/misc/fix_test.go b/gopls/internal/regtest/misc/fix_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/lsp/tests"
diff --git a/gopls/internal/regtest/misc/formatting_test.go b/gopls/internal/regtest/misc/formatting_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/tests"
 )
diff --git a/gopls/internal/regtest/misc/generate_test.go b/gopls/internal/regtest/misc/generate_test.go
@@ -12,7 +12,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 func TestGenerateProgress(t *testing.T) {
diff --git a/gopls/internal/regtest/misc/highlight_test.go b/gopls/internal/regtest/misc/highlight_test.go
@@ -8,9 +8,9 @@ import (
 	"sort"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
 	"golang.org/x/tools/internal/lsp/fake"
 	"golang.org/x/tools/internal/lsp/protocol"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 func TestWorkspacePackageHighlight(t *testing.T) {
diff --git a/gopls/internal/regtest/misc/imports_test.go b/gopls/internal/regtest/misc/imports_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/testenv"
diff --git a/gopls/internal/regtest/misc/link_test.go b/gopls/internal/regtest/misc/link_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/testenv"
 )
diff --git a/gopls/internal/regtest/misc/misc_test.go b/gopls/internal/regtest/misc/misc_test.go
@@ -7,9 +7,10 @@ package misc
 import (
 	"testing"
 
-	"golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	"golang.org/x/tools/internal/lsp/regtest"
 )
 
 func TestMain(m *testing.M) {
-	regtest.Main(m)
+	regtest.Main(m, hooks.Options)
 }
diff --git a/gopls/internal/regtest/misc/references_test.go b/gopls/internal/regtest/misc/references_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 func TestStdlibReferences(t *testing.T) {
diff --git a/gopls/internal/regtest/misc/shared_test.go b/gopls/internal/regtest/misc/shared_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 )
 
 const sharedProgram = `
diff --git a/gopls/internal/regtest/misc/vendor_test.go b/gopls/internal/regtest/misc/vendor_test.go
@@ -7,7 +7,7 @@ package misc
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/testenv"
diff --git a/gopls/internal/regtest/modfile/modfile_test.go b/gopls/internal/regtest/modfile/modfile_test.go
@@ -9,15 +9,16 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/lsp/tests"
 	"golang.org/x/tools/internal/testenv"
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 const workspaceProxy = `
diff --git a/gopls/internal/regtest/watch/watch_test.go b/gopls/internal/regtest/watch/watch_test.go
@@ -7,15 +7,16 @@ package regtest
 import (
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/fake"
 	"golang.org/x/tools/internal/lsp/protocol"
 	"golang.org/x/tools/internal/testenv"
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 func TestEditFile(t *testing.T) {
diff --git a/gopls/internal/regtest/workspace/workspace_test.go b/gopls/internal/regtest/workspace/workspace_test.go
@@ -12,7 +12,8 @@ import (
 	"strings"
 	"testing"
 
-	. "golang.org/x/tools/gopls/internal/regtest"
+	"golang.org/x/tools/gopls/internal/hooks"
+	. "golang.org/x/tools/internal/lsp/regtest"
 
 	"golang.org/x/tools/internal/lsp/command"
 	"golang.org/x/tools/internal/lsp/fake"
@@ -21,7 +22,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	Main(m)
+	Main(m, hooks.Options)
 }
 
 const workspaceProxy = `
diff --git a/internal/lsp/regtest/doc.go b/internal/lsp/regtest/doc.go
diff --git a/internal/lsp/regtest/env.go b/internal/lsp/regtest/env.go
diff --git a/internal/lsp/regtest/env_test.go b/internal/lsp/regtest/env_test.go
diff --git a/internal/lsp/regtest/expectation.go b/internal/lsp/regtest/expectation.go
diff --git a/internal/lsp/regtest/regtest.go b/internal/lsp/regtest/regtest.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"golang.org/x/tools/internal/lsp/cmd"
+	"golang.org/x/tools/internal/lsp/source"
 	"golang.org/x/tools/internal/testenv"
 	"golang.org/x/tools/internal/tool"
 )
@@ -83,7 +84,7 @@ func DefaultModes() Mode {
 }
 
 // Main sets up and tears down the shared regtest state.
-func Main(m *testing.M) {
+func Main(m *testing.M, hook func(*source.Options)) {
 	testenv.ExitIfSmallMachine()
 
 	flag.Parse()
@@ -97,6 +98,7 @@ func Main(m *testing.M) {
 		Timeout:                  *regtestTimeout,
 		PrintGoroutinesOnFailure: *printGoroutinesOnFailure,
 		SkipCleanup:              *skipCleanup,
+		OptionsHook:              hook,
 	}
 	if *runSubprocessTests {
 		goplsPath := *goplsBinaryPath
diff --git a/internal/lsp/regtest/runner.go b/internal/lsp/regtest/runner.go
@@ -21,7 +21,6 @@ import (
 
 	exec "golang.org/x/sys/execabs"
 
-	"golang.org/x/tools/gopls/internal/hooks"
 	"golang.org/x/tools/internal/jsonrpc2"
 	"golang.org/x/tools/internal/jsonrpc2/servertest"
 	"golang.org/x/tools/internal/lsp/cache"
@@ -60,6 +59,7 @@ type Runner struct {
 	PrintGoroutinesOnFailure bool
 	TempDir                  string
 	SkipCleanup              bool
+	OptionsHook              func(*source.Options)
 
 	mu        sync.Mutex
 	ts        *servertest.TCPServer
@@ -84,7 +84,7 @@ func (r *Runner) defaultConfig() *runConfig {
 	return &runConfig{
 		modes:       r.DefaultModes,
 		timeout:     r.Timeout,
-		optionsHook: hooks.Options,
+		optionsHook: r.OptionsHook,
 	}
 }
 
diff --git a/internal/lsp/regtest/wrappers.go b/internal/lsp/regtest/wrappers.go

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@ import (`
`9`	`9`	`"fmt"`
`10`	`10`	`"testing"`
`11`	`11`
`12`		`- . "golang.org/x/tools/gopls/internal/regtest"`
	`12`	`+ "golang.org/x/tools/gopls/internal/hooks"`
	`13`	`+ . "golang.org/x/tools/internal/lsp/regtest"`
`13`	`14`
`14`	`15`	`"golang.org/x/tools/internal/lsp/protocol"`
`15`	`16`	`)`
`16`	`17`
`17`	`18`	`func TestMain(m *testing.M) {`
`18`		`- Main(m)`
	`19`	`+ Main(m, hooks.Options)`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`func printBenchmarkResults(result testing.BenchmarkResult) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"strings"`
`12`	`12`	`"testing"`
`13`	`13`
`14`		`- . "golang.org/x/tools/gopls/internal/regtest"`
	`14`	`+ . "golang.org/x/tools/internal/lsp/regtest"`
`15`	`15`
`16`	`16`	`"golang.org/x/tools/internal/lsp/fake"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ import (`
`10`	`10`	`"testing"`
`11`	`11`	`"time"`
`12`	`12`
`13`		`- . "golang.org/x/tools/gopls/internal/regtest"`
	`13`	`+ "golang.org/x/tools/gopls/internal/hooks"`
	`14`	`+ . "golang.org/x/tools/internal/lsp/regtest"`
`14`	`15`
`15`	`16`	`"golang.org/x/tools/internal/lsp/command"`
`16`	`17`	`"golang.org/x/tools/internal/lsp/fake"`
`@@ -20,7 +21,7 @@ import (`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`func TestMain(m *testing.M) {`
`23`		`- Main(m)`
	`24`	`+ Main(m, hooks.Options)`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`func TestDisablingCodeLens(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strings"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- . "golang.org/x/tools/gopls/internal/regtest"`
	`11`	`+ . "golang.org/x/tools/internal/lsp/regtest"`
`12`	`12`	`"golang.org/x/tools/internal/lsp/source"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ package misc`
`6`	`6`	`import (`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- . "golang.org/x/tools/gopls/internal/regtest"`
	`9`	`+ . "golang.org/x/tools/internal/lsp/regtest"`
`10`	`10`	`"golang.org/x/tools/internal/testenv"`
`11`	`11`	`)`
`12`	`12`