Skip to content

Add tests for model serialization #38042

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
m-nash merged 8 commits into from
Aug 8, 2023
Merged

Add tests for model serialization #38042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e1c845
re-organize common test code and add initial tests for ModelWriter
m-nash Aug 4, 2023
666bf3e
missed files
m-nash Aug 4, 2023
d671838
update perf proj to use common testdata
m-nash Aug 4, 2023
172a5cb
group model serializer tests
m-nash Aug 4, 2023
2ad52e1
update api
m-nash Aug 4, 2023
c51ad45
wip
m-nash Aug 7, 2023
f34f001
separate read lock
m-nash Aug 7, 2023
72082dc
Merge branch 'feature/updateSerializer' of https://github.com/Azure/a…
m-nash Aug 7, 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
6 changes: 6 additions & 0 deletions sdk/core/Azure.Core/Azure.Core.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Expressions.Data
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests.Public", "tests\public\Azure.Core.Tests.Public.csproj", "{BFBF8EF7-61D8-40E7-9E98-468A0427761E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Core.Tests.Common", "tests\common\Azure.Core.Tests.Common.csproj", "{0EEDF53F-120A-45B1-8468-A97A0D46DBAC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -132,6 +134,10 @@ Global
{BFBF8EF7-61D8-40E7-9E98-468A0427761E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFBF8EF7-61D8-40E7-9E98-468A0427761E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFBF8EF7-61D8-40E7-9E98-468A0427761E}.Release|Any CPU.Build.0 = Release|Any CPU
{0EEDF53F-120A-45B1-8468-A97A0D46DBAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EEDF53F-120A-45B1-8468-A97A0D46DBAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EEDF53F-120A-45B1-8468-A97A0D46DBAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EEDF53F-120A-45B1-8468-A97A0D46DBAC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 6 additions & 2 deletions sdk/core/Azure.Core/api/Azure.Core.net461.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Azure.Core.Se
}
public static partial class ModelSerializer
{
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerFormat format) where T : Azure.Core.Serialization.IModelSerializable<T> { throw null; }
Expand Down Expand Up @@ -1187,6 +1185,12 @@ public ModelSerializerOptions(Azure.Core.Serialization.ModelSerializerFormat for
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public System.Func<System.Type, Azure.Core.Serialization.ObjectSerializer>? GenericTypeSerializerCreator { get { throw null; } set { } }
}
public sealed partial class ModelWriter : System.IDisposable
{
public ModelWriter(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions options) { }
public void Dispose() { }
public System.BinaryData ToBinaryData() { throw null; }
}
public abstract partial class ObjectSerializer
{
protected ObjectSerializer() { }
Expand Down
8 changes: 6 additions & 2 deletions sdk/core/Azure.Core/api/Azure.Core.net5.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Azure.Core.Se
}
public static partial class ModelSerializer
{
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerFormat format) where T : Azure.Core.Serialization.IModelSerializable<T> { throw null; }
Expand Down Expand Up @@ -1187,6 +1185,12 @@ public ModelSerializerOptions(Azure.Core.Serialization.ModelSerializerFormat for
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public System.Func<System.Type, Azure.Core.Serialization.ObjectSerializer>? GenericTypeSerializerCreator { get { throw null; } set { } }
}
public sealed partial class ModelWriter : System.IDisposable
{
public ModelWriter(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions options) { }
public void Dispose() { }
public System.BinaryData ToBinaryData() { throw null; }
}
public abstract partial class ObjectSerializer
{
protected ObjectSerializer() { }
Expand Down
8 changes: 6 additions & 2 deletions sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Azure.Core.Se
}
public static partial class ModelSerializer
{
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerFormat format) where T : Azure.Core.Serialization.IModelSerializable<T> { throw null; }
Expand Down Expand Up @@ -1187,6 +1185,12 @@ public ModelSerializerOptions(Azure.Core.Serialization.ModelSerializerFormat for
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public System.Func<System.Type, Azure.Core.Serialization.ObjectSerializer>? GenericTypeSerializerCreator { get { throw null; } set { } }
}
public sealed partial class ModelWriter : System.IDisposable
{
public ModelWriter(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions options) { }
public void Dispose() { }
public System.BinaryData ToBinaryData() { throw null; }
}
public abstract partial class ObjectSerializer
{
protected ObjectSerializer() { }
Expand Down
8 changes: 6 additions & 2 deletions sdk/core/Azure.Core/api/Azure.Core.netcoreapp2.1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Azure.Core.Se
}
public static partial class ModelSerializer
{
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerFormat format) where T : Azure.Core.Serialization.IModelSerializable<T> { throw null; }
Expand Down Expand Up @@ -1187,6 +1185,12 @@ public ModelSerializerOptions(Azure.Core.Serialization.ModelSerializerFormat for
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public System.Func<System.Type, Azure.Core.Serialization.ObjectSerializer>? GenericTypeSerializerCreator { get { throw null; } set { } }
}
public sealed partial class ModelWriter : System.IDisposable
{
public ModelWriter(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions options) { }
public void Dispose() { }
public System.BinaryData ToBinaryData() { throw null; }
}
public abstract partial class ObjectSerializer
{
protected ObjectSerializer() { }
Expand Down
8 changes: 6 additions & 2 deletions sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Azure.Core.Se
}
public static partial class ModelSerializer
{
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static System.BinaryData ConvertToBinaryData(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerFormat format) { throw null; }
public static object Deserialize(System.BinaryData data, System.Type returnType, Azure.Core.Serialization.ModelSerializerOptions? options = null) { throw null; }
public static T Deserialize<T>(System.BinaryData data, Azure.Core.Serialization.ModelSerializerFormat format) where T : Azure.Core.Serialization.IModelSerializable<T> { throw null; }
Expand Down Expand Up @@ -1187,6 +1185,12 @@ public ModelSerializerOptions(Azure.Core.Serialization.ModelSerializerFormat for
public Azure.Core.Serialization.ModelSerializerFormat Format { get { throw null; } }
public System.Func<System.Type, Azure.Core.Serialization.ObjectSerializer>? GenericTypeSerializerCreator { get { throw null; } set { } }
}
public sealed partial class ModelWriter : System.IDisposable
{
public ModelWriter(Azure.Core.Serialization.IModelJsonSerializable<object> model, Azure.Core.Serialization.ModelSerializerOptions options) { }
public void Dispose() { }
public System.BinaryData ToBinaryData() { throw null; }
}
public abstract partial class ObjectSerializer
{
protected ObjectSerializer() { }
Expand Down
10 changes: 2 additions & 8 deletions sdk/core/Azure.Core/perf/Azure.Core.Perf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,10 @@
<PackageReference Include="System.IO.Pipelines" />
</ItemGroup>
<ItemGroup>
<None Update="TestData\AvailabilitySetData.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\ModelXml.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\ResourceProviderData.json">
<None Update="TestData\JsonFormattedString.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\JsonFormattedString.json">
<None Update="..\tests\common\TestData\*.*">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/RequestContents/ModelContent/LargeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Azure.Core.Tests.Public.ResourceManager.Resources;
using Azure.Core.Tests.ResourceManager.Resources;

namespace Azure.Core.Perf.RequestContents.ModelContent
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/RequestContents/ModelContent/SmallModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Azure.Core.Tests.Public.ResourceManager.Compute;
using Azure.Core.Tests.ResourceManager.Compute;

namespace Azure.Core.Perf.RequestContents.ModelContent
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/RequestContents/ModelJsonContent/LargeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Azure.Core.Tests.Public.ResourceManager.Resources;
using Azure.Core.Tests.ResourceManager.Resources;

namespace Azure.Core.Perf.RequestContents.ModelJsonContent
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/RequestContents/ModelJsonContent/SmallModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Azure.Core.Tests.Public.ResourceManager.Compute;
using Azure.Core.Tests.ResourceManager.Compute;

namespace Azure.Core.Perf.RequestContents.ModelJsonContent
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/Serializations/AvailabilitySetDataModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

using System.Text.Json;
using Azure.Core.Tests.Public.ResourceManager.Compute;
using Azure.Core.Tests.ResourceManager.Compute;

namespace Azure.Core.Perf.Serializations
{
Expand Down
6 changes: 3 additions & 3 deletions sdk/core/Azure.Core/perf/Serializations/JsonBenchmark.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Reflection;
using System.Text;
using System.Text.Json;
using Azure.Core.Internal;
using Azure.Core.Serialization;
using Azure.Core.TestFramework;
using BenchmarkDotNet.Attributes;
Expand Down Expand Up @@ -99,9 +98,10 @@ public BinaryData Serialize_ModelSerializer()

[Benchmark]
[BenchmarkCategory("ModelSerializer")]
public BinaryData Serialize_ConvertToBinary()
public BinaryData Serialize_ModelWriter()
{
return ModelSerializer.ConvertToBinaryData(_model, _options);
using var writer = new ModelWriter(_model, _options);
return writer.ToBinaryData();
}

[Benchmark]
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/perf/Serializations/ResourceProviderDataModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.

using System.Text.Json;
using Azure.Core.Tests.Public.ResourceManager.Resources;
using Azure.Core.Tests.ResourceManager.Resources;
using BenchmarkDotNet.Attributes;

namespace Azure.Core.Perf.Serializations
Expand Down
10 changes: 0 additions & 10 deletions sdk/core/Azure.Core/perf/TestData/ModelXml.xml
View file
Open in desktop

This file was deleted.

134 changes: 0 additions & 134 deletions sdk/core/Azure.Core/src/Internal/ModelWriter.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions sdk/core/Azure.Core/src/RequestContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using System.Xml;
using Azure.Core.Buffers;
using Azure.Core.Internal;
using Azure.Core.Serialization;

namespace Azure.Core
Expand Down
Loading