@fluidframework/test-utils 2.0.0-internal.3.0.5 → 2.0.0-internal.3.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.js +8 -10
- package/README.md +41 -11
- package/api-extractor.json +2 -2
- package/dist/DriverWrappers.d.ts.map +1 -1
- package/dist/DriverWrappers.js.map +1 -1
- package/dist/TestConfigs.d.ts.map +1 -1
- package/dist/TestConfigs.js +3 -2
- package/dist/TestConfigs.js.map +1 -1
- package/dist/TestSummaryUtils.d.ts +1 -1
- package/dist/TestSummaryUtils.d.ts.map +1 -1
- package/dist/TestSummaryUtils.js +8 -6
- package/dist/TestSummaryUtils.js.map +1 -1
- package/dist/containerUtils.d.ts.map +1 -1
- package/dist/containerUtils.js +3 -1
- package/dist/containerUtils.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts.map +1 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/loaderContainerTracker.d.ts.map +1 -1
- package/dist/loaderContainerTracker.js +37 -27
- package/dist/loaderContainerTracker.js.map +1 -1
- package/dist/localCodeLoader.d.ts.map +1 -1
- package/dist/localCodeLoader.js.map +1 -1
- package/dist/localLoader.d.ts.map +1 -1
- package/dist/localLoader.js.map +1 -1
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/retry.d.ts.map +1 -1
- package/dist/retry.js.map +1 -1
- package/dist/testContainerRuntimeFactory.d.ts.map +1 -1
- package/dist/testContainerRuntimeFactory.js +2 -1
- package/dist/testContainerRuntimeFactory.js.map +1 -1
- package/dist/testFluidObject.d.ts.map +1 -1
- package/dist/testFluidObject.js +7 -3
- package/dist/testFluidObject.js.map +1 -1
- package/dist/testObjectProvider.d.ts +4 -1
- package/dist/testObjectProvider.d.ts.map +1 -1
- package/dist/testObjectProvider.js +28 -11
- package/dist/testObjectProvider.js.map +1 -1
- package/dist/timeoutUtils.d.ts.map +1 -1
- package/dist/timeoutUtils.js +4 -3
- package/dist/timeoutUtils.js.map +1 -1
- package/package.json +121 -119
- package/prettier.config.cjs +1 -1
- package/src/DriverWrappers.ts +40 -37
- package/src/TestConfigs.ts +9 -7
- package/src/TestSummaryUtils.ts +120 -115
- package/src/containerUtils.ts +18 -16
- package/src/index.ts +27 -23
- package/src/interfaces.ts +10 -7
- package/src/loaderContainerTracker.ts +627 -565
- package/src/localCodeLoader.ts +85 -77
- package/src/localLoader.ts +24 -24
- package/src/packageVersion.ts +1 -1
- package/src/retry.ts +31 -25
- package/src/testContainerRuntimeFactory.ts +59 -56
- package/src/testFluidObject.ts +168 -152
- package/src/testObjectProvider.ts +445 -384
- package/src/timeoutUtils.ts +174 -154
- package/tsconfig.json +9 -16
package/package.json
CHANGED
|
@@ -1,121 +1,123 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
2
|
+
"name": "@fluidframework/test-utils",
|
|
3
|
+
"version": "2.0.0-internal.3.1.1",
|
|
4
|
+
"description": "Utilities for Fluid tests",
|
|
5
|
+
"homepage": "https://fluidframework.com",
|
|
6
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "https://github.com/microsoft/FluidFramework.git",
|
|
9
|
+
"directory": "packages/test/test-utils"
|
|
10
|
+
},
|
|
11
|
+
"license": "MIT",
|
|
12
|
+
"author": "Microsoft and contributors",
|
|
13
|
+
"sideEffects": false,
|
|
14
|
+
"main": "dist/index.js",
|
|
15
|
+
"module": "lib/index.js",
|
|
16
|
+
"types": "dist/index.d.ts",
|
|
17
|
+
"scripts": {
|
|
18
|
+
"build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
|
|
19
|
+
"build:compile": "npm run tsc && npm run typetests:gen && npm run build:test",
|
|
20
|
+
"build:compile:min": "npm run build:compile",
|
|
21
|
+
"build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
|
|
22
|
+
"build:full": "npm run build",
|
|
23
|
+
"build:full:compile": "npm run build:compile",
|
|
24
|
+
"build:genver": "gen-version",
|
|
25
|
+
"build:test": "tsc --project ./src/test/tsconfig.json",
|
|
26
|
+
"ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
|
|
27
|
+
"clean": "rimraf dist lib *.tsbuildinfo *.build.log",
|
|
28
|
+
"eslint": "eslint --format stylish src",
|
|
29
|
+
"eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
|
|
30
|
+
"format": "npm run prettier:fix",
|
|
31
|
+
"lint": "npm run prettier && npm run eslint",
|
|
32
|
+
"lint:fix": "npm run prettier:fix && npm run eslint:fix",
|
|
33
|
+
"prettier": "prettier --check . --ignore-path ../../../.prettierignore",
|
|
34
|
+
"prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
|
|
35
|
+
"test": "npm run test:mocha",
|
|
36
|
+
"test:mocha": "mocha --unhandled-rejections=strict --recursive dist/test/*.spec.js --exit --project src/test/tsconfig.json -r node_modules/@fluidframework/mocha-test-setup",
|
|
37
|
+
"test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
|
|
38
|
+
"tsc": "tsc",
|
|
39
|
+
"typetests:gen": "flub generate typetests --generate --dir .",
|
|
40
|
+
"typetests:prepare": "flub generate typetests --prepare --dir . --pin"
|
|
41
|
+
},
|
|
42
|
+
"nyc": {
|
|
43
|
+
"all": true,
|
|
44
|
+
"cache-dir": "nyc/.cache",
|
|
45
|
+
"exclude": [
|
|
46
|
+
"src/test/**/*.ts",
|
|
47
|
+
"dist/test/**/*.js"
|
|
48
|
+
],
|
|
49
|
+
"exclude-after-remap": false,
|
|
50
|
+
"include": [
|
|
51
|
+
"src/**/*.ts",
|
|
52
|
+
"dist/**/*.js"
|
|
53
|
+
],
|
|
54
|
+
"report-dir": "nyc/report",
|
|
55
|
+
"reporter": [
|
|
56
|
+
"cobertura",
|
|
57
|
+
"html",
|
|
58
|
+
"text"
|
|
59
|
+
],
|
|
60
|
+
"temp-directory": "nyc/.nyc_output"
|
|
61
|
+
},
|
|
62
|
+
"dependencies": {
|
|
63
|
+
"@fluidframework/aqueduct": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
64
|
+
"@fluidframework/common-definitions": "^0.20.1",
|
|
65
|
+
"@fluidframework/common-utils": "^1.0.0",
|
|
66
|
+
"@fluidframework/container-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
67
|
+
"@fluidframework/container-loader": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
68
|
+
"@fluidframework/container-runtime": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
69
|
+
"@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
70
|
+
"@fluidframework/core-interfaces": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
71
|
+
"@fluidframework/datastore": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
72
|
+
"@fluidframework/datastore-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
73
|
+
"@fluidframework/driver-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
74
|
+
"@fluidframework/driver-utils": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
75
|
+
"@fluidframework/local-driver": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
76
|
+
"@fluidframework/map": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
77
|
+
"@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
78
|
+
"@fluidframework/protocol-definitions": "^1.1.0",
|
|
79
|
+
"@fluidframework/request-handler": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
80
|
+
"@fluidframework/routerlicious-driver": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
81
|
+
"@fluidframework/runtime-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
82
|
+
"@fluidframework/runtime-utils": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
83
|
+
"@fluidframework/telemetry-utils": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
84
|
+
"@fluidframework/test-driver-definitions": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
85
|
+
"@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.1.1 <2.0.0-internal.4.0.0",
|
|
86
|
+
"best-random": "^1.0.0",
|
|
87
|
+
"debug": "^4.1.1",
|
|
88
|
+
"uuid": "^8.3.1"
|
|
89
|
+
},
|
|
90
|
+
"devDependencies": {
|
|
91
|
+
"@fluid-tools/build-cli": "^0.9.0",
|
|
92
|
+
"@fluidframework/build-common": "^1.1.0",
|
|
93
|
+
"@fluidframework/build-tools": "^0.9.0",
|
|
94
|
+
"@fluidframework/eslint-config-fluid": "^2.0.0",
|
|
95
|
+
"@fluidframework/test-utils-previous": "npm:@fluidframework/test-utils@2.0.0-internal.3.0.1",
|
|
96
|
+
"@microsoft/api-extractor": "^7.22.2",
|
|
97
|
+
"@rushstack/eslint-config": "^2.5.1",
|
|
98
|
+
"@types/debug": "^4.1.5",
|
|
99
|
+
"@types/diff": "^3.5.1",
|
|
100
|
+
"@types/mocha": "^9.1.1",
|
|
101
|
+
"@types/node": "^14.18.36",
|
|
102
|
+
"@types/random-js": "^1.0.31",
|
|
103
|
+
"@types/uuid": "^8.3.0",
|
|
104
|
+
"concurrently": "^6.2.0",
|
|
105
|
+
"copyfiles": "^2.4.1",
|
|
106
|
+
"cross-env": "^7.0.2",
|
|
107
|
+
"diff": "^3.5.0",
|
|
108
|
+
"eslint": "~8.6.0",
|
|
109
|
+
"mocha": "^10.0.0",
|
|
110
|
+
"nyc": "^15.0.0",
|
|
111
|
+
"prettier": "~2.6.2",
|
|
112
|
+
"random-js": "^1.0.8",
|
|
113
|
+
"rimraf": "^2.6.2",
|
|
114
|
+
"typescript": "~4.5.5"
|
|
115
|
+
},
|
|
116
|
+
"typeValidation": {
|
|
117
|
+
"version": "2.0.0-internal.3.1.1",
|
|
118
|
+
"previousVersionStyle": "~previousMinor",
|
|
119
|
+
"baselineRange": ">=2.0.0-internal.3.0.0 <2.0.0-internal.3.1.0",
|
|
120
|
+
"baselineVersion": "2.0.0-internal.3.0.1",
|
|
121
|
+
"broken": {}
|
|
122
|
+
}
|
|
121
123
|
}
|
package/prettier.config.cjs
CHANGED
package/src/DriverWrappers.ts
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
|
|
7
7
|
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
IDocumentService,
|
|
9
|
+
IDocumentServiceFactory,
|
|
10
|
+
IDocumentStorageService,
|
|
11
|
+
IResolvedUrl,
|
|
12
|
+
ISummaryContext,
|
|
13
13
|
} from "@fluidframework/driver-definitions";
|
|
14
14
|
import { ISummaryTree } from "@fluidframework/protocol-definitions";
|
|
15
15
|
|
|
@@ -19,18 +19,18 @@ import { ISummaryTree } from "@fluidframework/protocol-definitions";
|
|
|
19
19
|
* callback before it is uploaded to the server.
|
|
20
20
|
*/
|
|
21
21
|
export function wrapDocumentStorageService(
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
innerDocStorageService: IDocumentStorageService,
|
|
23
|
+
uploadSummaryCb: (summaryTree: ISummaryTree, context: ISummaryContext) => ISummaryContext,
|
|
24
24
|
) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
25
|
+
const outerDocStorageService = Object.create(innerDocStorageService) as IDocumentStorageService;
|
|
26
|
+
outerDocStorageService.uploadSummaryWithContext = async (
|
|
27
|
+
summary: ISummaryTree,
|
|
28
|
+
context: ISummaryContext,
|
|
29
|
+
): Promise<string> => {
|
|
30
|
+
const newContext = uploadSummaryCb(summary, context);
|
|
31
|
+
return innerDocStorageService.uploadSummaryWithContext(summary, newContext);
|
|
32
|
+
};
|
|
33
|
+
return outerDocStorageService;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
/**
|
|
@@ -41,15 +41,15 @@ export function wrapDocumentStorageService(
|
|
|
41
41
|
* to pass in the `uploadSummaryCb`.
|
|
42
42
|
*/
|
|
43
43
|
export function wrapDocumentService(
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
innerDocService: IDocumentService,
|
|
45
|
+
uploadSummaryCb: (summaryTree: ISummaryTree, context: ISummaryContext) => ISummaryContext,
|
|
46
46
|
) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
const outerDocService = Object.create(innerDocService) as IDocumentService;
|
|
48
|
+
outerDocService.connectToStorage = async (): Promise<IDocumentStorageService> => {
|
|
49
|
+
const storageService = await innerDocService.connectToStorage();
|
|
50
|
+
return wrapDocumentStorageService(storageService, uploadSummaryCb);
|
|
51
|
+
};
|
|
52
|
+
return outerDocService;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
/**
|
|
@@ -60,18 +60,21 @@ export function wrapDocumentService(
|
|
|
60
60
|
* pass in the `uploadSummaryCb`.
|
|
61
61
|
*/
|
|
62
62
|
export function wrapDocumentServiceFactory(
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
innerDocServiceFactory: IDocumentServiceFactory,
|
|
64
|
+
uploadSummaryCb: (summaryTree: ISummaryTree, context: ISummaryContext) => ISummaryContext,
|
|
65
65
|
) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
66
|
+
const outerDocServiceFactory = Object.create(innerDocServiceFactory) as IDocumentServiceFactory;
|
|
67
|
+
outerDocServiceFactory.createDocumentService = async (
|
|
68
|
+
resolvedUrl: IResolvedUrl,
|
|
69
|
+
logger?: ITelemetryBaseLogger,
|
|
70
|
+
clientIsSummarizer?: boolean,
|
|
71
|
+
): Promise<IDocumentService> => {
|
|
72
|
+
const documentService = await innerDocServiceFactory.createDocumentService(
|
|
73
|
+
resolvedUrl,
|
|
74
|
+
logger,
|
|
75
|
+
clientIsSummarizer,
|
|
76
|
+
);
|
|
77
|
+
return wrapDocumentService(documentService, uploadSummaryCb);
|
|
78
|
+
};
|
|
79
|
+
return outerDocServiceFactory;
|
|
77
80
|
}
|
package/src/TestConfigs.ts
CHANGED
|
@@ -5,10 +5,12 @@
|
|
|
5
5
|
|
|
6
6
|
import { ConfigTypes, IConfigProviderBase } from "@fluidframework/telemetry-utils";
|
|
7
7
|
|
|
8
|
-
export const mockConfigProvider = (
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
export const mockConfigProvider = (
|
|
9
|
+
settings: Record<string, ConfigTypes> = {},
|
|
10
|
+
): IConfigProviderBase => {
|
|
11
|
+
settings["Fluid.GarbageCollection.TrackGCState"] = "true";
|
|
12
|
+
settings["Fluid.GarbageCollection.WriteDataAtRoot"] = "true";
|
|
13
|
+
return {
|
|
14
|
+
getRawConfig: (name: string): ConfigTypes => settings[name],
|
|
15
|
+
};
|
|
16
|
+
};
|