commit 31583a0dbbc8dd5a71cd4f785f1d5401eb26c969
author Rohan Challa <rohan@golang.org> Mon Mar 30 08:58:57 2020 -0400
committer Rohan Challa <rohan@golang.org> Mon Mar 30 17:55:17 2020 +0000
tree 678f5a5670d8a2d73217ec8b813ac13f8387cdbd
parent 9c79f685b721c14fdc8ca92a20099c6186b0abc1

internal/lsp/tests: remove ellipses from test names

This change makes working with tests easier by trimming the folder name
up to "testdata". This will remove any ellipses from the test folder name.

Fixes golang/go#38103

Change-Id: I33b931e527de63713b8fc370c50b1c382796b2b8
Reviewed-on: https://go-review.googlesource.com/c/tools/+/226377
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Run-TryBot: Rohan Challa <rohan@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

internal/lsp/cmd/cmd_test.go

diff --git a/internal/lsp/cmd/cmd_test.go b/internal/lsp/cmd/cmd_test.go
index 454bc2c..0f0ca86 100644
--- a/internal/lsp/cmd/cmd_test.go
+++ b/internal/lsp/cmd/cmd_test.go
@@ -39,7 +39,7 @@
 	data := tests.Load(t, exporter, "../testdata")
 	for _, datum := range data {
 		defer datum.Exported.Cleanup()
-		t.Run(datum.Folder, func(t *testing.T) {
+		t.Run(tests.FormatFolderName(datum.Folder), func(t *testing.T) {
 			t.Helper()
 			tests.Run(t, cmdtest.NewRunner(exporter, datum, ctx, ts.Addr, nil), datum)
 		})

internal/lsp/lsp_test.go

diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 90d3864..1d3fd86 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -89,7 +89,7 @@
 			data:   datum,
 			ctx:    ctx,
 		}
-		t.Run(datum.Folder, func(t *testing.T) {
+		t.Run(tests.FormatFolderName(datum.Folder), func(t *testing.T) {
 			t.Helper()
 			tests.Run(t, r, datum)
 		})

internal/lsp/source/source_test.go

diff --git a/internal/lsp/source/source_test.go b/internal/lsp/source/source_test.go
index e7358ce..15a1300 100644
--- a/internal/lsp/source/source_test.go
+++ b/internal/lsp/source/source_test.go
@@ -77,7 +77,7 @@
 		if _, err := session.DidModifyFiles(ctx, modifications); err != nil {
 			t.Fatal(err)
 		}
-		t.Run(datum.Folder, func(t *testing.T) {
+		t.Run(tests.FormatFolderName(datum.Folder), func(t *testing.T) {
 			t.Helper()
 			tests.Run(t, r, datum)
 		})

internal/lsp/tests/util.go

diff --git a/internal/lsp/tests/util.go b/internal/lsp/tests/util.go
index d6864d3..8d2fe05 100644
--- a/internal/lsp/tests/util.go
+++ b/internal/lsp/tests/util.go
@@ -496,3 +496,10 @@
 	}
 	return msg.String()
 }
+
+func FormatFolderName(folder string) string {
+	if index := strings.Index(folder, "testdata"); index != -1 {
+		return folder[index:]
+	}
+	return folder
+}