runresult logs as string instead of byte array

Author: Heliozoa

plugins/csharp/src/plugin.rs

@@ -213,8 +213,14 @@ impl LanguagePlugin for CSharpPlugin {
             OutputWithTimeout::Output(output) => {
                 if !output.status.success() {
                     let mut logs = HashMap::new();
-                    logs.insert("stdout".to_string(), output.stdout);
-                    logs.insert("stderr".to_string(), output.stderr);
+                    logs.insert(
+                        "stdout".to_string(),
+                        String::from_utf8_lossy(&output.stdout).into_owned(),
+                    );
+                    logs.insert(
+                        "stderr".to_string(),
+                        String::from_utf8_lossy(&output.stderr).into_owned(),
+                    );
                     return Ok(RunResult {
                         status: RunStatus::CompileFailed,
                         test_results: vec![],
@@ -386,7 +392,10 @@ mod test {
         let res = plugin.run_tests(temp.path()).unwrap();
         assert_eq!(res.status, RunStatus::CompileFailed);
         assert!(!res.logs.is_empty());
-        assert!(String::from_utf8_lossy(res.logs.get("stdout").unwrap())
+        assert!(res
+            .logs
+            .get("stdout")
+            .unwrap()
             .contains("This is a compile error"));
     }
 

plugins/java/src/plugin.rs

@@ -61,8 +61,14 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
         }
 
         let mut logs = HashMap::new();
-        logs.insert("stdout".to_string(), results.stdout.clone());
-        logs.insert("stderr".to_string(), results.stderr.clone());
+        logs.insert(
+            "stdout".to_string(),
+            String::from_utf8_lossy(&results.stdout).into_owned(),
+        );
+        logs.insert(
+            "stderr".to_string(),
+            String::from_utf8_lossy(&results.stderr).into_owned(),
+        );
         Ok(RunResult {
             status,
             test_results,
@@ -228,8 +234,14 @@ pub(crate) trait JavaPlugin: LanguagePlugin {
     /// Creates a run result from a failed compilation.
     fn run_result_from_failed_compilation(&self, compile_result: CompileResult) -> RunResult {
         let mut logs = HashMap::new();
-        logs.insert("stdout".to_string(), compile_result.stdout);
-        logs.insert("stderr".to_string(), compile_result.stderr);
+        logs.insert(
+            "stdout".to_string(),
+            String::from_utf8_lossy(&compile_result.stdout).into_owned(),
+        );
+        logs.insert(
+            "stderr".to_string(),
+            String::from_utf8_lossy(&compile_result.stderr).into_owned(),
+        );
         RunResult {
             status: RunStatus::CompileFailed,
             test_results: vec![],

plugins/r/src/lib.rs

@@ -29,7 +29,6 @@ impl From<RRunResult> for RunResult {
                     .backtrace
                     .into_iter()
                     .map(|s| format!("{}\n", s))
-                    .flat_map(|s| s.as_bytes().to_vec())
                     .collect(),
             );
         }

plugins/r/src/plugin.rs

@@ -267,7 +267,6 @@ mod test {
         assert!(run.test_results.is_empty());
         assert!(!run.logs.is_empty());
         let logs = run.logs.remove("compiler_output").unwrap();
-        let logs = String::from_utf8(logs).unwrap();
         assert!(logs.contains("unexpected 'in'"))
     }
 
@@ -282,7 +281,6 @@ mod test {
         assert!(run.test_results.is_empty());
         assert!(!run.logs.is_empty());
         let logs = run.logs.remove("compiler_output").unwrap();
-        let logs = String::from_utf8(logs).unwrap();
         assert!(logs.contains("unexpected 'in'"));
     }
 

tmc-langs-framework/src/domain.rs

@@ -67,14 +67,14 @@ pub struct RunResult {
     pub test_results: Vec<TestResult>,
     /// Logs from the test run.
     /// The key may be an arbitrary string identifying the type of log.
-    pub logs: HashMap<String, Vec<u8>>,
+    pub logs: HashMap<String, String>,
 }
 
 impl RunResult {
     pub fn new(
         status: RunStatus,
         test_results: Vec<TestResult>,
-        logs: HashMap<String, Vec<u8>>,
+        logs: HashMap<String, String>,
     ) -> Self {
         Self {
             status,