Skip to content

Commit 0b69ff4

Browse files
SamRobinson75684SamRobinson75684
committed
fix: creating pick test types function
1 parent e7fa30e commit 0b69ff4

3 files changed

Lines changed: 42 additions & 76 deletions

File tree

‎tests/playwright-tests/src/tests/runner/TestTypePicker.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { fail } from "assert";
2+
import { runnerBasedEpic1TestScenariosAmend } from "../e2e/epic1-highpriority-tests/epic1-high-priority-testsuite-migrated";
3+
import { runnerBasedEpic123TestScenariosAddAmend } from "../e2e/epic123-smoke-tests/epic123-smoke-tests-migrated";
4+
import { runnerBasedEpic2TestScenariosAmend } from "../e2e/epic2-highpriority-tests/epic2-high-priority-testsuite-migrated";
5+
import { runnerBasedEpic2MedTestScenariosAmend } from "../e2e/epic2-medpriority-tests/epic2-med-priority-testsuite-migrated";
6+
import { runnerBasedEpic3TestScenariosAmend } from "../e2e/epic3-highpriority-tests/epic3-high-priority-testsuite-migrated";
7+
import { runnerBasedEpic3MedTestScenariosAmend } from "../e2e/epic3-medpriority-tests/epic3-med-priority-testsuite-migrated";
8+
import { runnerBasedEpic4dTestScenariosAmend } from "../e2e/epic4d-validation-tests/epic4d-6045-validation-testsuite-migrated";
9+
10+
11+
export function TestTypePicker(
12+
TEST_TYPE: string
13+
)
14+
{
15+
switch(TEST_TYPE) {
16+
case 'RegressionEpic1':
17+
return runnerBasedEpic1TestScenariosAmend;
18+
case 'RegressionEpic2':
19+
return runnerBasedEpic2TestScenariosAmend;
20+
case 'RegressionEpic2Med':
21+
return runnerBasedEpic2MedTestScenariosAmend;
22+
case 'RegressionEpic3':
23+
return runnerBasedEpic3TestScenariosAmend;
24+
case 'RegressionEpic3Med':
25+
return runnerBasedEpic3MedTestScenariosAmend;
26+
case 'RegressionEpic4d':
27+
return runnerBasedEpic4dTestScenariosAmend;
28+
case 'RegressionEpic4c':
29+
return runnerBasedEpic4dTestScenariosAmend;
30+
default:
31+
return runnerBasedEpic123TestScenariosAddAmend;
32+
}
33+
34+
}

‎tests/playwright-tests/src/tests/runner/runner-workflow-add.spec.ts‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,17 @@
11
import { test, request as playwrightRequest, APIRequestContext } from '@playwright/test'
22
import { cleanupDatabaseFromAPI, getConsolidatedAllTestData, processFileViaStorage, validateSqlDatabaseFromAPI } from '../steps/steps';
33
import { createParquetFromJson } from '../../parquet/parquet-multiplier';
4-
import { runnerBasedEpic123TestScenariosAdd } from '../e2e/epic123-smoke-tests/epic123-smoke-tests-migrated';
5-
import { runnerBasedEpic1TestScenariosAdd } from '../e2e/epic1-highpriority-tests/epic1-high-priority-testsuite-migrated';
6-
import { runnerBasedEpic1MedTestScenariosAdd } from '../e2e/epic1-medpriority-tests/epic1-med-priority-testsuite-migrated';
7-
import { runnerBasedEpic2TestScenariosAdd } from '../e2e/epic2-highpriority-tests/epic2-high-priority-testsuite-migrated';
8-
import { runnerBasedEpic2MedTestScenariosAdd } from '../e2e/epic2-medpriority-tests/epic2-med-priority-testsuite-migrated';
9-
import { runnerBasedEpic3TestScenariosAdd } from '../e2e/epic3-highpriority-tests/epic3-high-priority-testsuite-migrated';
10-
import { runnerBasedEpic3MedTestScenariosAdd } from '../e2e/epic3-medpriority-tests/epic3-med-priority-testsuite-migrated';
114
import { generateDynamicDateMap, replaceDynamicDatesInJson } from '../../../src/json/json-updater';
12-
import { runnerBasedEpic4cTestScenariosAdd } from '../e2e/epic4c-add-participant-tests/epic4c-testsuite-migrated';
13-
import { runnerBasedEpic4dTestScenariosAdd } from '../e2e/epic4d-validation-tests/epic4d-6045-validation-testsuite-migrated';
145
import { fail } from 'assert';
6+
import { TestTypePicker } from './TestTypePicker';
157

168

179
// Tests to run based on TEST_TYPE environment variable
10+
const TEST_TYPE = process.env.TEST_TYPE ?? 'SMOKE';
1811
let scopedTestScenario = "";
1912

20-
const TEST_TYPE = process.env.TEST_TYPE ?? 'SMOKE';
21-
if (TEST_TYPE == 'RegressionEpic1') {
22-
scopedTestScenario = runnerBasedEpic1TestScenariosAdd;
23-
} else if (TEST_TYPE == 'RegressionEpic1Med') {
24-
scopedTestScenario = runnerBasedEpic1MedTestScenariosAdd;
25-
} else if (TEST_TYPE == 'RegressionEpic2') {
26-
scopedTestScenario = runnerBasedEpic2TestScenariosAdd;
27-
} else if (TEST_TYPE == 'RegressionEpic2Med') {
28-
scopedTestScenario = runnerBasedEpic2MedTestScenariosAdd;
29-
} else if (TEST_TYPE == 'RegressionEpic3') {
30-
scopedTestScenario = runnerBasedEpic3TestScenariosAdd;
31-
} else if (TEST_TYPE == 'RegressionEpic3Med') {
32-
scopedTestScenario = runnerBasedEpic3MedTestScenariosAdd;
33-
} else if (TEST_TYPE == 'RegressionEpic4d') {
34-
scopedTestScenario = runnerBasedEpic4dTestScenariosAdd;
35-
} else if (TEST_TYPE == 'RegressionEpic4c') {
36-
scopedTestScenario = runnerBasedEpic4cTestScenariosAdd;
37-
} else {
38-
scopedTestScenario = runnerBasedEpic123TestScenariosAdd;
39-
}
4013

14+
scopedTestScenario = TestTypePicker(TEST_TYPE)
4115

4216
if (!scopedTestScenario) {
4317
console.error("No test scenario tags defined for the current TEST_TYPE. Please check the environment variable.");

‎tests/playwright-tests/src/tests/runner/runner-workflow-amend.spec.ts‎

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,22 @@
11
import { test, request as playwrightRequest, APIRequestContext } from '@playwright/test'
22
import { createParquetFromJson } from '../../parquet/parquet-multiplier';
33
import { cleanupDatabaseFromAPI, getConsolidatedAllTestData, processFileViaStorage, validateSqlDatabaseFromAPI } from '../steps/steps';
4-
import { runnerBasedEpic123TestScenariosAddAmend } from '../e2e/epic123-smoke-tests/epic123-smoke-tests-migrated';
5-
import { runnerBasedEpic1TestScenariosAmend } from '../e2e/epic1-highpriority-tests/epic1-high-priority-testsuite-migrated';
6-
import { runnerBasedEpic2TestScenariosAmend } from '../e2e/epic2-highpriority-tests/epic2-high-priority-testsuite-migrated';
7-
import { runnerBasedEpic2MedTestScenariosAmend } from '../e2e/epic2-medpriority-tests/epic2-med-priority-testsuite-migrated';
8-
import { runnerBasedEpic3TestScenariosAmend } from '../e2e/epic3-highpriority-tests/epic3-high-priority-testsuite-migrated';
9-
import { runnerBasedEpic3MedTestScenariosAmend } from '../e2e/epic3-medpriority-tests/epic3-med-priority-testsuite-migrated';
10-
import { runnerBasedEpic4cTestScenariosAmend } from '../e2e/epic4c-add-participant-tests/epic4c-testsuite-migrated';
11-
import { runnerBasedEpic4dTestScenariosAmend } from '../e2e/epic4d-validation-tests/epic4d-6045-validation-testsuite-migrated';
124
import { generateDynamicDateMap, replaceDynamicDatesInJson } from '../../../src/json/json-updater';
135
import { fail } from 'assert';
14-
import { TIMEOUT } from 'dns';
6+
import { TestTypePicker } from './TestTypePicker';
157

168
// Tests to run based on TEST_TYPE environment variable
179

1810

1911
let scopedTestScenario = "";
20-
2112
const TEST_TYPE = process.env.TEST_TYPE ?? 'SMOKE';
2213

23-
switch(TEST_TYPE) {
24-
case 'RegressionEpic1':
25-
scopedTestScenario = runnerBasedEpic1TestScenariosAmend;
26-
break;
27-
case 'RegressionEpic2':
28-
scopedTestScenario = runnerBasedEpic2TestScenariosAmend;
29-
break;
30-
case 'RegressionEpic2Med':
31-
scopedTestScenario = runnerBasedEpic2MedTestScenariosAmend;
32-
case 'RegressionEpic3':
33-
scopedTestScenario = runnerBasedEpic3TestScenariosAmend;
34-
case 'RegressionEpic3Med':
35-
scopedTestScenario = runnerBasedEpic3MedTestScenariosAmend;
36-
case 'RegressionEpic4d':
37-
scopedTestScenario = runnerBasedEpic4dTestScenariosAmend;
38-
case 'RegressionEpic4c':
39-
scopedTestScenario = runnerBasedEpic4cTestScenariosAmend;
40-
default:
41-
scopedTestScenario = runnerBasedEpic123TestScenariosAddAmend;
14+
scopedTestScenario = TestTypePicker(TEST_TYPE)
4215

16+
if (!scopedTestScenario) {
17+
console.error("No test scenario tags defined for the current TEST_TYPE. Please check the environment variable.");
18+
fail;
4319
}
44-
/*if (TEST_TYPE == 'RegressionEpic1') {
45-
scopedTestScenario = runnerBasedEpic1TestScenariosAmend;
46-
} else if (TEST_TYPE == 'RegressionEpic2') {
47-
scopedTestScenario = runnerBasedEpic2TestScenariosAmend;
48-
} else if (TEST_TYPE == 'RegressionEpic2Med') {
49-
scopedTestScenario = runnerBasedEpic2MedTestScenariosAmend;
50-
} else if (TEST_TYPE == 'RegressionEpic3') {
51-
scopedTestScenario = runnerBasedEpic3TestScenariosAmend;
52-
} else if (TEST_TYPE == 'RegressionEpic3Med') {
53-
scopedTestScenario = runnerBasedEpic3MedTestScenariosAmend;
54-
} else if (TEST_TYPE == 'RegressionEpic4d') {
55-
scopedTestScenario = runnerBasedEpic4dTestScenariosAmend;
56-
} else if (TEST_TYPE == 'RegressionEpic4c') {
57-
scopedTestScenario = runnerBasedEpic4cTestScenariosAmend;
58-
} else {
59-
scopedTestScenario = runnerBasedEpic123TestScenariosAddAmend;
60-
}*/
61-
6220
if (!scopedTestScenario) {
6321
console.error("No test scenario tags defined for the current TEST_TYPE. Please check the environment variable.");
6422
fail;

0 commit comments

Comments
 (0)