@fluidframework/test-utils 2.0.0-dev-rc.3.0.0.250606 → 2.0.0-dev-rc.3.0.0.254274

package/src/localLoader.ts

@@ -9,10 +9,11 @@ import {
 	IFluidCodeDetails,
 	IHostLoader,
 	ILoaderOptions,
-} from "@fluidframework/container-definitions";
-import { Loader } from "@fluidframework/container-loader";
+} from "@fluidframework/container-definitions/internal";
+import { Loader } from "@fluidframework/container-loader/internal";
 import { IRequest, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { IDocumentServiceFactory, IUrlResolver } from "@fluidframework/driver-definitions";
+import { IDocumentServiceFactory, IUrlResolver } from "@fluidframework/driver-definitions/internal";
+
 import { LocalCodeLoader, fluidEntryPoint } from "./localCodeLoader.js";
 
 /**

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.0.0-dev-rc.3.0.0.250606";
+export const pkgVersion = "2.0.0-dev-rc.3.0.0.254274";

package/src/retry.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { delay } from "@fluidframework/core-utils";
+import { delay } from "@fluidframework/core-utils/internal";
 
 const retry = async <T>(
 	callback: () => Promise<T>,

package/src/testContainerRuntimeFactory.ts

@@ -3,27 +3,30 @@
  * Licensed under the MIT License.
  */
 
-import { IContainerContext, IRuntime } from "@fluidframework/container-definitions";
+import { IContainerContext, IRuntime } from "@fluidframework/container-definitions/internal";
 import {
 	ContainerRuntime,
 	DefaultSummaryConfiguration,
 	IContainerRuntimeOptions,
-} from "@fluidframework/container-runtime";
-import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+} from "@fluidframework/container-runtime/internal";
+import { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
 import {
 	FluidObject,
 	IFluidHandleContext,
 	IRequest,
 	IResponse,
 } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
-// eslint-disable-next-line import/no-deprecated
-import { RuntimeRequestHandler, buildRuntimeRequestHandler } from "@fluidframework/request-handler";
+import { assert } from "@fluidframework/core-utils/internal";
+import {
+	RuntimeRequestHandler,
+	// eslint-disable-next-line import/no-deprecated
+	buildRuntimeRequestHandler,
+} from "@fluidframework/request-handler/internal";
 import {
 	IFluidDataStoreFactory,
 	NamedFluidDataStoreRegistryEntries,
-} from "@fluidframework/runtime-definitions";
-import { RequestParser, RuntimeFactoryHelper } from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { RequestParser, RuntimeFactoryHelper } from "@fluidframework/runtime-utils/internal";
 
 interface backCompat_IFluidRouter {
 	IFluidRouter?: backCompat_IFluidRouter;
@@ -89,7 +92,7 @@ export const createTestContainerRuntimeFactory = (
 			const rootContext =
 				"createDetachedRootDataStore" in runtime
 					? (runtime as any).createDetachedRootDataStore([this.type], "default")
-					: runtime.createDetachedDataStore([this.type], "default");
+					: runtime.createDetachedDataStore([this.type]);
 
 			const rootRuntime = await this.dataStoreFactory.instantiateDataStore(
 				rootContext,
@@ -130,6 +133,7 @@ export const createTestContainerRuntimeFactory = (
 						["default", Promise.resolve(this.dataStoreFactory)],
 						[this.type, Promise.resolve(this.dataStoreFactory)],
 					],
+					// eslint-disable-next-line import/no-deprecated
 					buildRuntimeRequestHandler(
 						backCompat_DefaultRouteRequestHandler("default"),
 						...this.requestHandlers,
@@ -163,6 +167,7 @@ export const createTestContainerRuntimeFactory = (
 					["default", Promise.resolve(this.dataStoreFactory)],
 					[this.type, Promise.resolve(this.dataStoreFactory)],
 				],
+				// eslint-disable-next-line import/no-deprecated
 				requestHandler: buildRuntimeRequestHandler(
 					getDefaultObject,
 					...this.requestHandlers,

package/src/testContainerRuntimeFactoryWithDefaultDataStore.ts

@@ -3,15 +3,15 @@
  * Licensed under the MIT License.
  */
 
-import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct";
-import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
-import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct/internal";
+import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
+import { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
 import { FluidObject } from "@fluidframework/core-interfaces";
-import { RuntimeRequestHandler } from "@fluidframework/request-handler";
+import { RuntimeRequestHandler } from "@fluidframework/request-handler/internal";
 import {
 	IFluidDataStoreFactory,
 	NamedFluidDataStoreRegistryEntries,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/runtime-definitions/internal";
 
 const getDefaultFluidObject = async (runtime: IContainerRuntime) => {
 	const entryPoint = await runtime.getAliasedDataStoreEntryPoint("default");

package/src/testFluidObject.ts

@@ -4,20 +4,21 @@
  */
 
 import { IFluidHandle, IRequest, IResponse } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
 	FluidDataStoreRuntime,
 	FluidObjectHandle,
 	mixinRequestHandler,
-} from "@fluidframework/datastore";
+} from "@fluidframework/datastore/internal";
 import { IChannelFactory, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
 import { ISharedMap, SharedMap } from "@fluidframework/map";
 import {
 	IFluidDataStoreChannel,
 	IFluidDataStoreContext,
 	IFluidDataStoreFactory,
-} from "@fluidframework/runtime-definitions";
-import { create404Response } from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { create404Response } from "@fluidframework/runtime-utils/internal";
+
 import { ITestFluidObject } from "./interfaces.js";
 
 /**

package/src/testObjectProvider.ts

@@ -3,18 +3,20 @@
  * Licensed under the MIT License.
  */
 
+import { assert } from "@fluidframework/core-utils/internal";
+import { ITestDriver, TestDriverTypes } from "@fluid-internal/test-driver-definitions";
 import {
 	IContainer,
 	IFluidCodeDetails,
 	IHostLoader,
 	ILoader,
-} from "@fluidframework/container-definitions";
+} from "@fluidframework/container-definitions/internal";
 import {
 	ILoaderProps,
 	Loader,
 	waitContainerToCatchUp as waitContainerToCatchUp_original,
-} from "@fluidframework/container-loader";
-import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
+} from "@fluidframework/container-loader/internal";
+import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
 import {
 	IRequestHeader,
 	ITelemetryBaseEvent,
@@ -24,14 +26,15 @@ import {
 	IDocumentServiceFactory,
 	IResolvedUrl,
 	IUrlResolver,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
+import { type ITelemetryGenericEventExt } from "@fluidframework/telemetry-utils";
 import {
-	type ITelemetryGenericEventExt,
 	createChildLogger,
 	createMultiSinkLogger,
-} from "@fluidframework/telemetry-utils";
-import { ITestDriver, TestDriverTypes } from "@fluidframework/test-driver-definitions";
+	type ITelemetryLoggerPropertyBags,
+} from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
+
 import { LoaderContainerTracker } from "./loaderContainerTracker.js";
 import { LocalCodeLoader, fluidEntryPoint } from "./localCodeLoader.js";
 import { createAndAttachContainer } from "./localLoader.js";
@@ -79,7 +82,12 @@ export interface ITestObjectProvider {
 	/**
 	 * Logger used to track expected and unexpected events.
 	 */
-	logger: EventAndErrorTrackingLogger | undefined;
+	logger: ITelemetryBaseLogger;
+
+	/**
+	 * Logger used to track expected and unexpected events.
+	 */
+	tracker: IEventAndErrorTrackingLogger;
 
 	/**
 	 * Used to create a url for the created container with any data store path given in the relative url.
@@ -177,6 +185,7 @@ export interface ITestObjectProvider {
 	loadTestContainer(
 		testContainerConfig?: ITestContainerConfig,
 		requestHeader?: IRequestHeader,
+		pendingLocalState?: string,
 	): Promise<IContainer>;
 
 	/**
@@ -285,6 +294,15 @@ function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
 	}
 }
 
+/** @internal */
+export interface IEventAndErrorTrackingLogger {
+	registerExpectedEvent: (...orderedExpectedEvents: ITelemetryGenericEventExt[]) => void;
+	reportAndClearTrackedEvents: () => {
+		expectedNotFound: { index: number; event: ITelemetryGenericEventExt }[];
+		unexpectedErrors: ITelemetryBaseEvent[];
+	};
+}
+
 /**
  * This class tracks events. It allows specifying expected events, which will be looked for in order.
  * It also tracks all unexpected errors.
@@ -292,7 +310,9 @@ function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
  * any expected events that have not occurred.
  * @internal
  */
-export class EventAndErrorTrackingLogger implements ITelemetryBaseLogger {
+export class EventAndErrorTrackingLogger
+	implements ITelemetryBaseLogger, IEventAndErrorTrackingLogger
+{
 	/**
 	 * Even if these error events are logged, tests should still be allowed to pass
 	 * Additionally, if downgrade is true, then log as generic (e.g. to avoid polluting the e2e test logs)
@@ -307,12 +327,9 @@ export class EventAndErrorTrackingLogger implements ITelemetryBaseLogger {
 		{ eventName: "fluid:telemetry:OpPerf:OpRoundtripTime" },
 	];
 
-	constructor(private readonly baseLogger: ITelemetryBaseLogger) {}
+	constructor(private readonly baseLogger?: ITelemetryBaseLogger) {}
 
-	private readonly expectedEvents: (
-		| { index: number; event: ITelemetryGenericEventExt | undefined }
-		| undefined
-	)[] = [];
+	private readonly expectedEvents: { index: number; event: ITelemetryGenericEventExt }[] = [];
 	private readonly unexpectedErrors: ITelemetryBaseEvent[] = [];
 
 	public registerExpectedEvent(...orderedExpectedEvents: ITelemetryGenericEventExt[]) {
@@ -330,24 +347,26 @@ export class EventAndErrorTrackingLogger implements ITelemetryBaseLogger {
 	}
 
 	send(event: ITelemetryBaseEvent): void {
-		const ee = this.expectedEvents[0]?.event;
-		if (ee?.eventName === event.eventName) {
-			let matches = true;
-			for (const key of Object.keys(ee)) {
-				if (ee[key] !== event[key]) {
-					matches = false;
-					break;
+		if (this.expectedEvents.length > 0) {
+			const ee = this.expectedEvents[0].event;
+			if (ee.eventName === event.eventName) {
+				let matches = true;
+				for (const key of Object.keys(ee)) {
+					if (ee[key] !== event[key]) {
+						matches = false;
+						break;
+					}
 				}
-			}
-			if (matches) {
-				// we found an expected event
-				// so remove it from the list of expected events
-				// and if it is an error, change it to generic
-				// this helps keep our telemetry clear of
-				// expected errors.
-				this.expectedEvents.shift();
-				if (event.category === "error") {
-					event.category = "generic";
+				if (matches) {
+					// we found an expected event
+					// so remove it from the list of expected events
+					// and if it is an error, change it to generic
+					// this helps keep our telemetry clear of
+					// expected errors.
+					this.expectedEvents.shift();
+					if (event.category === "error") {
+						event.category = "generic";
+					}
 				}
 			}
 		}
@@ -364,7 +383,7 @@ export class EventAndErrorTrackingLogger implements ITelemetryBaseLogger {
 			}
 		}
 
-		this.baseLogger.send(event);
+		this.baseLogger?.send(event);
 	}
 
 	public reportAndClearTrackedEvents() {
@@ -389,7 +408,8 @@ export class TestObjectProvider implements ITestObjectProvider {
 	private _loaderContainerTracker = new LoaderContainerTracker();
 	private _documentServiceFactory: IDocumentServiceFactory | undefined;
 	private _urlResolver: IUrlResolver | undefined;
-	private _logger: EventAndErrorTrackingLogger | undefined;
+	private _logger: ITelemetryBaseLogger | undefined;
+	private _tracker: EventAndErrorTrackingLogger | undefined;
 	private readonly _documentIdStrategy: IDocumentIdStrategy;
 	// Since documentId doesn't change we can only create/make one container. Call the load functions instead.
 	private _documentCreated = false;
@@ -418,27 +438,29 @@ export class TestObjectProvider implements ITestObjectProvider {
 	/**
 	 * {@inheritDoc ITestObjectProvider.logger}
 	 */
-	public get logger(): EventAndErrorTrackingLogger {
+	public get logger(): ITelemetryBaseLogger {
 		if (this._logger === undefined) {
-			this._logger = new EventAndErrorTrackingLogger(
-				createChildLogger({
-					logger: getTestLogger?.(),
-					properties: {
-						all: {
-							driverType: this.driver.type,
-							driverEndpointName: this.driver.endpointName,
-							driverTenantName: this.driver.tenantName,
-							driverUserIndex: this.driver.userIndex,
-						},
+			this._tracker = new EventAndErrorTrackingLogger(getTestLogger?.());
+			this._logger = createChildLogger({
+				logger: this._tracker,
+				properties: {
+					all: {
+						testType: this.type,
+						driverType: this.driver.type,
+						driverEndpointName: this.driver.endpointName,
+						driverTenantName: this.driver.tenantName,
+						driverUserIndex: this.driver.userIndex,
 					},
-				}),
-			);
+				},
+			});
 		}
 		return this._logger;
 	}
 
-	private set logger(logger: EventAndErrorTrackingLogger) {
-		this._logger = logger;
+	public get tracker() {
+		void this.logger;
+		assert(this._tracker !== undefined, "should be initialized");
+		return this._tracker;
 	}
 
 	/**
@@ -569,11 +591,18 @@ export class TestObjectProvider implements ITestObjectProvider {
 		return this.resolveContainer(loader, requestHeader);
 	}
 
-	private async resolveContainer(loader: ILoader, headers?: IRequestHeader) {
-		return loader.resolve({
-			url: await this.driver.createContainerUrl(this.documentId),
-			headers,
-		});
+	private async resolveContainer(
+		loader: ILoader,
+		headers?: IRequestHeader,
+		pendingLocalState?: string,
+	) {
+		return loader.resolve(
+			{
+				url: await this.driver.createContainerUrl(this.documentId),
+				headers,
+			},
+			pendingLocalState,
+		);
 	}
 
 	/**
@@ -616,10 +645,11 @@ export class TestObjectProvider implements ITestObjectProvider {
 	public async loadTestContainer(
 		testContainerConfig?: ITestContainerConfig,
 		requestHeader?: IRequestHeader,
+		pendingLocalState?: string,
 	): Promise<IContainer> {
 		const loader = this.makeTestLoader(testContainerConfig);
 
-		const container = await this.resolveContainer(loader, requestHeader);
+		const container = await this.resolveContainer(loader, requestHeader, pendingLocalState);
 		await this.waitContainerToCatchUp(container);
 
 		return container;
@@ -633,11 +663,12 @@ export class TestObjectProvider implements ITestObjectProvider {
 		this._documentServiceFactory = undefined;
 		this._urlResolver = undefined;
 		this._documentIdStrategy.reset();
-		const logError = getUnexpectedLogErrorException(this._logger);
+		const logError = getUnexpectedLogErrorException(this._tracker);
 		if (logError) {
 			throw logError;
 		}
 		this._logger = undefined;
+		this._tracker = undefined;
 		this._documentCreated = false;
 	}
 
@@ -687,7 +718,8 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 	 */
 	public readonly type = "TestObjectProviderWithVersionedLoad";
 	private _loaderContainerTracker = new LoaderContainerTracker();
-	private _logger: EventAndErrorTrackingLogger | undefined;
+	private _logger: ITelemetryBaseLogger | undefined;
+	private _tracker: EventAndErrorTrackingLogger | undefined;
 	private readonly _documentIdStrategy: IDocumentIdStrategy;
 	private _documentServiceFactory: IDocumentServiceFactory | undefined;
 	private _urlResolver: IUrlResolver | undefined;
@@ -713,6 +745,7 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 		private readonly createFluidEntryPointForLoading: (
 			testContainerConfig?: ITestContainerConfig,
 		) => fluidEntryPoint,
+		private readonly telemetryProps?: ITelemetryLoggerPropertyBags,
 	) {
 		this._documentIdStrategy = getDocumentIdStrategy(driverForCreating.type);
 	}
@@ -720,17 +753,23 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 	/**
 	 * {@inheritDoc ITestObjectProvider.logger}
 	 */
-	public get logger(): EventAndErrorTrackingLogger {
+	public get logger() {
 		if (this._logger === undefined) {
-			this._logger = new EventAndErrorTrackingLogger(
-				createChildLogger({
-					logger: getTestLogger?.(),
-				}),
-			);
+			this._tracker = new EventAndErrorTrackingLogger(getTestLogger?.());
+			this._logger = createChildLogger({
+				logger: this._tracker,
+				properties: this.telemetryProps,
+			});
 		}
 		return this._logger;
 	}
 
+	public get tracker() {
+		void this.logger;
+		assert(this._tracker !== undefined, "should be initialized");
+		return this._tracker;
+	}
+
 	/**
 	 * {@inheritDoc ITestObjectProvider.documentServiceFactory}
 	 */
@@ -920,12 +959,16 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 		loader: ILoader,
 		headers?: IRequestHeader,
 		driver?: ITestDriver,
+		pendingLocalState?: string,
 	) {
-		return loader.resolve({
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			url: await driver!.createContainerUrl(this.documentId),
-			headers,
-		});
+		return loader.resolve(
+			{
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				url: await driver!.createContainerUrl(this.documentId),
+				headers,
+			},
+			pendingLocalState,
+		);
 	}
 
 	/**
@@ -972,11 +1015,17 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 	public async loadTestContainer(
 		testContainerConfig?: ITestContainerConfig,
 		requestHeader?: IRequestHeader,
+		pendingLocalState?: string,
 	): Promise<IContainer> {
 		// Keep track of which Loader we are about to use so we can pass the correct driver through
 		const driver = this.useCreateApi ? this.driverForCreating : this.driverForLoading;
 		const loader = this.makeTestLoader(testContainerConfig);
-		const container = await this.resolveContainer(loader, requestHeader, driver);
+		const container = await this.resolveContainer(
+			loader,
+			requestHeader,
+			driver,
+			pendingLocalState,
+		);
 		await this.waitContainerToCatchUp(container);
 
 		return container;
@@ -989,10 +1038,11 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 		this.useCreateApi = true;
 		this._loaderContainerTracker.reset();
 		this._logger = undefined;
+		this._tracker = undefined;
 		this._documentServiceFactory = undefined;
 		this._urlResolver = undefined;
 		this._documentIdStrategy.reset();
-		const logError = getUnexpectedLogErrorException(this._logger);
+		const logError = getUnexpectedLogErrorException(this._tracker);
 		if (logError) {
 			throw logError;
 		}
@@ -1038,7 +1088,7 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
  * @internal
  */
 export function getUnexpectedLogErrorException(
-	logger: EventAndErrorTrackingLogger | undefined,
+	logger: IEventAndErrorTrackingLogger | undefined,
 	prefix?: string,
 ) {
 	if (logger === undefined) {

package/src/timeoutUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Deferred } from "@fluidframework/core-utils";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import type * as Mocha from "mocha";
 
 // @deprecated this value is no longer used