Merge pull request #399 from AnthonyBarbier/fix_junit_message

dorny · Jun 25, 2024 · 3c93b15 · 3c93b15
2 parents 482d708 + 06ae029
commit 3c93b15
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git 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
 ```
diff --git 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
@@ -25,7 +25,7 @@ TestRunResult {
               "error": {
                 "details": undefined,
                 "line": undefined,
-                "message": undefined,
+                "message": "failed",
                 "path": undefined,
               },
               "name": "test_always_fail",

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/parsers/java-junit/java-junit-parser.ts b/src/parsers/java-junit/java-junit-parser.ts
@@ -137,11 +137,18 @@ 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
@@ -40,6 +40,8 @@ export interface TestCase {
 
 export interface Failure {
   _: string
-  type: string
-  message: string
+  $: {
+    type?: string
+    message: string
+  }
 }