Fix tests

Author: rkodev

packages/serialization/json/test/common/jsonSerializationWriter.ts

@@ -8,14 +8,7 @@
 import { assert, describe, it, beforeEach } from "vitest";
 
 import { JsonParseNode, JsonSerializationWriter } from "../../src/index";
-import {
-  createTestBackedModelFromDiscriminatorValue,
-  createTestParserFromDiscriminatorValue,
-  LongRunningOperationStatusObject,
-  serializeTestParser,
-  TestBackedModel,
-  type TestParser
-} from "./testEntity";
+import { createTestBackedModelFromDiscriminatorValue, createTestParserFromDiscriminatorValue, LongRunningOperationStatusObject, serializeTestParser, TestBackedModel, type TestParser } from "./testEntity";
 import { UntypedTestEntity, serializeUntypedTestEntity } from "./untypedTestEntiy";
 import { BackingStore, BackingStoreFactorySingleton, createBackedModelProxyHandler, createUntypedArray, createUntypedBoolean, createUntypedNull, createUntypedNumber, createUntypedObject, createUntypedString } from "@microsoft/kiota-abstractions";
 
@@ -41,7 +34,7 @@ describe("JsonParseNode", () => {
 					},
 				},
 			},
-			testDate
+			testDate,
 		};
 		const expectedObject: TestParser = {
 			testCollection: ["2", "3"],
@@ -53,7 +46,7 @@ describe("JsonParseNode", () => {
 					someValue: 123,
 				},
 			},
-			testDate
+			testDate,
 		};
 
 		const writer = new JsonSerializationWriter();
@@ -66,25 +59,25 @@ describe("JsonParseNode", () => {
 		assert.deepEqual(stringValueResult, expectedObject);
 	});
 
-  it("Test enum serialization", async () => {
-    const inputObject: TestParser = {
-      status: LongRunningOperationStatusObject.NotStarted,
-      nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
-    };
-    const expectedObject: TestParser = {
-      status: LongRunningOperationStatusObject.NotStarted,
-      nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
-    };
+	it("Test enum serialization", async () => {
+		const inputObject: TestParser = {
+			status: LongRunningOperationStatusObject.NotStarted,
+			nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
+		};
+		const expectedObject: TestParser = {
+			status: LongRunningOperationStatusObject.NotStarted,
+			nextStatuses: [LongRunningOperationStatusObject.Succeeded, LongRunningOperationStatusObject.Failed],
+		};
 
-    const writer = new JsonSerializationWriter();
-    writer.writeObjectValue("", inputObject, serializeTestParser);
-    const serializedContent = writer.getSerializedContent();
-    const decoder = new TextDecoder();
-    const contentAsStr = decoder.decode(serializedContent);
-    const result = JSON.parse(contentAsStr);
-    const stringValueResult = new JsonParseNode(result).getObjectValue(createTestParserFromDiscriminatorValue) as TestParser;
-    assert.deepEqual(stringValueResult, expectedObject);
-  });
+		const writer = new JsonSerializationWriter();
+		writer.writeObjectValue("", inputObject, serializeTestParser);
+		const serializedContent = writer.getSerializedContent();
+		const decoder = new TextDecoder();
+		const contentAsStr = decoder.decode(serializedContent);
+		const result = JSON.parse(contentAsStr);
+		const stringValueResult = new JsonParseNode(result).getObjectValue(createTestParserFromDiscriminatorValue) as TestParser;
+		assert.deepEqual(stringValueResult, expectedObject);
+	});
 
 	it("encodes characters properly", async () => {
 		const inputObject: TestParser = {

packages/serialization/json/test/common/testEntity.ts

@@ -101,6 +101,12 @@ export function deserializeTestParser(testParser: TestParser | undefined = {}):
 		testUnionObject: (n) => {
 			testParser.testUnionObject = n.getStringValue() ?? n.getNumberValue() ?? n.getObjectValue(createTestUnionObjectFromDiscriminatorValue);
 		},
+		status: (n) => {
+			testParser.status = n.getEnumValue<LongRunningOperationStatus>(LongRunningOperationStatusObject);
+		},
+		nextStatuses: (n) => {
+			testParser.nextStatuses = n.getCollectionOfEnumValues<LongRunningOperationStatus>(LongRunningOperationStatusObject);
+		},
 	};
 }
 
@@ -160,6 +166,8 @@ export function serializeTestParser(writer: SerializationWriter, entity: TestPar
 	} else {
 		writer.writeObjectValue("testUnionObject", entity.testUnionObject as any, serializeTestUnionObject);
 	}
+	writer.writeEnumValue("status", entity.status);
+	writer.writeCollectionOfEnumValue("status", entity.nextStatuses);
 }
 
 export function serializeFoo(writer: SerializationWriter, entity: FooResponse | undefined = {}): void {

packages/serialization/text/src/textSerializationWriter.ts

@@ -134,13 +134,7 @@ export class TextSerializationWriter implements SerializationWriter {
 		}
 	};
 	public writeCollectionOfEnumValue = <T>(key?: string, values?: T[] | null): void => {
-		if (values && values.length > 0) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			const rawValues = values.filter((x) => x !== undefined).map((x) => `${x}`);
-			if (rawValues.length > 0) {
-				rawValues.forEach((value) => this.writeStringValue(key, value));
-			}
-		}
+		this.writeEnumValue(key, values);
 	};
 	public getSerializedContent = (): ArrayBuffer => {
 		return this.convertStringToArrayBuffer(this.writer.join(``));

packages/serialization/text/test/common/textSerializationWriter.ts

@@ -18,7 +18,7 @@ describe("TextSerializationWriter", () => {
 		textSerializationWriter.writeCollectionOfEnumValue("", statuses);
 		const formContent = textSerializationWriter.getSerializedContent();
 		const form = new TextDecoder().decode(formContent);
-		const expectedString = "notStarted running";
+		const expectedString = "notStarted,running";
 		assert.equal(form, expectedString);
 	});
 });