From 43fd8bc94bf9e21435e57abfb6bf6ab05903efb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 19 Sep 2025 10:47:48 +0100 Subject: [PATCH] all: consistently split test table structs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is common to separate multi-line structs in test case lists like so: { many: "x", fields: "y", }, { many: "x", fields: "y", }, { many: "x", fields: "y", } However, some of our test files used a different style: { many: "x", fields: "y"}, { many: "x", fields: "y"}, { many: "x", fields: "y", } This style is inconsistent, in that the last field does not finish with a comma and a newline. But most importantly, it harms readability, as it gets harder to spot when one struct finishes and another starts. Since we already use the more readable style in the majority of cases, switch these few files over too. Note that these files already used the better style in some cases, but not all of them. Signed-off-by: Daniel Martí Change-Id: I6cacae679af4446c36b19a57d55bdf706c6e3a58 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1222868 Reviewed-by: Paul Jolly TryBot-Result: CUEcueckoo Unity-Result: CUE porcuepine --- cue/ast/ast_test.go | 9 ++-- cue/load/loader_test.go | 96 ++++++++++++++++++++++++------------- cue/syntax_test.go | 3 +- mod/modfile/modfile_test.go | 6 ++- 4 files changed, 76 insertions(+), 38 deletions(-) diff --git a/cue/ast/ast_test.go b/cue/ast/ast_test.go index 9ec2a88a4..1799c28d5 100644 --- a/cue/ast/ast_test.go +++ b/cue/ast/ast_test.go @@ -104,7 +104,8 @@ func TestNewStruct(t *testing.T) { // foo ... -}`}, { +}`, + }, { input: []any{ &ast.LetClause{Ident: ast.NewIdent("foo"), Expr: ast.NewIdent("bar")}, ast.Label(ast.NewString("bar")), ast.NewString("baz"), @@ -117,7 +118,8 @@ func TestNewStruct(t *testing.T) { let foo = bar "bar": "baz" "a": "b" -}`}, { +}`, + }, { input: []any{ ast.NewIdent("opt"), token.OPTION, ast.NewString("foo"), ast.NewIdent("req"), token.NOT, ast.NewString("bar"), @@ -125,7 +127,8 @@ func TestNewStruct(t *testing.T) { want: `{ opt?: "foo" req!: "bar" -}`}, { +}`, + }, { input: []any{ast.Embed(ast.NewBool(true))}, want: `{ true diff --git a/cue/load/loader_test.go b/cue/load/loader_test.go index 242a9e925..897138160 100644 --- a/cue/load/loader_test.go +++ b/cue/load/loader_test.go @@ -96,7 +96,8 @@ display:. files: $CWD/testdata/testmod/test.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { name: "DefaultPackageWithExplicitDotArgument", // Even though the directory is called testdata, the last path in // the module is test. So "package test" is correctly the default @@ -111,7 +112,8 @@ display:. files: $CWD/testdata/testmod/test.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { name: "RelativeImportPathWildcard", cfg: dirCfg, args: []string{"./other/..."}, @@ -121,7 +123,8 @@ path: "" module: mod.test/test@v0 root: $CWD/testdata/testmod dir: "" -display:""`}, { +display:""`, + }, { name: "NoMatchingPackageName", cfg: dirCfg, args: []string{"./anon"}, @@ -131,7 +134,8 @@ path: mod.test/test/anon@v0 module: mod.test/test@v0 root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/anon -display:./anon`}, { +display:./anon`, + }, { name: "RelativeImportPathSingle", cfg: dirCfg, args: []string{"./other"}, @@ -143,7 +147,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/other display:./other files: - $CWD/testdata/testmod/other/main.cue`}, { + $CWD/testdata/testmod/other/main.cue`, + }, { name: "RelativePathSuccess", cfg: dirCfg, args: []string{"./hello"}, @@ -156,7 +161,8 @@ files: $CWD/testdata/testmod/test.cue $CWD/testdata/testmod/hello/test.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { name: "ExplicitPackageIdentifier", cfg: dirCfg, args: []string{"mod.test/test/hello:test"}, @@ -169,7 +175,8 @@ files: $CWD/testdata/testmod/test.cue $CWD/testdata/testmod/hello/test.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { name: "NoPackageName", cfg: dirCfg, args: []string{"mod.test/test/hello:nonexist"}, @@ -202,7 +209,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod display:command-line-arguments files: - $CWD/testdata/testmod/anon.cue`}, { + $CWD/testdata/testmod/anon.cue`, + }, { name: "StandardInput", cfg: dirCfg, args: []string{"-"}, @@ -212,7 +220,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod display:command-line-arguments files: - -`}, { + -`, + }, { name: "BadIdentifier", cfg: dirCfg, args: []string{"foo.com/bad-identifier"}, @@ -266,7 +275,8 @@ files: $CWD/testdata/testmod/imports/imports.cue imports: mod.test/catch: $CWD/testdata/testmod/cue.mod/pkg/mod.test/catch/catch.cue - mod.test/helper:helper1: $CWD/testdata/testmod/cue.mod/pkg/mod.test/helper/helper1.cue`}, { + mod.test/helper:helper1: $CWD/testdata/testmod/cue.mod/pkg/mod.test/helper/helper1.cue`, + }, { name: "PackageWithImportsWithSkipImportsConfig", cfg: &Config{ Dir: testdataDir, @@ -280,7 +290,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/imports display:./imports files: - $CWD/testdata/testmod/imports/imports.cue`}, { + $CWD/testdata/testmod/imports/imports.cue`, + }, { name: "OnlyToolFiles", cfg: dirCfg, args: []string{"./toolonly"}, @@ -290,7 +301,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/toolonly display:./toolonly files: - $CWD/testdata/testmod/toolonly/foo_tool.cue`}, { + $CWD/testdata/testmod/toolonly/foo_tool.cue`, + }, { name: "OnlyToolFilesWithToolsDisabledInConfig", cfg: &Config{ Dir: testdataDir, @@ -303,7 +315,8 @@ path: mod.test/test/toolonly@v0:foo module: mod.test/test@v0 root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/toolonly -display:./toolonly`}, { +display:./toolonly`, + }, { name: "WithBoolTag", cfg: &Config{ Dir: testdataDir, @@ -316,7 +329,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/tags display:./tags files: - $CWD/testdata/testmod/tags/prod.cue`}, { + $CWD/testdata/testmod/tags/prod.cue`, + }, { name: "WithAttrValTag", cfg: &Config{ Dir: testdataDir, @@ -329,7 +343,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/tags display:./tags files: - $CWD/testdata/testmod/tags/prod.cue`}, { + $CWD/testdata/testmod/tags/prod.cue`, + }, { name: "UnusedTag", cfg: &Config{ Dir: testdataDir, @@ -345,7 +360,8 @@ path: mod.test/test/tagsbad@v0 module: mod.test/test@v0 root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/tagsbad -display:./tagsbad`}, { +display:./tagsbad`, + }, { name: "ImportCycle", cfg: &Config{ Dir: testdataDir, @@ -361,7 +377,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/cycle display:./cycle files: - $CWD/testdata/testmod/cycle/cycle.cue`}, { + $CWD/testdata/testmod/cycle/cycle.cue`, + }, { name: "AcceptLegacyModuleWithLegacyModule", cfg: &Config{ Dir: testdata("testmod_legacy"), @@ -373,7 +390,8 @@ root: $CWD/testdata/testmod_legacy dir: $CWD/testdata/testmod_legacy display:. files: - $CWD/testdata/testmod_legacy/foo.cue`}, { + $CWD/testdata/testmod_legacy/foo.cue`, + }, { name: "AcceptLegacyModuleWithNonLegacyModule", cfg: &Config{ Dir: testdataDir, @@ -390,7 +408,8 @@ files: $CWD/testdata/testmod/imports/imports.cue imports: mod.test/catch: $CWD/testdata/testmod/cue.mod/pkg/mod.test/catch/catch.cue - mod.test/helper:helper1: $CWD/testdata/testmod/cue.mod/pkg/mod.test/helper/helper1.cue`}, { + mod.test/helper:helper1: $CWD/testdata/testmod/cue.mod/pkg/mod.test/helper/helper1.cue`, + }, { name: "MismatchedModulePathInConfig", cfg: &Config{ Dir: testdataDir, @@ -403,7 +422,8 @@ path: "" module: wrong.test@v0 root: "" dir: "" -display:""`}, { +display:""`, + }, { name: "ModulePathInConfigWithoutMajorVersion", cfg: &Config{ Dir: testdataDir, @@ -416,7 +436,8 @@ path: "" module: mod.test/test root: "" dir: "" -display:""`}, { +display:""`, + }, { name: "ModulePathInConfigWithoutMajorVersionAndMismatchedPath", cfg: &Config{ Dir: testdataDir, @@ -429,7 +450,8 @@ path: "" module: mod.test/wrong root: "" dir: "" -display:""`}, { +display:""`, + }, { name: "ExplicitPackageWithUnqualifiedImportPath#1", cfg: &Config{ Dir: filepath.Join(testdataDir, "multi"), @@ -442,7 +464,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/multi display:. files: - $CWD/testdata/testmod/multi/file.cue`}, { + $CWD/testdata/testmod/multi/file.cue`, + }, { name: "ExplicitPackageWithUnqualifiedImportPath#2", // This test replicates the failure reported in https://cuelang.org/issue/3213 cfg: &Config{ @@ -458,7 +481,8 @@ display:. files: $CWD/testdata/testmod/multi2/other.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { name: "ExplicitPackageWithUnqualifiedImportPath#3", cfg: &Config{ Dir: filepath.Join(testdataDir, "multi3"), @@ -473,7 +497,8 @@ display:. files: $CWD/testdata/testmod/multi3/other.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { // Test that we can explicitly ask for non-package // CUE files by setting Config.Package to "_". name: "ExplicitPackageWithUnqualifiedImportPath#4", @@ -489,7 +514,8 @@ dir: $CWD/testdata/testmod/multi4 display:. files: $CWD/testdata/testmod/multi4/nopackage1.cue - $CWD/testdata/testmod/multi4/nopackage2.cue`}, { + $CWD/testdata/testmod/multi4/nopackage2.cue`, + }, { // Test what happens when there's a single CUE file // with an explicit `package _` directive. name: "ExplicitPackageWithUnqualifiedImportPath#5", @@ -504,7 +530,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/multi5 display:. files: - $CWD/testdata/testmod/multi5/nopackage.cue`}, { + $CWD/testdata/testmod/multi5/nopackage.cue`, + }, { // Check that imports are only considered from files // that match the build paths. name: "BuildTagsWithImports#1", @@ -522,7 +549,8 @@ files: $CWD/testdata/testmod/tagswithimports/prod.cue imports: mod.test/test/hello:test: $CWD/testdata/testmod/test.cue $CWD/testdata/testmod/hello/test.cue - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { // Check that imports are only considered from files // that match the build paths. When we don't have the prod // tag, the bad import path mentioned in testdata/testmod/tagswithimports/nonprod.cue @@ -540,7 +568,8 @@ root: $CWD/testdata/testmod dir: $CWD/testdata/testmod/tagswithimports display:. files: - $CWD/testdata/testmod/tagswithimports/nonprod.cue`}, { + $CWD/testdata/testmod/tagswithimports/nonprod.cue`, + }, { name: "ModuleFileNonDirectory", cfg: &Config{ Dir: testdata("testmod_legacymodfile"), @@ -551,7 +580,8 @@ path: "" module: "" root: "" dir: "" -display:""`}, { +display:""`, + }, { // This test checks that files in parent directories // do not result in irrelevant instances appearing // in the result of Instances. @@ -602,7 +632,8 @@ dir: $CWD/testdata/testmod/issue3306/x display:./issue3306/x files: $CWD/testdata/testmod/issue3306/x.cue - $CWD/testdata/testmod/issue3306/x/x.cue`}, { + $CWD/testdata/testmod/issue3306/x/x.cue`, + }, { // This test checks that when we use Package: "*", // we can still use imported packages. name: "AllPackagesWithImports", @@ -627,7 +658,8 @@ display:. files: $CWD/testdata/testmod/test.cue imports: - mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`}, { + mod.test/test/sub: $CWD/testdata/testmod/sub/sub.cue`, + }, { // This tests that we can load a CUE package by pointing Dir to it // even when the package's directory name ends with ".cue". name: "DirWithCUEFileExtension", diff --git a/cue/syntax_test.go b/cue/syntax_test.go index d279dcf58..fa34a3ab7 100644 --- a/cue/syntax_test.go +++ b/cue/syntax_test.go @@ -96,7 +96,8 @@ func TestSyntax(t *testing.T) { let T = { name: string } -}`}, { +}`, + }, { // Structural errors (and worse) are reported as is. name: "structural error", in: ` diff --git a/mod/modfile/modfile_test.go b/mod/modfile/modfile_test.go index 9d72c4ecd..c29b500fe 100644 --- a/mod/modfile/modfile_test.go +++ b/mod/modfile/modfile_test.go @@ -540,7 +540,8 @@ deps: { v: "v0.2.3" } } -`}, { +`, + }, { name: "WithoutLanguage", file: &File{ Module: "foo.com/bar@v0", @@ -552,7 +553,8 @@ deps: { language: { version: "v0.8.0" } -`}, { +`, + }, { name: "WithVersionTooEarly", file: &File{ Module: "foo.com/bar@v0", -- 2.51.2