From 521e122f40edf21da5787ae4186a509f9f254f48 Mon Sep 17 00:00:00 2001
From: Anthony Barbier <anthonyb@graphcore.ai>
Date: Fri, 15 Mar 2024 11:33:46 +0000
Subject: [PATCH 1/3] Fix JUnit message / type fields.

---
 __tests__/__outputs__/swift-xunit.md             |  1 +
 __tests__/__snapshots__/java-junit.test.ts.snap  |  4 ++--
 __tests__/__snapshots__/swift-xunit.test.ts.snap |  2 +-
 src/parsers/java-junit/java-junit-parser.ts      | 11 ++++++++++-
 src/parsers/java-junit/java-junit-types.ts       |  6 ++++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/__tests__/__outputs__/swift-xunit.md b/__tests__/__outputs__/swift-xunit.md
index ecafaf9..55a84da 100644
--- a/__tests__/__outputs__/swift-xunit.md
+++ b/__tests__/__outputs__/swift-xunit.md
@@ -10,4 +10,5 @@ AcmeLibTests.AcmeLibTests
   ✅ test_always_pass
   ✅ test_always_skip
   ❌ test_always_fail
+	failed
 ```
\ No newline at end of file
diff --git a/__tests__/__snapshots__/java-junit.test.ts.snap b/__tests__/__snapshots__/java-junit.test.ts.snap
index 041f380..341b092 100644
--- a/__tests__/__snapshots__/java-junit.test.ts.snap
+++ b/__tests__/__snapshots__/java-junit.test.ts.snap
@@ -41,7 +41,7 @@ at java.lang.Thread.run(Thread.java:748)
 
     ",
                 "line": 29,
-                "message": undefined,
+                "message": "java.lang.AssertionError: expected [1.2.1] but found [1.2.0]",
                 "path": "pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java",
               },
               "name": "testVersionStrings",
@@ -100,7 +100,7 @@ at java.lang.Thread.run(Thread.java:748)
 
     ",
                 "line": 29,
-                "message": undefined,
+                "message": "java.lang.AssertionError: expected [1.2.1] but found [1.2.0]",
                 "path": "pulsar-common/src/test/java/org/apache/pulsar/AddMissingPatchVersionTest.java",
               },
               "name": "testVersionStrings",
diff --git a/__tests__/__snapshots__/swift-xunit.test.ts.snap b/__tests__/__snapshots__/swift-xunit.test.ts.snap
index 01aa7d9..ae34deb 100644
--- a/__tests__/__snapshots__/swift-xunit.test.ts.snap
+++ b/__tests__/__snapshots__/swift-xunit.test.ts.snap
@@ -25,7 +25,7 @@ TestRunResult {
               "error": {
                 "details": undefined,
                 "line": undefined,
-                "message": undefined,
+                "message": "failed",
                 "path": undefined,
               },
               "name": "test_always_fail",
diff --git a/src/parsers/java-junit/java-junit-parser.ts b/src/parsers/java-junit/java-junit-parser.ts
index 9925365..b89b7cb 100644
--- a/src/parsers/java-junit/java-junit-parser.ts
+++ b/src/parsers/java-junit/java-junit-parser.ts
@@ -137,11 +137,20 @@ export class JavaJunitParser implements TestParser {
       }
     }
 
+    
+
+    let message
+    if(typeof failure === 'object') {
+      message = failure.$.message
+      if(failure.$?.type) {
+        message = failure.$.type + ": "+ message
+      }
+    }
     return {
       path: filePath,
       line,
       details,
-      message: typeof failure === 'object' ? failure.message : undefined
+      message
     }
   }
 
diff --git a/src/parsers/java-junit/java-junit-types.ts b/src/parsers/java-junit/java-junit-types.ts
index 7fab71e..7ca6246 100644
--- a/src/parsers/java-junit/java-junit-types.ts
+++ b/src/parsers/java-junit/java-junit-types.ts
@@ -40,6 +40,8 @@ export interface TestCase {
 
 export interface Failure {
   _: string
-  type: string
-  message: string
+  $: {
+    type?: string
+    message: string
+  }
 }

From 21ae91ed3c4ad5011eb71977a88053d982ed8e4e Mon Sep 17 00:00:00 2001
From: Jozef Izso <jozef.izso@gmail.com>
Date: Tue, 25 Jun 2024 14:37:43 +0200
Subject: [PATCH 2/3] Fix formatting of the code

---
 src/parsers/java-junit/java-junit-parser.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/parsers/java-junit/java-junit-parser.ts b/src/parsers/java-junit/java-junit-parser.ts
index b89b7cb..5163f46 100644
--- a/src/parsers/java-junit/java-junit-parser.ts
+++ b/src/parsers/java-junit/java-junit-parser.ts
@@ -137,13 +137,11 @@ export class JavaJunitParser implements TestParser {
       }
     }
 
-    
-
     let message
-    if(typeof failure === 'object') {
+    if (typeof failure === 'object') {
       message = failure.$.message
-      if(failure.$?.type) {
-        message = failure.$.type + ": "+ message
+      if (failure.$?.type) {
+        message = failure.$.type + ': ' + message
       }
     }
     return {

From 06ae02969cc68deb1df74a87a85114aa9822c872 Mon Sep 17 00:00:00 2001
From: Jozef Izso <jozef.izso@gmail.com>
Date: Tue, 25 Jun 2024 14:45:12 +0200
Subject: [PATCH 3/3] Rebuild release `index.js` file

---
 dist/index.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index ff99141..d103be3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1178,7 +1178,7 @@ class JavaJunitParser {
         return 'success';
     }
     getTestCaseError(tc) {
-        var _a;
+        var _a, _b;
         if (!this.options.parseErrors) {
             return undefined;
         }
@@ -1198,11 +1198,18 @@ class JavaJunitParser {
                 line = src.line;
             }
         }
+        let message;
+        if (typeof failure === 'object') {
+            message = failure.$.message;
+            if ((_b = failure.$) === null || _b === void 0 ? void 0 : _b.type) {
+                message = failure.$.type + ': ' + message;
+            }
+        }
         return {
             path: filePath,
             line,
             details,
-            message: typeof failure === 'object' ? failure.message : undefined
+            message
         };
     }
     exceptionThrowSource(stackTrace) {