Skip to content

Commit 46c77e2

Browse files
committed
Addressed PR comments.
1 parent 064580e commit 46c77e2

7 files changed

Lines changed: 36 additions & 50 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ jobs:
8787
name: build
8888

8989
- name: Test (Service Client)
90-
shell: pwsh
91-
run: ./integration-tests/main-cases/service-client.ps1
90+
run: npm run test:service
9291
env:
9392
ITP_API_URL: ${{ vars.ITP_API_URL }}
9493
ITP_ISSUER_URL: ${{ vars.ITP_ISSUER_URL }}
@@ -120,8 +119,7 @@ jobs:
120119
name: build
121120

122121
- name: Test (Native Client)
123-
shell: pwsh
124-
run: ./integration-tests/main-cases/native-client.ps1
122+
run: npm run test:native
125123
env:
126124
ITP_API_URL: ${{ vars.ITP_API_URL }}
127125
ITP_ISSUER_URL: ${{ vars.ITP_ISSUER_URL }}

integration-tests/main-cases/native-client-parallel/native-client.test.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,16 @@
33
* See LICENSE.md in the project root for license terms and full copyright notice.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import accessControlTests from '../../access-control/access-control.test'
76
import accessControlNativeTests from '../../access-control-native/access-control-native.test'
8-
import apiTests from '../../api.test'
9-
import changedElementsTests from '../../changed-elements/changed-elements.test'
10-
import contextTests from '../../context/context.test'
11-
import imodelTests from '../../imodel/imodel.test'
12-
import itwinTests from '../../itwin/itwin.test'
13-
import storageTests from '../../storage/storage.test'
14-
import userTests from '../../user/user.test'
157
import { nativeLoginToCli } from '../../utils/helpers';
8+
import sharedQuickUseCasesParallel from '../shared-quick-use-cases-parallel';
169

1710
describe('Native Client Tests', async () => {
1811
before(async () => {
1912
await nativeLoginToCli();
2013
})
2114

22-
describe('Access Control tests', () => {
23-
accessControlTests();
24-
accessControlNativeTests();
25-
});
15+
accessControlNativeTests();
16+
sharedQuickUseCasesParallel();
2617

27-
apiTests();
28-
changedElementsTests();
29-
contextTests();
30-
imodelTests();
31-
itwinTests();
32-
storageTests();
33-
userTests();
3418
});

integration-tests/main-cases/native-client.ps1

Lines changed: 0 additions & 4 deletions
This file was deleted.

integration-tests/main-cases/service-client-parallel/service-client.test.ts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,13 @@
33
* See LICENSE.md in the project root for license terms and full copyright notice.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import accessControlTests from '../../access-control/access-control.test'
7-
import apiTests from '../../api.test'
8-
import changedElementsTests from '../../changed-elements/changed-elements.test'
9-
import contextTests from '../../context/context.test'
10-
import imodelTests from '../../imodel/imodel.test'
11-
import itwinTests from '../../itwin/itwin.test'
12-
import storageTests from '../../storage/storage.test'
13-
import userTests from '../../user/user.test'
146
import { logoutFromCLI } from '../../utils/helpers'
7+
import sharedQuickUseCasesParallel from '../shared-quick-use-cases-parallel';
158

169
describe('Service Client Tests', () => {
1710
before(async () => {
1811
await logoutFromCLI();
1912
})
20-
accessControlTests();
21-
22-
apiTests();
23-
changedElementsTests();
24-
contextTests();
25-
imodelTests();
26-
itwinTests();
27-
storageTests();
28-
userTests();
13+
14+
sharedQuickUseCasesParallel();
2915
});

integration-tests/main-cases/service-client.ps1

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
3+
* See LICENSE.md in the project root for license terms and full copyright notice.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import accessControlTests from '../access-control/access-control.test'
7+
import apiTests from '../api.test'
8+
import changedElementsTests from '../changed-elements/changed-elements.test'
9+
import contextTests from '../context/context.test'
10+
import imodelTests from '../imodel/imodel.test'
11+
import itwinTests from '../itwin/itwin.test'
12+
import storageTests from '../storage/storage.test'
13+
import userTests from '../user/user.test'
14+
15+
const sharedQuickUseCasesParallel = () => {
16+
accessControlTests();
17+
apiTests();
18+
changedElementsTests();
19+
contextTests();
20+
imodelTests();
21+
itwinTests();
22+
storageTests();
23+
userTests();
24+
}
25+
26+
export default sharedQuickUseCasesParallel;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
"prepack": "oclif manifest && oclif readme",
164164
"test": "mocha --forbid-only \"integration-tests/main-cases/*.test.ts\"",
165165
"test:formatting": "mocha --forbid-only \"integration-tests/main-cases/formatting.test.ts\"",
166-
"test:service": "mocha --forbid-only \"integration-tests/main-cases/service-client.test.ts\"",
167-
"test:native": "mocha --forbid-only \"integration-tests/main-cases/native-client.test.ts\"",
166+
"test:service": "mocha --forbid-only integration-tests/main-cases/service-client-serial.test.ts && mocha --forbid-only --parallel --jobs 4 integration-tests/main-cases/service-client-parallel/*.test.ts",
167+
"test:native": "mocha --forbid-only integration-tests/main-cases/native-client-serial.test.ts && mocha --forbid-only --parallel --jobs 4 integration-tests/main-cases/native-client-parallel/*.test.ts",
168168
"version": "oclif readme && git add README.md",
169169
"docs-generator": "node ./bin/run.js docs-generator"
170170
},

0 commit comments

Comments
 (0)