Fix CSV headers after moving line and column

smithy-lang · Feb 12, 2024 · 7b33415 · 7b33415
1 parent cb8c8e2
commit 7b33415
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...y-cli/src/main/java/software/amazon/smithy/cli/commands/ValidationEventFormatOptions.java b/...y-cli/src/main/java/software/amazon/smithy/cli/commands/ValidationEventFormatOptions.java
@@ -29,7 +29,7 @@ void print(CliPrinter printer, ValidationEventFormatter formatter, ValidationEve
         CSV {
             @Override
             void beginPrinting(CliPrinter printer) {
-                printer.println("severity,id,shape,file,message,hint,suppressionReason");
+                printer.println("severity,id,shape,file,line,column,message,hint,suppressionReason");
             }
 
             @Override

diff --git a/smithy-cli/src/test/java/software/amazon/smithy/cli/commands/DiffCommandTest.java b/smithy-cli/src/test/java/software/amazon/smithy/cli/commands/DiffCommandTest.java
@@ -33,7 +33,7 @@ public void canOutputCsv() throws Exception {
 
         String[] lines = result.stdout().split("(\\r\\n|\\r|\\n)");
         assertThat(lines.length, is(2));
-        assertThat(lines[0], containsString("severity,id,shape,file,message,hint,suppressionReason"));
+        assertThat(lines[0], containsString("severity,id,shape,file,line,column,message,hint,suppressionReason"));
         assertThat(lines[1], containsString("\"ERROR\",\"ChangedShapeType\",\"smithy.example#Hello\""));
     }
 }
diff --git a/smithy-cli/src/test/java/software/amazon/smithy/cli/commands/ValidateCommandTest.java b/smithy-cli/src/test/java/software/amazon/smithy/cli/commands/ValidateCommandTest.java
@@ -18,6 +18,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
 import java.net.URISyntaxException;
@@ -228,6 +229,9 @@ public void canOutputCsv() throws Exception {
         assertThat(result.stdout(), containsString("EmitDangers"));
         assertThat(result.stdout(), containsString("HttpLabelTrait"));
         assertThat(result.stdout(), not(containsString("FAILURE"))); // stderr
+
+        String[] lines = result.stdout().split("(\\r\\n|\\r|\\n)");
+        assertThat(lines[0], containsString("severity,id,shape,file,line,column,message,hint,suppressionReason"));
     }
 
     @Test