Skip to content

Commit e2acf72

Browse files
Merge pull request #77 from aquality-automation/feature/junit5
Feature/junit5
2 parents 664cce5 + 339aa88 commit e2acf72

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Features:
77
- Import: Mark import as debug -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/47)
88
- Milestone View: Add functionality that displays the latest results of the tests from the test runs -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/11)
99
- List of predefined Resolutions -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/26)
10+
- Add JUnit 5 support -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/33)
1011
- Add posibility to Finish Test Run Manually -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/21)
1112

1213
Bugfixes:

src/app/pages/project/import/import.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h2>Import Test Results</h2>
8888
</div>
8989
</div>
9090
<div
91-
*ngIf="fileListArray?.length > 0 && (format.name === 'MSTest (.trx)' || format.name === 'TestNG (.xml)' || format.name === 'NUnit v3 (.xml)')"
91+
*ngIf="fileListArray?.length > 0 && (format.name === 'MSTest (.trx)' || format.name === 'TestNG (.xml)' || format.name === 'JUnit (.xml)' ||format.name === 'NUnit v3 (.xml)')"
9292
class="panel panel-default import-results-panel col-md-12 it-test-name-selector clearfix">
9393
<div>
9494
<p>What do you want to use as test name?*</p>

src/app/pages/project/import/import.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export class ImportComponent {
5858
{ name: 'MSTest (.trx)', key: importTypes.MSTest },
5959
{ name: 'Robot (.xml)', key: importTypes.Robot },
6060
{ name: 'TestNG (.xml)', key: importTypes.TestNG },
61+
{ name: 'JUnit (.xml)', key: importTypes.JUnit },
6162
{ name: 'Cucumber (.json)', key: importTypes.Cucumber },
6263
{ name: 'PHP Codeception (.xml)', key: importTypes.PHPCodeception },
6364
{ name: 'NUnit v2 (.xml)', key: importTypes.NUnit_v2 },
@@ -217,7 +218,7 @@ export class ImportComponent {
217218
IsTestNameValid() {
218219
if (this.format.key === importTypes.MSTest) {
219220
return this.testNameOptions.testClassName || this.testNameOptions.testName || this.testNameOptions.testDescription;
220-
} else if (this.format.key === importTypes.TestNG) {
221+
} else if (this.format.key === importTypes.TestNG || this.format.key === importTypes.JUnit) {
221222
return this.testNameOptions.testClassName || this.testNameOptions.testName;
222223
} else if (this.format.key === importTypes.NUnit_v3) {
223224
return this.testNameOptions.testClassName || this.testNameOptions.featureTest;

src/app/services/import.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export const importTypes = {
2424
Cucumber: 'Cucumber',
2525
PHPCodeception: 'PHPCodeception',
2626
NUnit_v2: 'NUnit_v2',
27-
NUnit_v3: 'NUnit_v3'
27+
NUnit_v3: 'NUnit_v3',
28+
JUnit: 'JUnit'
2829
};
2930

3031
export class ImportParameters {

0 commit comments

Comments
 (0)