Fix dart/flutter stack trace parsing

__tests__/__snapshots__/dart-json.test.ts.snap

@@ -40,9 +40,9 @@ test\\\\main_test.dart 13:9  main.<fn>.<fn>.<fn>
                 "details": "package:darttest/main.dart 2:3  throwError
 test\\\\main_test.dart 17:9        main.<fn>.<fn>.<fn>
 ",
-                "line": 2,
+                "line": 17,
                 "message": "Exception: Some error",
-                "path": "lib/main.dart",
+                "path": "test/main_test.dart",
               },
               "name": "Test 1 Test 1.1 Exception in target unit",
               "result": "failed",
@@ -159,7 +159,7 @@ When the exception was thrown, this was the stack:
 The test description was:
   pass updateShouldNotify
 ════════════════════════════════════════════════════════════════════════════════════════════════════",
-                "line": 94,
+                "line": 112,
                 "message": "Test failed. See exception logs above.
 The test description was: pass updateShouldNotify",
                 "path": "test/value_listenable_provider_test.dart",

__tests__/dart-json.test.ts

@@ -19,7 +19,7 @@ describe('dart-json tests', () => {
     const filePath = normalizeFilePath(path.relative(__dirname, fixturePath))
     const fileContent = fs.readFileSync(fixturePath, {encoding: 'utf8'})
 
-    const parser = new DartJsonParser(opts)
+    const parser = new DartJsonParser(opts, 'dart')
     const result = await parser.parse(filePath, fileContent)
     expect(result).toMatchSnapshot()
 
@@ -42,7 +42,7 @@ describe('dart-json tests', () => {
       workDir: '/__w/provider/provider/'
     }
 
-    const parser = new DartJsonParser(opts)
+    const parser = new DartJsonParser(opts, 'flutter')
     const result = await parser.parse(filePath, fileContent)
     expect(result).toMatchSnapshot()
 

src/main.ts

@@ -131,11 +131,11 @@ async function main(): Promise<void> {
 function getParser(reporter: string, options: ParseOptions): TestParser {
   switch (reporter) {
     case 'dart-json':
-      return new DartJsonParser(options)
+      return new DartJsonParser(options, 'dart')
     case 'dotnet-trx':
       return new DotnetTrxParser(options)
     case 'flutter-json':
-      return new DartJsonParser(options)
+      return new DartJsonParser(options, 'flutter')
     case 'jest-junit':
       return new JestJunitParser(options)
     default:

src/parsers/dart-json/dart-json-parser.ts

@@ -72,7 +72,7 @@ class TestCase {
 }
 
 export class DartJsonParser implements TestParser {
-  constructor(readonly options: ParseOptions) {}
+  constructor(readonly options: ParseOptions, readonly sdk: 'dart' | 'flutter') {}
 
   async parse(path: string, content: string): Promise<TestRunResult> {
     const tr = this.getTestRun(path, content)
@@ -162,7 +162,7 @@ export class DartJsonParser implements TestParser {
       .map(p => p.message)
       .join('\n')
     const details = [print, stackTrace].filter(str => str !== '').join('\n')
-    const src = this.exceptionThrowSource(stackTrace, trackedFiles)
+    const src = this.exceptionThrowSource(details, trackedFiles)
     let path
     let line
 
@@ -186,17 +186,18 @@ export class DartJsonParser implements TestParser {
   }
 
   private exceptionThrowSource(ex: string, trackedFiles: string[]): {path: string; line: number} | undefined {
-    // imports from package which is tested are listed in stack traces as 'package:xyz/' which maps to relative path 'lib/'
-    const packageRe = /^package:[a-zA-z0-9_$]+\//
-    const lines = ex.split(/\r?\n/).map(str => str.replace(packageRe, 'lib/'))
+    const lines = ex.split(/\r?\n/g)
 
     // regexp to extract file path and line number from stack trace
-    const re = /^(.*)\s+(\d+):\d+\s+/
+    const dartRe = /^(?!package:)(.*)\s+(\d+):\d+\s+/
+    const flutterRe = /^#\d+\s+.*\((?!package:)(.*):(\d+):\d+\)$/
+    const re = this.sdk === 'dart' ? dartRe : flutterRe
+
     for (const str of lines) {
       const match = str.match(re)
       if (match !== null) {
         const [_, pathStr, lineStr] = match
-        const path = normalizeFilePath(pathStr)
+        const path = normalizeFilePath(this.getRelativePath(pathStr))
         if (trackedFiles.includes(path)) {
           const line = parseInt(lineStr)
           return {path, line}
@@ -207,6 +208,10 @@ export class DartJsonParser implements TestParser {
 
   private getRelativePath(path: string): string {
     const {workDir} = this.options
+    const prefix = 'file://'
+    if (path.startsWith(prefix)) {
+      path = path.substr(prefix.length)
+    }
     if (path.startsWith(workDir)) {
       path = path.substr(workDir.length)
     }