Skip to content

Update serializer #35741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nisha-bhatia merged 7 commits into from
Apr 21, 2023
Merged

Update serializer #35741

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d22823c
wip
nisha-bhatia Apr 17, 2023
11e9d23
wip
nisha-bhatia Apr 19, 2023
bd3ad43
wip
nisha-bhatia Apr 19, 2023
35e349f
wip
nisha-bhatia Apr 21, 2023
9467c78
wip
nisha-bhatia Apr 21, 2023
507896b
Update SerializableTests.cs
nisha-bhatia Apr 21, 2023
45f8998
Merge branch 'updateSerializer' into updateSerializer
nisha-bhatia Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions sdk/core/Azure.Core/tests/ModelSerializationTests/SerializableTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
Expand All @@ -25,10 +25,6 @@ public void CanRoundTripFutureVersionWithoutLoss(bool includeReadonly, bool hand
{
Stream stream = new MemoryStream();
string serviceResponse = "{\"latinName\":\"Canis lupus familiaris\",\"weight\":5.5,\"name\":\"Doggo\",\"numberOfLegs\":4}";
//if (handleUnknown)
// serviceResponse =
//else
// serviceResponse = "{\"latinName\":\"Canis lupus familiaris\",\"weight\":5.5,\"name\":\"Doggo\"}";

StringBuilder expectedSerialized = new StringBuilder("{");
if (includeReadonly)
Expand Down Expand Up @@ -62,14 +58,11 @@ public void CanRoundTripFutureVersionWithoutLoss(bool includeReadonly, bool hand
{
var additionalProperties = typeof(Animal).GetProperty("RawData", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).GetValue(model) as Dictionary<string, BinaryData>;
Assert.AreEqual(1, additionalProperties.Count);
foreach (var entry in additionalProperties)
{
Assert.AreEqual("numberOfLegs", entry.Key);
Assert.AreEqual(4.ToString(), entry.Value.ToString());
}
Assert.IsTrue(additionalProperties.ContainsKey("numberOfLegs"));
Assert.IsTrue(additionalProperties["numberOfLegs"].ToString() == "4");
}
Assert.That(serviceResponse.Length, Is.EqualTo(bytesConsumed));
model.TrySerialize(stream, out var bytesWritten, options: options); // consider resetting stream in TrySerialize
model.TrySerialize(stream, out var bytesWritten, options: options);
stream.Position = 0;
string roundTrip = new StreamReader(stream).ReadToEnd();
Assert.That(roundTrip, Is.EqualTo(expectedSerializedString));
Expand All @@ -83,8 +76,18 @@ public void CanRoundTripFutureVersionWithoutLoss(bool includeReadonly, bool hand
Assert.That(model.Name, Is.EqualTo(model2.Name));
Assert.That(model.Weight, Is.EqualTo(model2.Weight));
Assert.That(roundTrip.Length, Is.EqualTo(bytesConsumed));
//validate add properties
//consider adding generic model checker that verifies all model properties
if (handleUnknown)
{
var additionalProperties1 = typeof(Animal).GetProperty("RawData", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).GetValue(model) as Dictionary<string, BinaryData>;
var additionalProperties2 = typeof(Animal).GetProperty("RawData", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic).GetValue(model2) as Dictionary<string, BinaryData>;

Assert.AreEqual(1, additionalProperties1.Count);
Assert.IsTrue(additionalProperties1.ContainsKey("numberOfLegs"));
Assert.IsTrue(additionalProperties1["numberOfLegs"].ToString() == "4");
Assert.AreEqual(1, additionalProperties2.Count);
Assert.IsTrue(additionalProperties2.ContainsKey("numberOfLegs"));
Assert.IsTrue(additionalProperties2["numberOfLegs"].ToString() == "4");
}
}

[Test]
Expand Down