Skip to content

Commit

Permalink
Support parsing multiple reports
Browse files Browse the repository at this point in the history
  • Loading branch information
Michal Dorner committed Jan 16, 2021
1 parent 659bb4f commit c48c076
Show file tree
Hide file tree
Showing 15 changed files with 219 additions and 74 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,4 @@ __tests__/runner/*
lib/**/*

# Project specific
__tests__/__outputs__
__tests__/__results__
38 changes: 38 additions & 0 deletions __tests__/__outputs__/dart-json.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
### fixtures\dart-json.json

**6** tests were completed in **3.760s** with **1** passed, **1** skipped and **4** failed.

| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed ❌ |
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
|| [test\main_test.dart](#ts-0-test-maintest-dart) | 4 | 74ms | 1 | 0 | 3 |
|| [test\second_test.dart](#ts-1-test-secondtest-dart) | 2 | 51ms | 0 | 1 | 1 |

# Test Suites

## <a id="user-content-ts-0-test-maintest-dart" href="#ts-0-test-maintest-dart">test\main_test.dart</a> ❌

### Test 1

| Result | Test | Time |
| :---: | :--- | ---: |
| ✔️ | Test 1 Passing test | 36ms |

### Test 1 Test 1.1

| Result | Test | Time |
| :---: | :--- | ---: |
|| Test 1 Test 1.1 Failing test | 20ms |
|| Test 1 Test 1.1 Exception in target unit | 6ms |

### Test 2

| Result | Test | Time |
| :---: | :--- | ---: |
|| Test 2 Exception in test | 12ms |

## <a id="user-content-ts-1-test-secondtest-dart" href="#ts-1-test-secondtest-dart">test\second_test.dart</a> ❌

| Result | Test | Time |
| :---: | :--- | ---: |
|| Timeout test | 37ms |
| ✖️ | Skipped test | 14ms |
21 changes: 21 additions & 0 deletions __tests__/__outputs__/dotnet-trx.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
### fixtures\dotnet-trx.trx

**7** tests were completed in **1.061s** with **3** passed, **1** skipped and **3** failed.

| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed ❌ |
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
|| [DotnetTests.XUnitTests.CalculatorTests](#ts-0-DotnetTests-XUnitTests-CalculatorTests) | 7 | 109.5761ms | 3 | 1 | 3 |

# Test Suites

## <a id="user-content-ts-0-DotnetTests-XUnitTests-CalculatorTests" href="#ts-0-DotnetTests-XUnitTests-CalculatorTests">DotnetTests.XUnitTests.CalculatorTests</a> ❌

| Result | Test | Time |
| :---: | :--- | ---: |
|| Exception_In_TargetTest | 0.4975ms |
|| Exception_In_Test | 2.2728ms |
|| Failing_Test | 3.2953ms |
| ✔️ | Passing_Test | 0.1254ms |
| ✔️ | Passing_Test_With_Name | 0.103ms |
| ✖️ | Skipped_Test | 1ms |
| ✔️ | Timeout_Test | 102.2821ms |
38 changes: 38 additions & 0 deletions __tests__/__outputs__/jest-junit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
### fixtures\jest-junit.xml

**6** tests were completed in **1.360s** with **1** passed, **1** skipped and **4** failed.

| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed ❌ |
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
|| [__tests__\main.test.js](#ts-0-tests-main-test-js) | 4 | 486ms | 1 | 0 | 3 |
|| [__tests__\second.test.js](#ts-1-tests-second-test-js) | 2 | 82ms | 0 | 1 | 1 |

# Test Suites

## <a id="user-content-ts-0-tests-main-test-js" href="#ts-0-tests-main-test-js">__tests__\main.test.js</a> ❌

### Test 1

| Result | Test | Time |
| :---: | :--- | ---: |
| ✔️ | Passing test | 1ms |

### Test 1 › Test 1.1

| Result | Test | Time |
| :---: | :--- | ---: |
|| Failing test | 2ms |
|| Exception in target unit | 0ms |

### Test 2

| Result | Test | Time |
| :---: | :--- | ---: |
|| Exception in test | 0ms |

## <a id="user-content-ts-1-tests-second-test-js" href="#ts-1-tests-second-test-js">__tests__\second.test.js</a> ❌

| Result | Test | Time |
| :---: | :--- | ---: |
|| Timeout test | 4ms |
| ✖️ | Skipped test | 0ms |
10 changes: 7 additions & 3 deletions __tests__/__snapshots__/dart-json.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ dart:isolate _RawReceivePortImpl._handleMessage
"title": "[test\\\\second_test.dart] Timeout test",
},
],
"summary": "**6** tests were completed in **3.760s** with **1** passed, **1** skipped and **4** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Failed ❌ | Skipped ✖️ |
"summary": "### fixtures\\\\dart-json.json
**6** tests were completed in **3.760s** with **1** passed, **1** skipped and **4** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed ❌ |
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
| ❌ | [test\\\\main_test.dart](#ts-0-test-maintest-dart) | 4 | 74ms | 1 | 3 | 0 |
| ❌ | [test\\\\main_test.dart](#ts-0-test-maintest-dart) | 4 | 74ms | 1 | 0 | 3 |
| ❌ | [test\\\\second_test.dart](#ts-1-test-secondtest-dart) | 2 | 51ms | 0 | 1 | 1 |
# Test Suites
## <a id=\\"user-content-ts-0-test-maintest-dart\\" href=\\"#ts-0-test-maintest-dart\\">test\\\\main_test.dart</a>
Expand Down
10 changes: 7 additions & 3 deletions __tests__/__snapshots__/dotnet-trx.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ Actual: 2",
"title": "[DotnetTests.XUnitTests.CalculatorTests] Failing_Test",
},
],
"summary": "**7** tests were completed in **1.061s** with **3** passed, **1** skipped and **3** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Failed| Skipped ✖️ |
"summary": "### fixtures\\\\dotnet-trx.trx
**7** tests were completed in **1.061s** with **3** passed, **1** skipped and **3** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed|
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
|| [DotnetTests.XUnitTests.CalculatorTests](#ts-0-DotnetTests-XUnitTests-CalculatorTests) | 7 | 109.5761ms | 3 | 3 | 1 |
|| [DotnetTests.XUnitTests.CalculatorTests](#ts-0-DotnetTests-XUnitTests-CalculatorTests) | 7 | 109.5761ms | 3 | 1 | 3 |
# Test Suites
## <a id=\\"user-content-ts-0-DotnetTests-XUnitTests-CalculatorTests\\" href=\\"#ts-0-DotnetTests-XUnitTests-CalculatorTests\\">DotnetTests.XUnitTests.CalculatorTests</a>
Expand Down
10 changes: 7 additions & 3 deletions __tests__/__snapshots__/jest-junit.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,15 @@ Received: false
"title": "[__tests__\\\\second.test.js] Timeout test",
},
],
"summary": "**6** tests were completed in **1.360s** with **1** passed, **1** skipped and **4** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Failed ❌ | Skipped ✖️ |
"summary": "### fixtures\\\\jest-junit.xml
**6** tests were completed in **1.360s** with **1** passed, **1** skipped and **4** failed.
| Result | Suite | Tests | Time | Passed ✔️ | Skipped ✖️ | Failed ❌ |
| :---: | :--- | ---: | ---: | ---: | ---: | ---: |
| ❌ | [__tests__\\\\main.test.js](#ts-0-tests-main-test-js) | 4 | 486ms | 1 | 3 | 0 |
| ❌ | [__tests__\\\\main.test.js](#ts-0-tests-main-test-js) | 4 | 486ms | 1 | 0 | 3 |
| ❌ | [__tests__\\\\second.test.js](#ts-1-tests-second-test-js) | 2 | 82ms | 0 | 1 | 1 |
# Test Suites
## <a id=\\"user-content-ts-0-tests-main-test-js\\" href=\\"#ts-0-tests-main-test-js\\">__tests__\\\\main.test.js</a>
Expand Down
2 changes: 1 addition & 1 deletion __tests__/dart-json.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ParseOptions} from '../src/parsers/parser-types'
const fixturePath = path.join(__dirname, 'fixtures', 'dart-json.json')
const outputPath = path.join(__dirname, '__outputs__', 'dart-json.md')
const xmlFixture = {
path: fixturePath,
path: path.relative(__dirname, fixturePath),
content: fs.readFileSync(fixturePath, {encoding: 'utf8'})
}

Expand Down
2 changes: 1 addition & 1 deletion __tests__/dotnet-trx.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ParseOptions} from '../src/parsers/parser-types'
const fixturePath = path.join(__dirname, 'fixtures', 'dotnet-trx.trx')
const outputPath = path.join(__dirname, '__outputs__', 'dotnet-trx.md')
const xmlFixture = {
path: fixturePath,
path: path.relative(__dirname, fixturePath),
content: fs.readFileSync(fixturePath, {encoding: 'utf8'})
}

Expand Down
2 changes: 1 addition & 1 deletion __tests__/jest-junit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ParseOptions} from '../src/parsers/parser-types'
const fixturePath = path.join(__dirname, 'fixtures', 'jest-junit.xml')
const outputPath = path.join(__dirname, '__outputs__', 'jest-junit.md')
const xmlFixture = {
path: fixturePath,
path: path.relative(__dirname, fixturePath),
content: fs.readFileSync(fixturePath, {encoding: 'utf8'})
}

Expand Down
38 changes: 21 additions & 17 deletions src/parsers/dart-json/dart-json-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
} from '../../report/test-results'

class TestRun {
constructor(readonly suites: TestSuite[], readonly success: boolean, readonly time: number) {}
constructor(readonly path: string, readonly suites: TestSuite[], readonly success: boolean, readonly time: number) {}
}

class TestSuite {
Expand Down Expand Up @@ -69,20 +69,22 @@ class TestCase {
}

export async function parseDartJson(files: FileContent[], options: ParseOptions): Promise<TestResult> {
const testRun = getTestRun(files[0].content)
const icon = testRun.success ? Icon.success : Icon.fail
const testRuns = files.map(f => getTestRun(f.path, f.content))
const testRunsResults = testRuns.map(getTestRunResult)
const success = testRuns.every(tr => tr.success)
const icon = success ? Icon.success : Icon.fail

return {
success: testRun.success,
success,
output: {
title: `${options.name.trim()} ${icon}`,
summary: getReport(getTestRunResult(testRun)),
annotations: options.annotations ? getAnnotations(testRun, options.workDir, options.trackedFiles) : undefined
summary: getReport(testRunsResults),
annotations: options.annotations ? getAnnotations(testRuns, options.workDir, options.trackedFiles) : undefined
}
}
}

function getTestRun(content: string): TestRun {
function getTestRun(path: string, content: string): TestRun {
const lines = content.split(/\n\r?/g).filter(line => line !== '')
const events = lines.map(str => JSON.parse(str)) as ReportEvent[]

Expand Down Expand Up @@ -112,15 +114,15 @@ function getTestRun(content: string): TestRun {
}
}

return new TestRun(Object.values(suites), success, totalTime)
return new TestRun(path, Object.values(suites), success, totalTime)
}

function getTestRunResult(tr: TestRun): TestRunResult {
const suites = tr.suites.map(s => {
return new TestSuiteResult(s.suite.path, getGroups(s))
})

return new TestRunResult(suites, tr.time)
return new TestRunResult(tr.path, suites, tr.time)
}

function getGroups(suite: TestSuite): TestGroupResult[] {
Expand All @@ -134,15 +136,17 @@ function getGroups(suite: TestSuite): TestGroupResult[] {
})
}

function getAnnotations(tr: TestRun, workDir: string, trackedFiles: string[]): Annotation[] {
function getAnnotations(testRuns: TestRun[], workDir: string, trackedFiles: string[]): Annotation[] {
const annotations: Annotation[] = []
for (const suite of tr.suites) {
for (const group of Object.values(suite.groups)) {
for (const test of group.tests) {
if (test.error) {
const err = getAnnotation(test, suite, workDir, trackedFiles)
if (err !== null) {
annotations.push(err)
for (const tr of testRuns) {
for (const suite of tr.suites) {
for (const group of Object.values(suite.groups)) {
for (const test of group.tests) {
if (test.error) {
const err = getAnnotation(test, suite, workDir, trackedFiles)
if (err !== null) {
annotations.push(err)
}
}
}
}
Expand Down
29 changes: 20 additions & 9 deletions src/parsers/dotnet-trx/dotnet-trx-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,37 @@ class Test {
}

export async function parseDotnetTrx(files: FileContent[], options: ParseOptions): Promise<TestResult> {
const trx = (await parseStringPromise(files[0].content, {
attrValueProcessors: [parseAttribute]
})) as TrxReport
const testRuns: TestRunResult[] = []
const testClasses: TestClass[] = []

for (const file of files) {
const trx = await getTrxReport(file.content)
const tc = getTestClasses(trx)
const tr = getTestRunResult(file.path, trx, tc)
testRuns.push(tr)
testClasses.push(...tc)
}

const testClasses = getTestClasses(trx)
const testRun = getTestRunResult(trx, testClasses)
const success = testRun.result === 'success'
const success = testRuns.every(tr => tr.result === 'success')
const icon = success ? Icon.success : Icon.fail

return {
success,
output: {
title: `${options.name.trim()} ${icon}`,
summary: getReport(testRun),
summary: getReport(testRuns),
annotations: options.annotations ? getAnnotations(testClasses, options.workDir, options.trackedFiles) : undefined
}
}
}

function getTestRunResult(trx: TrxReport, testClasses: TestClass[]): TestRunResult {
async function getTrxReport(content: string): Promise<TrxReport> {
return (await parseStringPromise(content, {
attrValueProcessors: [parseAttribute]
})) as TrxReport
}

function getTestRunResult(path: string, trx: TrxReport, testClasses: TestClass[]): TestRunResult {
const times = trx.TestRun.Times[0].$
const totalTime = times.finish.getTime() - times.start.getTime()

Expand All @@ -71,7 +82,7 @@ function getTestRunResult(trx: TrxReport, testClasses: TestClass[]): TestRunResu
return new TestSuiteResult(tc.name, [group])
})

return new TestRunResult(suites, totalTime)
return new TestRunResult(path, suites, totalTime)
}

function getTestClasses(trx: TrxReport): TestClass[] {
Expand Down
Loading

0 comments on commit c48c076

Please sign in to comment.