From bb0a9cda62f3c25b9f311456ce78804b86ce4214 Mon Sep 17 00:00:00 2001 From: Peter Weinberger Date: Sat, 25 Jan 2025 14:56:04 -0500 Subject: [PATCH] gopls: remove go.sum files from integration tests Explicit go.sum files in the txtar data for tests makes it harder to modify the tests. This CL replaces the ones in the gopls integration tests with calls to WriteGoSum in test setup. And as part of modernization, a few 'interface{}'s have been replaced with 'any's. Change-Id: I951fa6d7b2ed780df68f4bc0d043f0738612da28 Reviewed-on: https://go-review.googlesource.com/c/tools/+/644335 Reviewed-by: Alan Donovan LUCI-TryBot-Result: Go LUCI --- .../test/integration/codelens/codelens_test.go | 14 +++++--------- .../integration/completion/completion_test.go | 11 ++++------- .../integration/diagnostics/diagnostics_test.go | 8 ++------ .../test/integration/misc/configuration_test.go | 2 +- .../test/integration/misc/definition_test.go | 5 +---- .../test/integration/misc/highlight_test.go | 4 +--- .../test/integration/misc/references_test.go | 5 +---- .../test/integration/misc/vendor_test.go | 8 ++------ .../internal/test/integration/misc/vuln_test.go | 14 ++------------ .../test/integration/modfile/modfile_test.go | 16 +--------------- .../test/integration/watch/setting_test.go | 2 +- .../test/integration/watch/watch_test.go | 7 +++---- .../test/integration/workspace/metadata_test.go | 4 +--- .../integration/workspace/standalone_test.go | 2 +- .../test/integration/workspace/vendor_test.go | 5 +---- .../test/integration/workspace/workspace_test.go | 4 +--- 16 files changed, 28 insertions(+), 83 deletions(-) diff --git a/gopls/internal/test/integration/codelens/codelens_test.go b/gopls/internal/test/integration/codelens/codelens_test.go index bb8ad95ee19..c1f2c524232 100644 --- a/gopls/internal/test/integration/codelens/codelens_test.go +++ b/gopls/internal/test/integration/codelens/codelens_test.go @@ -261,9 +261,6 @@ module mod.com/a go 1.22 require golang.org/x/hello v1.2.3 --- go.sum -- -golang.org/x/hello v1.2.3 h1:7Wesfkx/uBd+eFgPrq0irYj/1XfmbvLV8jZ/W7C2Dwg= -golang.org/x/hello v1.2.3/go.mod h1:OgtlzsxVMUUdsdQCIDYgaauCTH47B8T8vofouNJfzgY= -- main.go -- package main @@ -282,6 +279,7 @@ require golang.org/x/hello v1.3.3 ` WithOptions( + WriteGoSum("."), ProxyFiles(proxyWithLatest), ).Run(t, shouldUpdateDep, func(t *testing.T, env *Env) { env.RunGoCommand("mod", "vendor") @@ -335,11 +333,6 @@ require golang.org/x/hello v1.0.0 require golang.org/x/unused v1.0.0 // EOF --- go.sum -- -golang.org/x/hello v1.0.0 h1:qbzE1/qT0/zojAMd/JcPsO2Vb9K4Bkeyq0vB2JGMmsw= -golang.org/x/hello v1.0.0/go.mod h1:WW7ER2MRNXWA6c8/4bDIek4Hc/+DofTrMaQQitGXcco= -golang.org/x/unused v1.0.0 h1:LecSbCn5P3vTcxubungSt1Pn4D/WocCaiWOPDC0y0rw= -golang.org/x/unused v1.0.0/go.mod h1:ihoW8SgWzugwwj0N2SfLfPZCxTB1QOVfhMfB5PWTQ8U= -- main.go -- package main @@ -349,7 +342,10 @@ func main() { _ = hi.Goodbye } ` - WithOptions(ProxyFiles(proxy)).Run(t, shouldRemoveDep, func(t *testing.T, env *Env) { + WithOptions( + WriteGoSum("."), + ProxyFiles(proxy), + ).Run(t, shouldRemoveDep, func(t *testing.T, env *Env) { env.OpenFile("go.mod") env.RegexpReplace("go.mod", "// EOF", "// EOF unsaved edit") // unsaved edits ok env.ExecuteCodeLensCommand("go.mod", command.Tidy, nil) diff --git a/gopls/internal/test/integration/completion/completion_test.go b/gopls/internal/test/integration/completion/completion_test.go index fe6a367e71b..1d293fe9019 100644 --- a/gopls/internal/test/integration/completion/completion_test.go +++ b/gopls/internal/test/integration/completion/completion_test.go @@ -276,9 +276,6 @@ module mod.com go 1.14 require example.com v1.2.3 --- go.sum -- -example.com v1.2.3 h1:ihBTGWGjTU3V4ZJ9OmHITkU9WQ4lGdQkMjgyLFk0FaY= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -- main.go -- package main @@ -295,6 +292,7 @@ func _() { } ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), ).Run(t, mod, func(t *testing.T, env *Env) { // Make sure the dependency is in the module cache and accessible for @@ -347,9 +345,6 @@ module mod.com go 1.14 require example.com v1.2.3 --- go.sum -- -example.com v1.2.3 h1:ihBTGWGjTU3V4ZJ9OmHITkU9WQ4lGdQkMjgyLFk0FaY= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -- useblah.go -- // +build hidden @@ -361,7 +356,9 @@ package mainmod const Name = "mainmod" ` - WithOptions(ProxyFiles(proxy)).Run(t, files, func(t *testing.T, env *Env) { + WithOptions( + WriteGoSum("."), + ProxyFiles(proxy)).Run(t, files, func(t *testing.T, env *Env) { env.CreateBuffer("import.go", "package pkg\nvar _ = mainmod.Name\n") env.SaveBuffer("import.go") content := env.ReadWorkspaceFile("import.go") diff --git a/gopls/internal/test/integration/diagnostics/diagnostics_test.go b/gopls/internal/test/integration/diagnostics/diagnostics_test.go index 9e6c504cc86..c496f6464a3 100644 --- a/gopls/internal/test/integration/diagnostics/diagnostics_test.go +++ b/gopls/internal/test/integration/diagnostics/diagnostics_test.go @@ -421,9 +421,6 @@ module mod.com go 1.12 require foo.test v1.2.3 --- go.sum -- -foo.test v1.2.3 h1:TMA+lyd1ck0TqjSFpNe4T6cf/K6TYkoHwOOcMBMjaEw= -foo.test v1.2.3/go.mod h1:Ij3kyLIe5lzjycjh13NL8I2gX0quZuTdW0MnmlwGBL4= -- print.go -- package lib @@ -451,6 +448,7 @@ const Answer = 42 func TestResolveDiagnosticWithDownload(t *testing.T) { WithOptions( + WriteGoSum("."), ProxyFiles(testPackageWithRequireProxy), ).Run(t, testPackageWithRequire, func(t *testing.T, env *Env) { env.OpenFile("print.go") @@ -1753,9 +1751,6 @@ module mod.com go 1.12 require nested.com v1.0.0 --- go.sum -- -nested.com v1.0.0 h1:I6spLE4CgFqMdBPc+wTV2asDO2QJ3tU0YAT+jkLeN1I= -nested.com v1.0.0/go.mod h1:ly53UzXQgVjSlV7wicdBB4p8BxfytuGT1Xcyv0ReJfI= -- main.go -- package main @@ -1779,6 +1774,7 @@ package hello func helloHelper() {} ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), Modes(Default), ).Run(t, nested, func(t *testing.T, env *Env) { diff --git a/gopls/internal/test/integration/misc/configuration_test.go b/gopls/internal/test/integration/misc/configuration_test.go index 1077c21ac36..6d588a7d3da 100644 --- a/gopls/internal/test/integration/misc/configuration_test.go +++ b/gopls/internal/test/integration/misc/configuration_test.go @@ -186,7 +186,7 @@ var ErrFoo = errors.New("foo") cfg.Env = map[string]string{ "AN_ARBITRARY_VAR": "FOO", } - cfg.Settings = map[string]interface{}{ + cfg.Settings = map[string]any{ "staticcheck": true, } env.ChangeConfiguration(cfg) diff --git a/gopls/internal/test/integration/misc/definition_test.go b/gopls/internal/test/integration/misc/definition_test.go index 95054977e14..d36bb024672 100644 --- a/gopls/internal/test/integration/misc/definition_test.go +++ b/gopls/internal/test/integration/misc/definition_test.go @@ -466,10 +466,6 @@ module example.com/a go 1.14 require other.com/b v1.0.0 --- go.sum -- -other.com/b v1.0.0 h1:1wb3PMGdet5ojzrKl+0iNksRLnOM9Jw+7amBNqmYwqk= -other.com/b v1.0.0/go.mod h1:TgHQFucl04oGT+vrUm/liAzukYHNxCwKNkQZEyn3m9g= - -- a.go -- package a import "other.com/b" @@ -477,6 +473,7 @@ const _ = b.K ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), Modes(Default), // fails in 'experimental' mode ).Run(t, src, func(t *testing.T, env *Env) { diff --git a/gopls/internal/test/integration/misc/highlight_test.go b/gopls/internal/test/integration/misc/highlight_test.go index 9e3dd980464..e4da558e5d0 100644 --- a/gopls/internal/test/integration/misc/highlight_test.go +++ b/gopls/internal/test/integration/misc/highlight_test.go @@ -95,9 +95,6 @@ module mod.com go 1.12 require example.com v1.2.3 --- go.sum -- -example.com v1.2.3 h1:WFzrgiQJwEDJNLDUOV1f9qlasQkvzXf2UNLaNIqbWsI= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -- main.go -- package main @@ -110,6 +107,7 @@ func main() {}` WithOptions( ProxyFiles(proxy), + WriteGoSum("."), ).Run(t, mod, func(t *testing.T, env *Env) { env.OpenFile("main.go") diff --git a/gopls/internal/test/integration/misc/references_test.go b/gopls/internal/test/integration/misc/references_test.go index 73e4fffe3b8..e84dcd71dc3 100644 --- a/gopls/internal/test/integration/misc/references_test.go +++ b/gopls/internal/test/integration/misc/references_test.go @@ -376,10 +376,6 @@ module example.com/a go 1.14 require other.com/b v1.0.0 --- go.sum -- -other.com/b v1.0.0 h1:9WyCKS+BLAMRQM0CegP6zqP2beP+ShTbPaARpNY31II= -other.com/b v1.0.0/go.mod h1:TgHQFucl04oGT+vrUm/liAzukYHNxCwKNkQZEyn3m9g= - -- a.go -- package a import "other.com/b" @@ -388,6 +384,7 @@ var _ b.B ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), Modes(Default), // fails in 'experimental' mode ).Run(t, src, func(t *testing.T, env *Env) { diff --git a/gopls/internal/test/integration/misc/vendor_test.go b/gopls/internal/test/integration/misc/vendor_test.go index f3bed9082b7..6606772737e 100644 --- a/gopls/internal/test/integration/misc/vendor_test.go +++ b/gopls/internal/test/integration/misc/vendor_test.go @@ -31,9 +31,6 @@ module mod.com go 1.14 require golang.org/x/hello v1.2.3 --- go.sum -- -golang.org/x/hello v1.2.3 h1:EcMp5gSkIhaTkPXp8/3+VH+IFqTpk3ZbpOhqk0Ncmho= -golang.org/x/hello v1.2.3/go.mod h1:WW7ER2MRNXWA6c8/4bDIek4Hc/+DofTrMaQQitGXcco= -- vendor/modules.txt -- -- a/a1.go -- package a @@ -48,6 +45,7 @@ func _() { WithOptions( Modes(Default), ProxyFiles(basicProxy), + WriteGoSum("."), ).Run(t, pkgThatUsesVendoring, func(t *testing.T, env *Env) { env.OpenFile("a/a1.go") d := &protocol.PublishDiagnosticsParams{} @@ -71,9 +69,6 @@ module mod.com go 1.14 require golang.org/x/hello v1.2.3 --- go.sum -- -golang.org/x/hello v1.2.3 h1:EcMp5gSkIhaTkPXp8/3+VH+IFqTpk3ZbpOhqk0Ncmho= -golang.org/x/hello v1.2.3/go.mod h1:WW7ER2MRNXWA6c8/4bDIek4Hc/+DofTrMaQQitGXcco= -- main.go -- package main @@ -86,6 +81,7 @@ func main() { WithOptions( Modes(Default), ProxyFiles(basicProxy), + WriteGoSum("."), ).Run(t, src, func(t *testing.T, env *Env) { env.OpenFile("main.go") env.AfterChange(NoDiagnostics()) diff --git a/gopls/internal/test/integration/misc/vuln_test.go b/gopls/internal/test/integration/misc/vuln_test.go index 9f6061c43d9..9dad13179af 100644 --- a/gopls/internal/test/integration/misc/vuln_test.go +++ b/gopls/internal/test/integration/misc/vuln_test.go @@ -368,13 +368,6 @@ require ( golang.org/amod v1.0.0 // indirect golang.org/bmod v0.5.0 // indirect ) --- go.sum -- -golang.org/amod v1.0.0 h1:EUQOI2m5NhQZijXZf8WimSnnWubaFNrrKUH/PopTN8k= -golang.org/amod v1.0.0/go.mod h1:yvny5/2OtYFomKt8ax+WJGvN6pfN1pqjGnn7DQLUi6E= -golang.org/bmod v0.5.0 h1:KgvUulMyMiYRB7suKA0x+DfWRVdeyPgVJvcishTH+ng= -golang.org/bmod v0.5.0/go.mod h1:f6o+OhF66nz/0BBc/sbCsshyPRKMSxZIlG50B/bsM4c= -golang.org/cmod v1.1.3 h1:PJ7rZFTk7xGAunBRDa0wDe7rZjZ9R/vr1S2QkVVCngQ= -golang.org/cmod v1.1.3/go.mod h1:eCR8dnmvLYQomdeAZRCPgS5JJihXtqOQrpEkNj5feQA= -- x/x.go -- package x @@ -497,7 +490,7 @@ func vulnTestEnv(proxyData string) (*vulntest.DB, []RunOption, error) { "_GOPLS_TEST_BINARY_RUN_AS_GOPLS": "true", // needed to run `gopls vulncheck`. "GOSUMDB": "off", } - return db, []RunOption{ProxyFiles(proxyData), ev, settings}, nil + return db, []RunOption{ProxyFiles(proxyData), ev, settings, WriteGoSum(".")}, nil } func TestRunVulncheckPackageDiagnostics(t *testing.T) { @@ -675,7 +668,7 @@ func TestRunGovulncheck_Expiry(t *testing.T) { }) } -func stringify(a interface{}) string { +func stringify(a any) string { data, _ := json.Marshal(a) return string(data) } @@ -814,9 +807,6 @@ go 1.18 require golang.org/bmod v0.5.0 --- go.sum -- -golang.org/bmod v0.5.0 h1:MT/ysNRGbCiURc5qThRFWaZ5+rK3pQRPo9w7dYZfMDk= -golang.org/bmod v0.5.0/go.mod h1:k+zl+Ucu4yLIjndMIuWzD/MnOHy06wqr3rD++y0abVs= -- x/x.go -- package x diff --git a/gopls/internal/test/integration/modfile/modfile_test.go b/gopls/internal/test/integration/modfile/modfile_test.go index 243bb04e960..5a194246a42 100644 --- a/gopls/internal/test/integration/modfile/modfile_test.go +++ b/gopls/internal/test/integration/modfile/modfile_test.go @@ -808,7 +808,6 @@ go 1.12 require ( example.com v1.2.3 ) --- go.sum -- -- main.go -- package main @@ -918,11 +917,6 @@ module mod.com go 1.12 require hasdep.com v1.2.3 --- go.sum -- -example.com v1.2.3 h1:ihBTGWGjTU3V4ZJ9OmHITkU9WQ4lGdQkMjgyLFk0FaY= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -hasdep.com v1.2.3 h1:00y+N5oD+SpKoqV1zP2VOPawcW65Zb9NebANY3GSzGI= -hasdep.com v1.2.3/go.mod h1:ePVZOlez+KZEOejfLPGL2n4i8qiAjrkhQZ4wcImqAes= -- main.go -- package main @@ -957,19 +951,13 @@ go 1.12 require hasdep.com v1.2.3 require random.com v1.2.3 --- go.sum -- -example.com v1.2.3 h1:ihBTGWGjTU3V4ZJ9OmHITkU9WQ4lGdQkMjgyLFk0FaY= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -hasdep.com v1.2.3 h1:00y+N5oD+SpKoqV1zP2VOPawcW65Zb9NebANY3GSzGI= -hasdep.com v1.2.3/go.mod h1:ePVZOlez+KZEOejfLPGL2n4i8qiAjrkhQZ4wcImqAes= -random.com v1.2.3 h1:PzYTykzqqH6+qU0dIgh9iPFbfb4Mm8zNBjWWreRKtx0= -random.com v1.2.3/go.mod h1:8EGj+8a4Hw1clAp8vbaeHAsKE4sbm536FP7nKyXO+qQ= -- main.go -- package main func main() {} ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), ).Run(t, mod, func(t *testing.T, env *Env) { d := &protocol.PublishDiagnosticsParams{} @@ -1010,7 +998,6 @@ go 1.12 require ( example.com v1.2.3 ) --- go.sum -- -- main.go -- package main @@ -1078,7 +1065,6 @@ func Goodbye() { module mod.com go 1.12 --- go.sum -- -- main.go -- package main diff --git a/gopls/internal/test/integration/watch/setting_test.go b/gopls/internal/test/integration/watch/setting_test.go index abd9799c584..2a825a5b937 100644 --- a/gopls/internal/test/integration/watch/setting_test.go +++ b/gopls/internal/test/integration/watch/setting_test.go @@ -60,7 +60,7 @@ package subdir // use (true|false) or some other truthy value. func TestSubdirWatchPatterns_BadValues(t *testing.T) { tests := []struct { - badValue interface{} + badValue any wantMessage string }{ {true, "invalid type bool (want string)"}, diff --git a/gopls/internal/test/integration/watch/watch_test.go b/gopls/internal/test/integration/watch/watch_test.go index 3fb1ab546a6..340ceb5ebf7 100644 --- a/gopls/internal/test/integration/watch/watch_test.go +++ b/gopls/internal/test/integration/watch/watch_test.go @@ -525,9 +525,6 @@ module mod.com go 1.12 require example.com v1.2.2 --- go.sum -- -example.com v1.2.3 h1:OnPPkx+rW63kj9pgILsu12MORKhSlnFa3DVRJq1HZ7g= -example.com v1.2.3/go.mod h1:Y2Rc5rVWjWur0h3pd9aEvK5Pof8YKDANh9gHA2Maujo= -- main.go -- package main @@ -537,7 +534,9 @@ func main() { blah.X() } ` - WithOptions(ProxyFiles(proxy)).Run(t, mod, func(t *testing.T, env *Env) { + WithOptions( + WriteGoSum("."), + ProxyFiles(proxy)).Run(t, mod, func(t *testing.T, env *Env) { env.WriteWorkspaceFiles(map[string]string{ "go.mod": `module mod.com diff --git a/gopls/internal/test/integration/workspace/metadata_test.go b/gopls/internal/test/integration/workspace/metadata_test.go index 59dfec3ad97..71ca4329777 100644 --- a/gopls/internal/test/integration/workspace/metadata_test.go +++ b/gopls/internal/test/integration/workspace/metadata_test.go @@ -217,9 +217,6 @@ module b.com/nested go 1.18 require b.com/other v1.4.6 --- go.sum -- -b.com/other v1.4.6 h1:pHXSzGsk6DamYXp9uRdDB9A/ZQqAN9it+JudU0sBf94= -b.com/other v1.4.6/go.mod h1:T0TYuGdAHw4p/l0+1P/yhhYHfZRia7PaadNVDu58OWM= -- nested.go -- package nested @@ -228,6 +225,7 @@ import "b.com/other/foo" const C = foo.Foo ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), ).Run(t, files, func(t *testing.T, env *Env) { env.OnceMet( diff --git a/gopls/internal/test/integration/workspace/standalone_test.go b/gopls/internal/test/integration/workspace/standalone_test.go index d837899f7fb..3b690465744 100644 --- a/gopls/internal/test/integration/workspace/standalone_test.go +++ b/gopls/internal/test/integration/workspace/standalone_test.go @@ -194,7 +194,7 @@ func main() {} ) cfg := env.Editor.Config() - cfg.Settings = map[string]interface{}{ + cfg.Settings = map[string]any{ "standaloneTags": []string{"ignore"}, } env.ChangeConfiguration(cfg) diff --git a/gopls/internal/test/integration/workspace/vendor_test.go b/gopls/internal/test/integration/workspace/vendor_test.go index f14cf539de0..10826430164 100644 --- a/gopls/internal/test/integration/workspace/vendor_test.go +++ b/gopls/internal/test/integration/workspace/vendor_test.go @@ -36,10 +36,6 @@ module example.com/a go 1.14 require other.com/b v1.0.0 --- go.sum -- -other.com/b v1.0.0 h1:ct1+0RPozzMvA2rSYnVvIfr/GDHcd7oVnw147okdi3g= -other.com/b v1.0.0/go.mod h1:bfTSZo/4ZtAQJWBYScopwW6n9Ctfsl2mi8nXsqjDXR8= - -- a.go -- package a @@ -49,6 +45,7 @@ var _ b.B ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), Modes(Default), ).Run(t, src, func(t *testing.T, env *Env) { diff --git a/gopls/internal/test/integration/workspace/workspace_test.go b/gopls/internal/test/integration/workspace/workspace_test.go index 587ac522c41..00d4d81e021 100644 --- a/gopls/internal/test/integration/workspace/workspace_test.go +++ b/gopls/internal/test/integration/workspace/workspace_test.go @@ -309,9 +309,6 @@ module a.com require c.com v1.2.3 exclude b.com v1.2.3 --- go.sum -- -c.com v1.2.3 h1:n07Dz9fYmpNqvZMwZi5NEqFcSHbvLa9lacMX+/g25tw= -c.com v1.2.3/go.mod h1:/4TyYgU9Nu5tA4NymP5xyqE8R2VMzGD3TbJCwCOvHAg= -- main.go -- package a @@ -320,6 +317,7 @@ func main() { } ` WithOptions( + WriteGoSum("."), ProxyFiles(proxy), ).Run(t, files, func(t *testing.T, env *Env) { env.OnceMet(