feedback

Author: sonalideshpandemsft

packages/dds/map/src/test/directoryOracle.ts

@@ -14,6 +14,11 @@ import type {
 	IValueChanged,
 } from "../interfaces.js";
 
+interface OracleDir {
+	keys: Map<string, unknown>;
+	subdirs: Map<string, OracleDir>;
+}
+
 /**
  * Oracle for directory
  * @internal
@@ -28,10 +33,10 @@ export class SharedDirectoryOracle {
 		this.sharedDir.on("subDirectoryDeleted", this.onSubDirDeleted);
 		this.sharedDir.on("containedValueChanged", this.onContainedValueChanged);
 
-		this.takeSnapshot(sharedDir);
+		this.takeSnapshot();
 	}
 
-	private takeSnapshot(dir: ISharedDirectory | IDirectory): void {
+	private takeSnapshot(): void {
 		for (const [k, v] of this.sharedDir.entries()) {
 			this.model.set(k, v);
 		}
@@ -55,8 +60,9 @@ export class SharedDirectoryOracle {
 			);
 		}
 
+		const workingDir = this.sharedDir.getWorkingDirectory(fullPath);
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		const newVal = this.sharedDir.get(fullPath);
+		const newVal = workingDir?.get(key);
 
 		if (newVal === undefined) {
 			// deletion
@@ -89,22 +95,13 @@ export class SharedDirectoryOracle {
 	private readonly onContainedValueChanged = (
 		changed: IValueChanged,
 		local: boolean,
-		target: IEventThisPlaceHolder,
+		target,
 	): void => {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const { key, previousValue } = changed;
 
-		if (this.model.has(key)) {
-			const prevVal = this.model.get(key);
-			assert.strictEqual(
-				prevVal,
-				previousValue,
-				`contained previous value mismatch at ${key}: expected: ${prevVal}, actual: ${previousValue}`,
-			);
-		}
-
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		const newVal = this.sharedDir.get(key);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+		const newVal = target.get(key);
 		if (newVal === undefined) {
 			this.model.delete(key);
 		} else {
@@ -131,7 +128,7 @@ export class SharedDirectoryOracle {
 			assert.deepStrictEqual(
 				actual,
 				value,
-				`SharedDirectoryOracle mismatch at path="${pathKey}" with actual value = ${actual} and oracle value = ${value} with model entries = ${JSON.stringify(this.model.entries())}}`,
+				`SharedDirectoryOracle mismatch at path="${pathKey}" with actual value = ${actual} and oracle value = ${value}}}`,
 			);
 		}
 	}

packages/dds/map/src/test/mocha/directoryFuzzTests.spec.ts

@@ -28,15 +28,15 @@ import {
 	type DirOperation,
 	type DirOperationGenerationConfig,
 } from "./fuzzUtils.js";
-import { hasSharedDirectroyOracle, type ISharedDirectoryWithOracle } from "./oracleUtils.js";
+import { hasSharedDirectoryOracle, type ISharedDirectoryWithOracle } from "./oracleUtils.js";
 
 const oracleEmitter = new TypedEventEmitter<DDSFuzzHarnessEvents>();
 
 oracleEmitter.on("clientCreate", (client) => {
 	const channel = client.channel as ISharedDirectoryWithOracle;
-	const directroyOracle = new SharedDirectoryOracle(channel);
-	channel.sharedDirectoryOracle = directroyOracle;
-	registerOracle(directroyOracle);
+	const directoryOracle = new SharedDirectoryOracle(channel);
+	channel.sharedDirectoryOracle = directoryOracle;
+	registerOracle(directoryOracle);
 });
 
 describe("SharedDirectory fuzz Create/Delete concentrated", () => {
@@ -55,11 +55,11 @@ describe("SharedDirectory fuzz Create/Delete concentrated", () => {
 		generatorFactory: () => takeAsync(100, makeDirOperationGenerator(options)),
 		reducer: makeDirReducer({ clientIds: ["A", "B", "C"], printConsoleLogs: false }),
 		validateConsistency: async (a, b) => {
-			if (hasSharedDirectroyOracle(a.channel)) {
+			if (hasSharedDirectoryOracle(a.channel)) {
 				a.channel.sharedDirectoryOracle.validate();
 			}
 
-			if (hasSharedDirectroyOracle(b.channel)) {
+			if (hasSharedDirectoryOracle(b.channel)) {
 				b.channel.sharedDirectoryOracle.validate();
 			}
 			return assertEquivalentDirectories(a.channel, b.channel);

packages/dds/map/src/test/mocha/fuzzUtils.ts

@@ -29,7 +29,7 @@ import {
 } from "../../index.js";
 
 import { assertEquivalentDirectories } from "./directoryEquivalenceUtils.js";
-import { hasSharedMapOracle, hasSharedDirectroyOracle } from "./oracleUtils.js";
+import { hasSharedMapOracle, hasSharedDirectoryOracle } from "./oracleUtils.js";
 
 /**
  * Represents a map clear operation.
@@ -519,11 +519,11 @@ export const baseDirModel: DDSFuzzModel<DirectoryFactory, DirOperation> = {
 	generatorFactory: () => takeAsync(100, makeDirOperationGenerator(dirDefaultOptions)),
 	reducer: makeDirReducer({ clientIds: ["A", "B", "C"], printConsoleLogs: false }),
 	validateConsistency: async (a, b) => {
-		if (hasSharedDirectroyOracle(a.channel)) {
+		if (hasSharedDirectoryOracle(a.channel)) {
 			a.channel.sharedDirectoryOracle.validate();
 		}
 
-		if (hasSharedDirectroyOracle(b.channel)) {
+		if (hasSharedDirectoryOracle(b.channel)) {
 			b.channel.sharedDirectoryOracle.validate();
 		}
 		return assertEquivalentDirectories(a.channel, b.channel);

packages/dds/map/src/test/mocha/oracleUtils.ts

@@ -27,7 +27,7 @@ export interface ISharedMapWithOracle extends ISharedMap {
  * Type guard for directory
  * @internal
  */
-export function hasSharedDirectroyOracle(s: SharedDirectory): s is ISharedDirectoryWithOracle {
+export function hasSharedDirectoryOracle(s: SharedDirectory): s is ISharedDirectoryWithOracle {
 	return (
 		"sharedDirectoryOracle" in s && s.sharedDirectoryOracle instanceof SharedDirectoryOracle
 	);