tests: update integration tests

Author: ldez

test/output_test.go

@@ -21,9 +21,9 @@ func TestOutput_lineNumber(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithArgs(
 			"--disable-all",
-			"--print-issued-lines=false",
-			"--print-linter-name=false",
-			"--out-format=line-number",
+			"--output.text.print-issued-lines=false",
+			"--output.text.print-linter-name=false",
+			"--output.text.path=stdout",
 		).
 		WithDirectives(sourcePath).
 		WithTargetPath(sourcePath).
@@ -40,9 +40,7 @@ func TestOutput_Stderr(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithArgs(
 			"--disable-all",
-			"--print-issued-lines=false",
-			"--print-linter-name=false",
-			"--out-format=json:stderr",
+			"--output.json.path=stderr",
 		).
 		WithDirectives(sourcePath).
 		WithTargetPath(sourcePath).
@@ -60,9 +58,7 @@ func TestOutput_File(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithArgs(
 			"--disable-all",
-			"--print-issued-lines=false",
-			"--print-linter-name=false",
-			fmt.Sprintf("--out-format=json:%s", resultPath),
+			fmt.Sprintf("--output.json.path=%s", resultPath),
 		).
 		WithDirectives(sourcePath).
 		WithTargetPath(sourcePath).
@@ -82,9 +78,10 @@ func TestOutput_Multiple(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithArgs(
 			"--disable-all",
-			"--print-issued-lines=false",
-			"--print-linter-name=false",
-			"--out-format=line-number,json:stdout",
+			"--output.text.print-issued-lines=false",
+			"--output.text.print-linter-name=false",
+			"--output.text.path=stdout",
+			"--output.json.path=stdout",
 		).
 		WithDirectives(sourcePath).
 		WithTargetPath(sourcePath).

test/run_test.go

@@ -269,7 +269,7 @@ func TestLineDirectiveProcessedFiles(t *testing.T) {
 		{
 			desc: "lite loading",
 			args: []string{
-				"--print-issued-lines=false",
+				"--output.text.print-issued-lines=false",
 				"--exclude-use-default=false",
 				"-Erevive",
 			},
@@ -284,7 +284,7 @@ func TestLineDirectiveProcessedFiles(t *testing.T) {
 		{
 			desc: "full loading",
 			args: []string{
-				"--print-issued-lines=false",
+				"--output.text.print-issued-lines=false",
 				"--exclude-use-default=false",
 				"-Erevive,govet",
 			},
@@ -351,7 +351,7 @@ func TestSortedResults(t *testing.T) {
 
 			testshared.NewRunnerBuilder(t).
 				WithNoConfig().
-				WithArgs("--print-issued-lines=false", test.opt).
+				WithArgs("--output.text.print-issued-lines=false", test.opt).
 				WithTargetPath(testdataDir, "sort_results").
 				WithBinPath(binPath).
 				Runner().
@@ -367,7 +367,7 @@ func TestSkippedDirsNoMatchArg(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
 		WithArgs(
-			"--print-issued-lines=false",
+			"--output.text.print-issued-lines=false",
 			"--exclude-dirs", dir,
 			"-Erevive",
 		).
@@ -384,7 +384,7 @@ func TestSkippedDirsTestdata(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
 		WithArgs(
-			"--print-issued-lines=false",
+			"--output.text.print-issued-lines=false",
 			"-Erevive",
 		).
 		WithTargetPath(testdataDir, "skipdirs", "...").
@@ -504,7 +504,7 @@ func TestAbsPathDirAnalysis(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
 		WithArgs(
-			"--print-issued-lines=false",
+			"--output.text.print-issued-lines=false",
 			"-Erevive",
 		).
 		WithTargetPath(absDir).
@@ -523,7 +523,7 @@ func TestAbsPathFileAnalysis(t *testing.T) {
 	testshared.NewRunnerBuilder(t).
 		WithNoConfig().
 		WithArgs(
-			"--print-issued-lines=false",
+			"--output.text.print-issued-lines=false",
 			"-Erevive",
 		).
 		WithTargetPath(absDir).

test/testshared/integration/fix.go

@@ -67,9 +67,9 @@ func runFix(t *testing.T, extraArgs ...string) {
 
 			testshared.NewRunnerBuilder(t).
 				WithArgs("--disable-all",
-					"--print-issued-lines=false",
-					"--print-linter-name=false",
-					"--out-format=line-number",
+					"--output.text.print-issued-lines=false",
+					"--output.text.print-linter-name=false",
+					"--output.text.path=stdout",
 					"--fix").
 				WithArgs(extraArgs...).
 				WithRunContext(rc).

test/testshared/integration/run.go

@@ -63,7 +63,7 @@ func testOneSource(t *testing.T, log *logutils.StderrLog, binPath, sourcePath st
 
 	args := []string{
 		"--disable-all",
-		"--out-format=json",
+		"--output.json.path=stdout",
 		"--max-same-issues=100",
 		"--max-issues-per-linter=100",
 	}