Fix PR Comments of JSON PR (#33)

Co-Authored-By: Timo <dev@2515.ch>
LukasKalbertodt · Jan 14, 2024 · 766448d · 766448d
1 parent 3bfc0f3
commit 766448d
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 69 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ exclude = [".github"]
 clap = { version = "4.0.8", features = ["derive"] }
 threadpool = "1.8.1"
 termcolor = "1.0.5"
+escape8259 = "0.5.2"
 
 [dev-dependencies]
 fastrand = "1.8.0"

diff --git a/src/printer.rs b/src/printer.rs
@@ -11,8 +11,8 @@ use std::{fs::File, time::Duration};
 use termcolor::{Ansi, Color, ColorChoice, ColorSpec, NoColor, StandardStream, WriteColor};
 
 use crate::{
-    Arguments, ColorSetting, Conclusion, FormatSetting, Outcome, Trial, Failed,
-    Measurement, TestInfo,
+    Arguments, ColorSetting, Conclusion, Failed, FormatSetting, Measurement, Outcome, TestInfo,
+    Trial,
 };
 
 pub(crate) struct Printer {
@@ -94,7 +94,7 @@ impl Printer {
             }
             FormatSetting::Json => writeln!(
                 self.out,
-                "{{ \"type\": \"suite\", \"event\": \"started\", \"test_count\": {} }}",
+                r#"{{ "type": "suite", "event": "started", "test_count": {} }}"#,
                 num_tests
             )
             .unwrap(),
@@ -108,7 +108,7 @@ impl Printer {
         match self.format {
             FormatSetting::Pretty => {
                 let kind = if kind.is_empty() {
-                    format!("")
+                    String::new()
                 } else {
                     format!("[{}] ", kind)
                 };
@@ -130,8 +130,8 @@ impl Printer {
             FormatSetting::Json => {
                 writeln!(
                     self.out,
-                    "{{ \"type\": \"test\", \"event\": \"started\", \"name\": \"{}\" }}",
-                    name
+                    r#"{{ "type": "test", "event": "started", "name": "{}" }}"#,
+                    escape8259::escape(name),
                 )
                 .unwrap();
             }
@@ -169,14 +169,16 @@ impl Printer {
                     writeln!(
                         self.out,
                         r#"{{ "type": "bench", "name": "{}", "median": {}, "deviation": {} }}"#,
-                        info.name, avg, variance
+                        escape8259::escape(&info.name),
+                        avg,
+                        variance,
                     )
                     .unwrap();
                 } else {
                     writeln!(
                         self.out,
                         r#"{{ "type": "test", "name": "{}", "event": "{}"{} }}"#,
-                        info.name,
+                        escape8259::escape(&info.name),
                         match outcome {
                             Outcome::Passed => "ok",
                             Outcome::Failed(_) => "failed",
@@ -185,7 +187,7 @@ impl Printer {
                         },
                         match outcome {
                             Outcome::Failed(Failed { msg: Some(msg) }) =>
-                                format!(r#", "stdout": "Error: \"{}\"\n""#, msg.escape_default()),
+                                format!(r#", "stdout": "Error: \"{}\"\n""#, escape8259::escape(msg)),
                             _ => "".into(),
                         }
                     )
@@ -224,7 +226,7 @@ impl Printer {
             FormatSetting::Json => {
                 writeln!(
                     self.out,
-                    "{{ \"type\": \"suite\", \"event\": \"{}\", \"passed\": {}, \"failed\": {}, \"ignored\": {}, \"measured\": {}, \"filtered_out\": {}, \"exec_time\": {} }}",
+                    r#"{{ "type": "suite", "event": "{}", "passed": {}, "failed": {}, "ignored": {}, "measured": {}, "filtered_out": {}, "exec_time": {} }}"#,
                     if conclusion.num_failed > 0 { "failed" } else { "ok" },
                     conclusion.num_passed,
                     conclusion.num_failed,
@@ -257,7 +259,7 @@ impl Printer {
             }
 
             let kind = if test.info.kind.is_empty() {
-                format!("")
+                String::new()
             } else {
                 format!("[{}] ", test.info.kind)
             };