Skip to content

Improving test run #1663

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
merged 10 commits into from
Dec 15, 2021
Merged

Improving test run #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c475daa
Improving test run
alexeyzimarev Dec 14, 2021
0b33d75
Use custom TaskFactory
alexeyzimarev Dec 14, 2021
1fc6821
Fixing warnings
alexeyzimarev Dec 14, 2021
08ff3c6
Fixing more warnings
alexeyzimarev Dec 14, 2021
a184eca
Moved XML serializer out
alexeyzimarev Dec 14, 2021
dc1babd
Use non-default XML serializer
alexeyzimarev Dec 14, 2021
88aad95
Added a guard against using content type with no body
alexeyzimarev Dec 14, 2021
38d54cf
Use Xml serializer in tests where it should be used
alexeyzimarev Dec 14, 2021
f8f890d
Removed unused and breaking ref
alexeyzimarev Dec 14, 2021
98cb2c8
Remove the Formatting assembly reference
alexeyzimarev Dec 15, 2021
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
33 changes: 33 additions & 0 deletions RestSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.InteractiveTests"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Serializers.Xml.Tests", "test\RestSharp.Serializers.Xml.Tests\RestSharp.Serializers.Xml.Tests.csproj", "{E6D94C12-9AD7-46E6-AB62-3676F25FDE51}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Serializers.Xml", "src\RestSharp.Serializers.Xml\RestSharp.Serializers.Xml.csproj", "{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug.Appveyor|Any CPU = Debug.Appveyor|Any CPU
Expand Down Expand Up @@ -316,6 +318,36 @@ Global
{E6D94C12-9AD7-46E6-AB62-3676F25FDE51}.Release|x64.Build.0 = Release|Any CPU
{E6D94C12-9AD7-46E6-AB62-3676F25FDE51}.Release|x86.ActiveCfg = Release|Any CPU
{E6D94C12-9AD7-46E6-AB62-3676F25FDE51}.Release|x86.Build.0 = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|Any CPU.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|ARM.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|x64.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|x64.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug.Appveyor|x86.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|ARM.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|x64.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|x64.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|x86.ActiveCfg = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Debug|x86.Build.0 = Debug|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|Any CPU.Build.0 = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|ARM.ActiveCfg = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|ARM.Build.0 = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|x64.ActiveCfg = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|x64.Build.0 = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|x86.ActiveCfg = Release|Any CPU
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -332,5 +364,6 @@ Global
{997AEFE5-D7D4-4033-A31A-07F476D6FE5D} = {1C42C435-8826-4044-8775-A1DA40EF4866}
{6D7D1D60-4473-4C52-800C-9B892C6640A5} = {9051DDA0-E563-45D5-9504-085EBAACF469}
{E6D94C12-9AD7-46E6-AB62-3676F25FDE51} = {9051DDA0-E563-45D5-9504-085EBAACF469}
{4A35B1C5-520D-4267-BA70-2DCEAC0A5662} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
EndGlobalSection
EndGlobal
2 changes: 2 additions & 0 deletions src/RestSharp.Serializers.NewtonsoftJson/JsonNetSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public class JsonNetSerializer : IRestSerializer {
public string? Serialize(Parameter bodyParameter) => Serialize(bodyParameter.Value);

public T? Deserialize<T>(RestResponse response) {
if (response.Content == null)
throw new DeserializationException(response, new InvalidOperationException("Response content is null"));
using var reader = new JsonTextReader(new StringReader(response.Content)) { CloseInput = true };

return _serializer.Deserialize<T>(reader);
Expand Down
2 changes: 1 addition & 1 deletion src/RestSharp.Serializers.NewtonsoftJson/RestSharp.Serializers.NewtonsoftJson.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[12.0,)" />
<PackageReference Include="Newtonsoft.Json" Version="[12.0.1,)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RestSharp\RestSharp.csproj" />
Expand Down
5 changes: 3 additions & 2 deletions ...arp/Serializers/DeserializeAsAttribute.cs → ...Serializers.Xml/DeserializeAsAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace RestSharp.Serializers;
// ReSharper disable once CheckNamespace
namespace RestSharp.Serializers;

/// <summary>
/// Allows control how class and property names and values are deserialized by XmlAttributeDeserializer
Expand All @@ -8,7 +9,7 @@ public sealed class DeserializeAsAttribute : Attribute {
/// <summary>
/// The name to use for the serialized element
/// </summary>
public string Name { get; set; }
public string? Name { get; set; }

/// <summary>
/// Sets if the property to Deserialize is an Attribute or Element (Default: false)
Expand Down
11 changes: 11 additions & 0 deletions src/RestSharp.Serializers.Xml/RestSharp.Serializers.Xml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>RestSharp.Serializers.Xml</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\RestSharp\RestSharp.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions ...Sharp/Serializers/SerializeAsAttribute.cs → ...p.Serializers.Xml/SerializeAsAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Globalization;
using RestSharp.Extensions;

// ReSharper disable once CheckNamespace
namespace RestSharp.Serializers;

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions ...rializers/Xml/XmlAttributeDeserializer.cs → ...rializers.Xml/XmlAttributeDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace RestSharp.Serializers.Xml;

public class XmlAttributeDeserializer : XmlDeserializer {
protected override object? GetValueFromXml(XElement root, XName name, PropertyInfo prop, bool useExactName) {
protected override object? GetValueFromXml(XElement? root, XName? name, PropertyInfo prop, bool useExactName) {
var isAttribute = false;

//Check for the DeserializeAs attribute on the property
Expand All @@ -18,7 +18,7 @@ public class XmlAttributeDeserializer : XmlDeserializer {

if (!isAttribute) return base.GetValueFromXml(root, name, prop, useExactName);

var attributeVal = GetAttributeByName(root, name, useExactName);
var attributeVal = GetAttributeByName(root!, name!, useExactName);

return attributeVal?.Value ?? base.GetValueFromXml(root, name, prop, useExactName);
}
Expand Down
Loading