Update ballerina-cli tests for new diagnostics

ballerina-platform · Mar 5, 2024 · 9cc9ef1 · 9cc9ef1
1 parent 6c5edf1
commit 9cc9ef1
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 19 deletions.
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/AnnotateDiagnostics.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/AnnotateDiagnostics.java
@@ -80,7 +80,8 @@ private static String diagnosticToString(Diagnostic diagnostic, boolean colorEna
         String color = SEVERITY_COLORS.get(severity);
         String message = diagnostic.toString().substring(severityString.length());
         String code = diagnostic.diagnosticInfo().code();
-        String formatString = getColoredString("%s", color, colorEnabled) + "%s (%s)";
+        boolean isMultiline = diagnostic.message().contains("\n");
+        String formatString = getColoredString("%s", color, colorEnabled) + "%s" + (isMultiline ? "\n(%s)" : " (%s)");
 
         return String.format(formatString, severityString, message, code);
     }

diff --git a/...c/test/resources/test-resources/command-outputs/unix/build-bal-with-absolute-jar-path.txt b/...c/test/resources/test-resources/command-outputs/unix/build-bal-with-absolute-jar-path.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	<ABSOLUTE_JAR_PATH>
diff --git a/cli/ballerina-cli/src/test/resources/test-resources/command-outputs/unix/build-bar-bal.txt b/cli/ballerina-cli/src/test/resources/test-resources/command-outputs/unix/build-bar-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	bar.jar
diff --git a/cli/ballerina-cli/src/test/resources/test-resources/command-outputs/unix/build-foo-bal.txt b/cli/ballerina-cli/src/test/resources/test-resources/command-outputs/unix/build-foo-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	foo.jar
diff --git a/...esources/test-resources/command-outputs/unix/build-hello-world-bal-with-build-options.txt b/...esources/test-resources/command-outputs/unix/build-hello-world-bal-with-build-options.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar
diff --git a/...rina-cli/src/test/resources/test-resources/command-outputs/unix/build-hello-world-bal.txt b/...rina-cli/src/test/resources/test-resources/command-outputs/unix/build-hello-world-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar
diff --git a/...resources/test-resources/command-outputs/unix/build-project-with-empty-ballerina-toml.txt b/...resources/test-resources/command-outputs/unix/build-project-with-empty-ballerina-toml.txt
@@ -5,6 +5,7 @@ WARNING [Ballerina.toml:(1:1,1:1)] missing table '[package]' in 'Ballerina.toml'
 org = "john"
 name = "validProjectWithEmptyBallerinaToml"
 version = "0.1.0"
+(BCE5001)
 
 Generating executable
 	target/bin/validProjectWithEmptyBallerinaToml.jar
diff --git a/...erina-cli/src/test/resources/test-resources/command-outputs/unix/build-syntax-err-bal.txt b/...erina-cli/src/test/resources/test-resources/command-outputs/unix/build-syntax-err-bal.txt
@@ -1,4 +1,8 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
-ERROR [hello_world.bal:(2:3,2:4)] invalid token ';'
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
+ERROR [hello_world.bal:(2:3,2:4)] invalid token ';' (BCE0600)
+  |
+2 | };;
+  |   ^
+
diff --git a/...a-cli/src/test/resources/test-resources/command-outputs/unix/build-syntax-err-package.txt b/...a-cli/src/test/resources/test-resources/command-outputs/unix/build-syntax-err-package.txt
@@ -1,3 +1,7 @@
 Compiling source
 	foo/winery:0.1.0
-ERROR [hello_world.bal:(2:3,2:4)] invalid token ';'
+ERROR [hello_world.bal:(2:3,2:4)] invalid token ';' (BCE0600)
+  |
+2 | };;
+  |   ^
+
diff --git a/...cli/src/test/resources/test-resources/command-outputs/unix/dump-build-time-standalone.txt b/...cli/src/test/resources/test-resources/command-outputs/unix/dump-build-time-standalone.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar

diff --git a/...est/resources/test-resources/command-outputs/windows/build-bal-with-absolute-jar-path.txt b/...est/resources/test-resources/command-outputs/windows/build-bal-with-absolute-jar-path.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	<ABSOLUTE_JAR_PATH>
diff --git a/...ballerina-cli/src/test/resources/test-resources/command-outputs/windows/build-bar-bal.txt b/...ballerina-cli/src/test/resources/test-resources/command-outputs/windows/build-bar-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	bar.jar
diff --git a/...ballerina-cli/src/test/resources/test-resources/command-outputs/windows/build-foo-bal.txt b/...ballerina-cli/src/test/resources/test-resources/command-outputs/windows/build-foo-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	foo.jar
diff --git a/...urces/test-resources/command-outputs/windows/build-hello-world-bal-with-build-options.txt b/...urces/test-resources/command-outputs/windows/build-hello-world-bal-with-build-options.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar
diff --git a/...a-cli/src/test/resources/test-resources/command-outputs/windows/build-hello-world-bal.txt b/...a-cli/src/test/resources/test-resources/command-outputs/windows/build-hello-world-bal.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar
diff --git a/...ources/test-resources/command-outputs/windows/build-project-with-empty-ballerina-toml.txt b/...ources/test-resources/command-outputs/windows/build-project-with-empty-ballerina-toml.txt
@@ -5,6 +5,7 @@ WARNING [Ballerina.toml:(1:1,1:1)] missing table '[package]' in 'Ballerina.toml'
 org = "john"
 name = "validProjectWithEmptyBallerinaToml"
 version = "0.1.0"
+(BCE5001)
 
 Generating executable
 	target\bin\validProjectWithEmptyBallerinaToml.jar
diff --git a/...na-cli/src/test/resources/test-resources/command-outputs/windows/build-syntax-err-bal.txt b/...na-cli/src/test/resources/test-resources/command-outputs/windows/build-syntax-err-bal.txt
@@ -1,4 +1,8 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
-ERROR [hello_world.bal:(2:3,2:4)] invalid token ';'
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
+ERROR [hello_world.bal:(2:3,2:4)] invalid token ';' (BCE0600)
+  |
+2 | };;
+  |   ^
+
diff --git a/...li/src/test/resources/test-resources/command-outputs/windows/build-syntax-err-package.txt b/...li/src/test/resources/test-resources/command-outputs/windows/build-syntax-err-package.txt
@@ -1,3 +1,7 @@
 Compiling source
 	foo/winery:0.1.0
-ERROR [hello_world.bal:(2:3,2:4)] invalid token ';'
+ERROR [hello_world.bal:(2:3,2:4)] invalid token ';' (BCE0600)
+  |
+2 | };;
+  |   ^
+
diff --git a/.../src/test/resources/test-resources/command-outputs/windows/dump-build-time-standalone.txt b/.../src/test/resources/test-resources/command-outputs/windows/dump-build-time-standalone.txt
@@ -1,6 +1,6 @@
 Compiling source
 	hello_world.bal
-WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files
+WARNING [:(1:1,1:1)] Skipped adding the generated source file with prefix "dummyfunc". Source file generation is not supported with standalone bal files (BCE5401)
 
 Generating executable
 	hello_world.jar