fix: revert test case system out and err

bachp · Nov 27, 2023 · a6f951f · a6f951f
1 parent 68c34fb
commit a6f951f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,4 +18,5 @@ time = { version = "0.3.4", features = ["formatting", "macros"] }
 [dev-dependencies]
 doc-comment = "0.3.3"
 once_cell = "1.14"
+pretty_assertions = "1.4.0"
 regex = "1.6"
diff --git a/src/lib.rs b/src/lib.rs
@@ -64,6 +64,7 @@ mod tests {
         datetime, Duration, Report, ReportBuilder, TestCase, TestCaseBuilder, TestSuite,
         TestSuiteBuilder,
     };
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn empty_testsuites() {
@@ -360,10 +361,13 @@ mod tests {
       <system-out><![CDATA[Some sysout message]]></system-out>\
     </testcase>\
     <testcase name=\"error test\" time=\"5\">\
-      <error type=\"git error\" message=\"unable to fetch\"><![CDATA[Some syserror message]]></error>\
+      <error type=\"git error\" message=\"unable to fetch\"/>\
+      <system-err><![CDATA[Some syserror message]]></system-err>\
     </testcase>\
     <testcase name=\"failure test\" time=\"10\">\
-      <failure type=\"assert_eq\" message=\"not equal\"><![CDATA[System out or error message]]><![CDATA[Another system error message]]></failure>\
+      <failure type=\"assert_eq\" message=\"not equal\"/>\
+      <system-out><![CDATA[System out or error message]]></system-out>\
+      <system-err><![CDATA[Another system error message]]></system-err>\
     </testcase>\
   </testsuite>\
 </testsuites>",

diff --git a/src/reports.rs b/src/reports.rs
@@ -119,15 +119,7 @@ impl TestCase {
                 },
                 |w| {
                     match self.result {
-                        TestResult::Success => w
-                            .write_opt(self.system_out.as_ref(), |w, out| {
-                                w.create_element("system-out")
-                                    .write_cdata_content(BytesCData::new(out.as_str()))
-                            })?
-                            .write_opt(self.system_err.as_ref(), |w, err| {
-                                w.create_element("system-err")
-                                    .write_cdata_content(BytesCData::new(err.as_str()))
-                            }),
+                        TestResult::Success => Ok(w),
                         TestResult::Error {
                             ref type_,
                             ref message,
@@ -137,26 +129,7 @@ impl TestCase {
                                 ("type", type_.as_str()),
                                 ("message", message.as_str()),
                             ])
-                            .write_empty_or_inner(
-                                |_| self.system_out.is_none() && self.system_err.is_none(),
-                                |w| {
-                                    w.write_opt(self.system_out.as_ref(), |w, stdout| {
-                                        let data = strip_ansi_escapes::strip(stdout);
-                                        w.write_event(Event::CData(BytesCData::new(
-                                            String::from_utf8_lossy(&data),
-                                        )))
-                                        .map(|_| w)
-                                    })?
-                                    .write_opt(self.system_err.as_ref(), |w, stderr| {
-                                        let data = strip_ansi_escapes::strip(stderr);
-                                        w.write_event(Event::CData(BytesCData::new(
-                                            String::from_utf8_lossy(&data),
-                                        )))
-                                        .map(|_| w)
-                                    })
-                                    .map(drop)
-                                },
-                            ),
+                            .write_empty(),
                         TestResult::Failure {
                             ref type_,
                             ref message,
@@ -166,28 +139,17 @@ impl TestCase {
                                 ("type", type_.as_str()),
                                 ("message", message.as_str()),
                             ])
-                            .write_empty_or_inner(
-                                |_| self.system_out.is_none() && self.system_err.is_none(),
-                                |w| {
-                                    w.write_opt(self.system_out.as_ref(), |w, stdout| {
-                                        let data = strip_ansi_escapes::strip(stdout);
-                                        w.write_event(Event::CData(BytesCData::new(
-                                            String::from_utf8_lossy(&data),
-                                        )))
-                                        .map(|_| w)
-                                    })?
-                                    .write_opt(self.system_err.as_ref(), |w, stderr| {
-                                        let data = strip_ansi_escapes::strip(stderr);
-                                        w.write_event(Event::CData(BytesCData::new(
-                                            String::from_utf8_lossy(&data),
-                                        )))
-                                        .map(|_| w)
-                                    })
-                                    .map(drop)
-                                },
-                            ),
+                            .write_empty(),
                         TestResult::Skipped => w.create_element("skipped").write_empty(),
-                    }
+                    }?
+                    .write_opt(self.system_out.as_ref(), |w, out| {
+                        w.create_element("system-out")
+                            .write_cdata_content(BytesCData::new(out.as_str()))
+                    })?
+                    .write_opt(self.system_err.as_ref(), |w, err| {
+                        w.create_element("system-err")
+                            .write_cdata_content(BytesCData::new(err.as_str()))
+                    })
                     .map(drop)
                 },
             )