Skip to content

Avoid odd test failures #109

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 1 commit into from
Nov 28, 2017
Merged

Avoid odd test failures #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions test/System.Net.Http.Formatting.Test/Formatting/DataContractJsonMediaTypeFormatterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public async Task ReadFromStreamAsync_RoundTripsWriteToStreamAsync_KnownTypes(Ty
}
}

#if !NETCOREAPP2_0 // DBNull not serializable on .NET Core 2.0.
// Test alternate null value
[Fact]
public async Task ReadFromStreamAsync_RoundTripsWriteToStreamAsync_DBNull()
Expand Down Expand Up @@ -187,6 +188,7 @@ public async Task ReadFromStreamAsync_RoundTripsWriteToStreamAsync_DBNullAsEmpty
// Lower levels convert DBNull.Value to empty string on read
Assert.Equal(String.Empty, readObj);
}
#endif

[Fact]
public async Task UseDataContractJsonSerializer_Default()
Expand Down
19 changes: 17 additions & 2 deletions test/System.Net.Http.Formatting.Test/Formatting/XmlMediaTypeFormatterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,23 @@ public class XmlMediaTypeFormatterTests : MediaTypeFormatterTestBase<XmlMediaTyp
// sample only; avoids types DataContractJsonSerializer fails to round trip (e.g. Guid, Uint16). May require
// known types or similar (de)serializer configuration.
public static readonly RefTypeTestData<object> BunchOfTypedObjectsTestData = new RefTypeTestData<object>(
() => new List<object> { null, String.Empty, "This is a string", false, true, Double.MinValue,
Double.MaxValue, Int32.MinValue, Int32.MaxValue, Int64.MinValue, Int64.MaxValue, DBNull.Value, });
() => new List<object>
{
null,
String.Empty,
"This is a string",
false,
true,
Double.MinValue,
Double.MaxValue,
Int32.MinValue,
Int32.MaxValue,
Int64.MinValue,
Int64.MaxValue,
#if !NETCOREAPP2_0 // DBNull not serializable on .NET Core 2.0.
DBNull.Value,
#endif
});

public static IEnumerable<TestData> BunchOfTypedObjectsTestDataCollection
{
Expand Down