Skip to content

Commit ffab422

Browse files
anthony-murphyanthony-murphy
committed
more clean up
1 parent ed41fd8 commit ffab422

File tree

8 files changed

+18
-61
lines changed

8 files changed

+18
-61
lines changed

‎packages/dds/tree/src/test/utils.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
} from "@fluidframework/test-runtime-utils/internal";
3939
import {
4040
type ChannelFactoryRegistry,
41-
type ITestContainerConfig,
4241
type ITestObjectProvider,
4342
type SummaryInfo,
4443
TestContainerRuntimeFactory,
@@ -351,14 +350,9 @@ export class TestTreeProvider {
351350
const configProvider = (settings: Record<string, ConfigTypes>): IConfigProviderBase => ({
352351
getRawConfig: (name: string): ConfigTypes => settings[name],
353352
});
354-
const testContainerConfig: ITestContainerConfig = {
355-
loaderProps: {
356-
configProvider: configProvider({}),
357-
},
358-
};
359353
const container =
360354
this.trees.length === 0
361-
? await this.provider.makeTestContainer(testContainerConfig)
355+
? await this.provider.makeTestContainer()
362356
: await this.provider.loadTestContainer();
363357

364358
this._containers.push(container);

‎packages/loader/container-loader/src/containerStorageAdapter.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,6 @@ export class ContainerStorageAdapter
223223
public async readBlob(id: string): Promise<ArrayBufferLike> {
224224
const maybeBlob = this.blobContents[id];
225225
if (maybeBlob !== undefined) {
226-
if (typeof maybeBlob === "string") {
227-
const blob = stringToBuffer(maybeBlob, "utf8");
228-
return blob;
229-
}
230226
return maybeBlob;
231227
}
232228
return this._storageService.readBlob(id);

‎packages/loader/container-loader/src/test/snapshotConversionTest.spec.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,9 @@ describe("Dehydrate Container", () => {
6767
const baseSnapshot = snapshot.snapshotTree;
6868
const snapshotBlobs = snapshot.blobContents;
6969
assert.strictEqual(Object.keys(baseSnapshot.trees).length, 2, "2 trees should be there");
70+
assert.strictEqual(Object.keys(baseSnapshot.trees).length, 2, "2 trees should be there");
7071
assert.strictEqual(
71-
Object.keys(snapshot.snapshotTree.trees).length,
72-
2,
73-
"2 trees should be there",
74-
);
75-
assert.strictEqual(
76-
Object.keys(snapshot.snapshotTree.trees[".protocol"].blobs).length,
72+
Object.keys(baseSnapshot.trees[".protocol"].blobs).length,
7773
2,
7874
"2 protocol blobs should be there.",
7975
);
@@ -98,28 +94,28 @@ describe("Dehydrate Container", () => {
9894
"The root sub-tree's content is incorrect",
9995
);
10096
assert.strictEqual(
101-
snapshot.snapshotTree.trees.default.trees.root.unreferenced,
97+
baseSnapshot.trees.default.trees.root.unreferenced,
10298
undefined,
10399
"The root sub-tree should not be marked as unreferenced",
104100
);
105101

106102
// Validate "unref" sub-tree.
107103
assert.strictEqual(
108-
snapshot.snapshotTree.trees.default.trees.unref.unreferenced,
104+
baseSnapshot.trees.default.trees.unref.unreferenced,
109105
true,
110106
"The unref sub-tree should be marked as unreferenced",
111107
);
112108

113109
// Validate "groupId" sub-tree.
114110
assert.strictEqual(
115-
snapshot.snapshotTree.trees.default.trees.groupId.groupId,
111+
baseSnapshot.trees.default.trees.groupId.groupId,
116112
"group",
117113
"The groupId sub-tree should have a groupId",
118114
);
119115

120116
// Validate "groupId" sub-tree.
121117
assert.strictEqual(
122-
snapshot.snapshotTree.trees.default.trees.groupId.groupId,
118+
baseSnapshot.trees.default.trees.groupId.groupId,
123119
"group",
124120
"The groupId sub-tree should have a groupId",
125121
);

‎packages/test/test-end-to-end-tests/src/test/container.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import {
4949
} from "@fluidframework/driver-utils/internal";
5050
import { DataCorruptionError } from "@fluidframework/telemetry-utils/internal";
5151
import {
52-
ITestContainerConfig,
5352
ITestObjectProvider,
5453
LoaderContainerTracker,
5554
LocalCodeLoader,
@@ -320,8 +319,6 @@ describeCompat("Container", "NoCompat", (getTestObjectProvider) => {
320319
});
321320

322321
it("getPendingLocalState() called on container", async () => {
323-
const testContainerConfig: ITestContainerConfig = {};
324-
325322
const runtimeFactory = (_?: unknown) =>
326323
new TestContainerRuntimeFactory(TestDataObjectType, getDataStoreFactory());
327324

@@ -332,7 +329,7 @@ describeCompat("Container", "NoCompat", (getTestObjectProvider) => {
332329
);
333330

334331
const container: ContainerAlpha = asLegacyAlpha(
335-
await localTestObjectProvider.makeTestContainer(testContainerConfig),
332+
await localTestObjectProvider.makeTestContainer(),
336333
);
337334
const pendingString = await container.getPendingLocalState();
338335
container.close();

‎packages/test/test-end-to-end-tests/src/test/data-virtualization/initialSequenceNumberAndStashedOps.spec.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ describeCompat(
2929
},
3030
},
3131
},
32-
loaderProps: {
33-
configProvider: configProvider({}),
34-
},
3532
};
3633

3734
let provider: ITestObjectProvider;

‎packages/test/test-end-to-end-tests/src/test/data-virtualization/noGroupIdOfflineFlow.spec.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ import { type IContainerRuntimeOptions } from "@fluidframework/container-runtime
1111
import { type IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
1212
import type { IFluidHandle } from "@fluidframework/core-interfaces";
1313
import { SharedCounter } from "@fluidframework/counter/internal";
14-
import {
15-
type ITestObjectProvider,
16-
createTestConfigProvider,
17-
} from "@fluidframework/test-utils/internal";
14+
import { type ITestObjectProvider } from "@fluidframework/test-utils/internal";
1815

1916
describeCompat("Offline Attach Ops", "NoCompat", (getTestObjectProvider, apis) => {
2017
const { DataObjectFactory, DataObject } = apis.dataRuntime;
@@ -66,16 +63,13 @@ describeCompat("Offline Attach Ops", "NoCompat", (getTestObjectProvider, apis) =
6663
});
6764

6865
let provider: ITestObjectProvider;
69-
const configProvider = createTestConfigProvider({});
7066
beforeEach("setup", async function () {
7167
provider = getTestObjectProvider();
7268
});
7369

7470
it("Can create loadingGroupId", async () => {
7571
const container: ContainerAlpha = asLegacyAlpha(
76-
await provider.createContainer(runtimeFactory, {
77-
configProvider,
78-
}),
72+
await provider.createContainer(runtimeFactory),
7973
);
8074
const mainObject = (await container.getEntryPoint()) as TestDataObject;
8175

@@ -90,11 +84,6 @@ describeCompat("Offline Attach Ops", "NoCompat", (getTestObjectProvider, apis) =
9084
assert(serializedState !== undefined, "serializedState should not be undefined");
9185

9286
// This should not hang
93-
await provider.loadContainer(
94-
runtimeFactory,
95-
{ configProvider },
96-
undefined,
97-
serializedState,
98-
);
87+
await provider.loadContainer(runtimeFactory, undefined, undefined, serializedState);
9988
});
10089
});

‎packages/test/test-end-to-end-tests/src/test/migration-shim/reconnect.spec.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,6 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
185185

186186
let provider: ITestObjectProvider;
187187

188-
const loaderProps = {
189-
configProvider: configProvider({}),
190-
};
191-
192188
beforeEach("setup", async () => {
193189
provider = getTestObjectProvider();
194190
// Creates the document as v1 of the code with a SharedCell
@@ -275,7 +271,7 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
275271
it("MigrationShim can apply stashed v1 ops to v1 state", async () => {
276272
// Setup containers and get Migration Shims instead of LegacySharedTrees
277273
const container1: ContainerAlpha = asLegacyAlpha(
278-
await provider.loadContainer(runtimeFactory2, loaderProps),
274+
await provider.loadContainer(runtimeFactory2),
279275
);
280276
const url = await container1.getAbsoluteUrl("");
281277
assert(url !== undefined, "Container url should be defined");
@@ -309,7 +305,7 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
309305
it("MigrationShim can apply stashed v2 ops to v2 state", async () => {
310306
// Setup containers and get Migration Shims instead of LegacySharedTrees
311307
const container1: ContainerAlpha = asLegacyAlpha(
312-
await provider.loadContainer(runtimeFactory2, loaderProps),
308+
await provider.loadContainer(runtimeFactory2),
313309
);
314310
const url = await container1.getAbsoluteUrl("");
315311
assert(url !== undefined, "Container url should be defined");
@@ -371,7 +367,7 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
371367
await provider.ensureSynchronized();
372368
const { summaryVersion } = await summarizeNow(summarizer);
373369
const container2: ContainerAlpha = asLegacyAlpha(
374-
await provider.loadContainer(runtimeFactory2, loaderProps, {
370+
await provider.loadContainer(runtimeFactory2, undefined, {
375371
[LoaderHeader.version]: summaryVersion,
376372
}),
377373
);
@@ -409,7 +405,7 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
409405
it("Shims drop stashed v1 ops to v2 state", async () => {
410406
// Setup containers and get Migration Shims instead of LegacySharedTrees
411407
const container1: ContainerAlpha = asLegacyAlpha(
412-
await provider.loadContainer(runtimeFactory2, loaderProps),
408+
await provider.loadContainer(runtimeFactory2),
413409
);
414410
const testObj1 = (await container1.getEntryPoint()) as TestDataObject;
415411
const shim1 = testObj1.getTree<MigrationShim>();
@@ -477,7 +473,7 @@ describeCompat("Stamped v2 ops", "NoCompat", (getTestObjectProvider, apis) => {
477473
it("MigrationShim apply stashed v1 migrate ops in v1 state", async () => {
478474
// Setup containers and get Migration Shims instead of LegacySharedTrees
479475
const container1: ContainerAlpha = asLegacyAlpha(
480-
await provider.loadContainer(runtimeFactory2, loaderProps),
476+
await provider.loadContainer(runtimeFactory2),
481477
);
482478
const testObj1 = (await container1.getEntryPoint()) as TestDataObject;
483479
const shim1 = testObj1.getTree<MigrationShim>();

‎packages/test/test-end-to-end-tests/src/test/offline/blobHandles.spec.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ import { asLegacyAlpha } from "@fluidframework/container-loader/internal";
1111
import type { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
1212
import { IFluidHandle } from "@fluidframework/core-interfaces";
1313
import { Deferred } from "@fluidframework/core-utils/internal";
14-
import {
15-
type ITestObjectProvider,
16-
createTestConfigProvider,
17-
} from "@fluidframework/test-utils/internal";
14+
import { type ITestObjectProvider } from "@fluidframework/test-utils/internal";
1815

1916
const interceptResult = <T>(
2017
parent: any,
@@ -61,7 +58,6 @@ describeCompat("Offline and Blobs", "NoCompat", (getTestObjectProvider, apis) =>
6158
},
6259
},
6360
};
64-
const configProvider = createTestConfigProvider({});
6561
const testDataObjectType = "TestDataObject";
6662
const dataObjectFactory = new DataObjectFactory({
6763
type: testDataObjectType,
@@ -105,11 +101,7 @@ describeCompat("Offline and Blobs", "NoCompat", (getTestObjectProvider, apis) =>
105101

106102
// ADO#44999: Update for placeholder pending blob creation and getPendingLocalState
107103
it.skip("Slow blob create request before container closes", async () => {
108-
const container = asLegacyAlpha(
109-
await provider.createContainer(runtimeFactory, {
110-
configProvider,
111-
}),
112-
);
104+
const container = asLegacyAlpha(await provider.createContainer(runtimeFactory));
113105
const mainObject = (await container.getEntryPoint()) as TestDataObject;
114106

115107
await provider.ensureSynchronized();

0 commit comments

Comments
 (0)