Skip to content

Commit 61a094c

Browse files
chore: Refactor test imports to use @sap-cloud-sdk/test-util-internal pkg (#6467)
--------- Co-authored-by: sap-cloud-sdk-bot[bot] <274190970+sap-cloud-sdk-bot[bot]@users.noreply.github.com>
1 parent 15f9009 commit 61a094c

65 files changed

Lines changed: 212 additions & 101 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"packages/generator-common",
2929
"packages/temporal-de-serializers",
3030
"packages/resilience",
31+
"test-resources/test/test-util",
3132
"test-packages/integration-tests",
3233
"test-packages/e2e-tests",
3334
"test-packages/test-services-odata-common",

packages/connectivity/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"jsonwebtoken": "^9.0.3"
5151
},
5252
"devDependencies": {
53+
"@sap-cloud-sdk/test-util-internal": "*",
5354
"mock-fs": "^5.5.0",
5455
"nock": "^14.0.11",
5556
"typescript": "~5.9.3"

packages/connectivity/src/http-agent/http-agent.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jest.mock('jks-js', () => ({
77
toPem: jest.fn()
88
}));
99
import * as jks from 'jks-js';
10+
import { certAsString } from '@sap-cloud-sdk/test-util-internal/test-certificate';
1011
import { registerDestinationCache } from '../scp-cf/destination/register-destination-cache';
11-
import { certAsString } from '../../../../test-resources/test/test-util/test-certificate';
1212
import { getAgentConfig } from './http-agent';
1313
import type { HttpDestination } from '../scp-cf/destination';
1414
import type { DestinationCertificate } from '../scp-cf';

packages/connectivity/src/scp-cf/authorization-header.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createLogger } from '@sap-cloud-sdk/util';
22
import {
33
defaultBasicCredentials,
44
defaultDestination
5-
} from '../../../../test-resources/test/test-util/request-mocker';
5+
} from '@sap-cloud-sdk/test-util-internal/request-mocker';
66
import { buildAuthorizationHeaders } from './authorization-header';
77
import * as destinationImport from './destination/destination';
88
import type { Destination } from './destination';

packages/connectivity/src/scp-cf/circuit-breaker.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
destinationServiceUri,
66
providerXsuaaUrl,
77
xsuaaBindingMock
8-
} from '../../../../test-resources/test/test-util/environment-mocks';
9-
import { privateKey } from '../../../../test-resources/test/test-util/keys';
8+
} from '@sap-cloud-sdk/test-util-internal/environment-mocks';
9+
import { privateKey } from '@sap-cloud-sdk/test-util-internal/keys';
1010
import { getClientCredentialsToken } from './xsuaa-service';
1111
import { fetchDestinationWithTokenRetrieval } from './destination';
1212

packages/connectivity/src/scp-cf/connectivity-service.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {
33
connectivityProxyConfigMock,
44
connectivitySocksProxyConfigMock,
55
mockServiceBindings
6-
} from '../../../../test-resources/test/test-util/environment-mocks';
6+
} from '@sap-cloud-sdk/test-util-internal/environment-mocks';
77
import {
88
providerServiceToken,
99
providerUserToken,
1010
subscriberServiceToken,
1111
subscriberUserToken
12-
} from '../../../../test-resources/test/test-util/mocked-access-tokens';
13-
import { mockServiceToken } from '../../../../test-resources/test/test-util/token-accessor-mocks';
14-
import { mockClientCredentialsGrantCall } from '../../../../test-resources/test/test-util/xsuaa-service-mocks';
12+
} from '@sap-cloud-sdk/test-util-internal/mocked-access-tokens';
13+
import { mockServiceToken } from '@sap-cloud-sdk/test-util-internal/token-accessor-mocks';
14+
import { mockClientCredentialsGrantCall } from '@sap-cloud-sdk/test-util-internal/xsuaa-service-mocks';
1515
import {
1616
addProxyConfigurationOnPrem,
1717
httpProxyHostAndPort

packages/connectivity/src/scp-cf/destination/destination-accessor-authentication-type.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
import { decodeJwt } from '../jwt';
21
import {
32
mockServiceBindings,
43
onlyIssuerXsuaaUrl,
54
testTenants
6-
} from '../../../../../test-resources/test/test-util/environment-mocks';
5+
} from '@sap-cloud-sdk/test-util-internal/environment-mocks';
76
import {
87
expectAllMocksUsed,
98
mockJwtBearerToken,
109
mockServiceToken
11-
} from '../../../../../test-resources/test/test-util/token-accessor-mocks';
10+
} from '@sap-cloud-sdk/test-util-internal/token-accessor-mocks';
1211
import {
1312
mockFetchDestinationCalls,
1413
mockFetchDestinationCallsNotFound
15-
} from '../../../../../test-resources/test/test-util/destination-service-mocks';
14+
} from '@sap-cloud-sdk/test-util-internal/destination-service-mocks';
1615
import {
1716
onlyIssuerServiceToken,
1817
providerUserToken,
1918
subscriberServiceToken,
2019
subscriberUserToken
21-
} from '../../../../../test-resources/test/test-util/mocked-access-tokens';
20+
} from '@sap-cloud-sdk/test-util-internal/mocked-access-tokens';
2221
import {
2322
basicMultipleResponse,
2423
certificateSingleResponse,
@@ -34,7 +33,8 @@ import {
3433
onPremiseBasicSingleResponse,
3534
onPremisePrincipalPropagationMultipleResponse,
3635
samlAssertionSingleResponse
37-
} from '../../../../../test-resources/test/test-util/example-destination-service-responses';
36+
} from '@sap-cloud-sdk/test-util-internal/example-destination-service-responses';
37+
import { decodeJwt } from '../jwt';
3838
import { clientCredentialsTokenCache } from '../client-credentials-token-cache';
3939
import { parseDestination } from './destination';
4040
import { getDestination } from './destination-accessor';

packages/connectivity/src/scp-cf/destination/destination-accessor-failure-cases.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
import {
22
mockServiceBindings,
33
xsuaaBindingMock
4-
} from '../../../../../test-resources/test/test-util/environment-mocks';
4+
} from '@sap-cloud-sdk/test-util-internal/environment-mocks';
55
import {
66
subscriberServiceToken,
77
subscriberUserToken
8-
} from '../../../../../test-resources/test/test-util/mocked-access-tokens';
8+
} from '@sap-cloud-sdk/test-util-internal/mocked-access-tokens';
99
import {
1010
mockJwtBearerToken,
1111
mockServiceToken
12-
} from '../../../../../test-resources/test/test-util/token-accessor-mocks';
12+
} from '@sap-cloud-sdk/test-util-internal/token-accessor-mocks';
1313
import {
1414
mockFetchDestinationCalls,
1515
mockFetchDestinationCallsNotFound,
1616
mockInstanceDestinationsCall,
1717
mockSubaccountDestinationsCall
18-
} from '../../../../../test-resources/test/test-util/destination-service-mocks';
18+
} from '@sap-cloud-sdk/test-util-internal/destination-service-mocks';
1919
import {
2020
basicMultipleResponse,
2121
destinationName,
2222
oauthMultipleResponse
23-
} from '../../../../../test-resources/test/test-util/example-destination-service-responses';
23+
} from '@sap-cloud-sdk/test-util-internal/example-destination-service-responses';
2424
import {
2525
getAllDestinationsFromDestinationService,
2626
getDestination

packages/connectivity/src/scp-cf/destination/destination-accessor-jwks.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
mockServiceToken,
77
oauthMultipleResponse,
88
providerServiceToken
9-
} from '../../../../../test-resources/test/test-util';
9+
} from '@sap-cloud-sdk/test-util-internal';
1010
import { alwaysProvider } from './destination-selection-strategies';
1111
import { getDestination } from './destination-accessor';
1212
import type { DestinationFetchOptions } from './destination-accessor-types';

packages/connectivity/src/scp-cf/destination/destination-accessor-loading-precendence.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { mockServiceBindings } from '../../../../../test-resources/test/test-util';
1+
import { mockServiceBindings } from '@sap-cloud-sdk/test-util-internal';
22
import { getDestination, useOrFetchDestination } from './destination-accessor';
33
import { registerDestination } from './destination-from-registration';
44
import { registerDestinationCache } from './register-destination-cache';
55
import type { DestinationWithName } from './destination-from-registration';
6-
import type { MockServiceBindings } from '../../../../../test-resources/test/test-util';
6+
import type { MockServiceBindings } from '@sap-cloud-sdk/test-util-internal';
77

88
function mockEnvDestinations() {
99
process.env['destinations'] = JSON.stringify([

0 commit comments

Comments
 (0)