From 03d9d28d30ea19520ddddf8cd0843dcf3fad80c6 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 2 Apr 2024 15:50:07 +0300 Subject: [PATCH] Bump coverage --- .../serialization/JsonParseNodeTests.java | 7 +++- .../kiota/serialization/mocks/TestEntity.java | 34 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/JsonParseNodeTests.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/JsonParseNodeTests.java index bbd3cf694..3fe648711 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/JsonParseNodeTests.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/JsonParseNodeTests.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.*; import com.google.gson.JsonParser; +import com.microsoft.kiota.serialization.mocks.MyEnum; import com.microsoft.kiota.serialization.mocks.TestEntity; import com.microsoft.kiota.serialization.mocks.UntypedTestEntity; @@ -19,7 +20,8 @@ class JsonParseNodeTests { private static final String contentType = "application/json"; private static final String testJsonString = - "{\"displayName\":\"My Group\",\"id\":\"11111111-1111-1111-1111-111111111111" + "{\"displayName\":\"My" + + " Group\",\"phones\":[\"+1234567890\"],\"myEnum\":\"VALUE1\",\"enumCollection\":[\"VALUE1\"],\"id\":\"11111111-1111-1111-1111-111111111111" + "\",\"members@delta\":[{\"@odata.type\":\"#microsoft.graph.user\",\"id\":\"22222222-2222-2222-2222-222222222222\"}]}"; private static final String testUntypedJson = "{\r\n" @@ -107,6 +109,9 @@ void getEntityWithArrayInAdditionalData() throws UnsupportedEncodingException { // Act var entity = parseNode.getObjectValue(TestEntity::createFromDiscriminatorValue); assertEquals("11111111-1111-1111-1111-111111111111", entity.getId()); + assertEquals(1, entity.getPhones().size()); + assertEquals(MyEnum.MY_VALUE1, entity.getMyEnum()); + assertEquals(1, entity.getEnumCollection().size()); final var arrayValue = (UntypedArray) entity.getAdditionalData().get("members@delta"); assertEquals(1, arrayValue.getValue().spliterator().estimateSize()); } diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index fbe21178d..afc99ebe5 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -9,7 +9,9 @@ import java.time.LocalDate; import java.time.LocalTime; import java.time.OffsetDateTime; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Consumer; @@ -25,6 +27,16 @@ public void setId(String _id) { this._id = _id; } + private List _phones; + + public List getPhones() { + return _phones; + } + + public void setPhones(List _phones) { + this._phones = new ArrayList(_phones); + } + private String _officeLocation; public String getOfficeLocation() { @@ -85,6 +97,16 @@ public void setMyEnum(MyEnum value) { this._myEnum = value; } + private List _enumCollection; + + public List getEnumCollection() { + return _enumCollection; + } + + public void setEnumCollection(List value) { + this._enumCollection = new ArrayList(value); + } + private OffsetDateTime _createdDateTime; public OffsetDateTime getCreatedDateTime() { @@ -134,11 +156,21 @@ public Map> getFieldDeserializers() { (n) -> { setMyEnum(n.getEnumValue(MyEnum::forValue)); }); + put( + "enumCollection", + (n) -> { + setEnumCollection(n.getCollectionOfEnumValues(MyEnum::forValue)); + }); put( "createdDateTime", (n) -> { setCreatedDateTime(n.getOffsetDateTimeValue()); }); + put( + "phones", + (n) -> { + setPhones(n.getCollectionOfPrimitiveValues(String.class)); + }); } }; } @@ -153,7 +185,9 @@ public void serialize(SerializationWriter writer) { writer.writeLocalTimeValue("startWorkTime", getStartWorkTime()); writer.writeLocalTimeValue("endWorkTime", getEndWorkTime()); writer.writeEnumValue("myEnum", getMyEnum()); + writer.writeCollectionOfEnumValues("enumCollection", getEnumCollection()); writer.writeOffsetDateTimeValue("createdDateTime", getCreatedDateTime()); + writer.writeCollectionOfPrimitiveValues("phones", getPhones()); writer.writeAdditionalData(getAdditionalData()); }