Skip to content

Commit 71c0016

Browse files
committed
Test serialization using our instance of the serializer
Now that Flurl doesn't use the global serializer, we need to test against the serializer instance used by Flurl
1 parent 74ae883 commit 71c0016

File tree

9 files changed

+34
-34
lines changed

9 files changed

+34
-34
lines changed

src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ServiceOperationFailedException(IEnumerable<ServiceError> errors)
2727
/// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
2828
private ServiceOperationFailedException(SerializationInfo info, StreamingContext context) : base(info, context)
2929
{
30-
Errors = JsonConvert.DeserializeObject<IEnumerable<ServiceError>>(info.GetString("service_errors"));
30+
Errors = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<IEnumerable<ServiceError>>(info.GetString("service_errors"));
3131
}
3232

3333
/// <summary>
@@ -48,7 +48,7 @@ private ServiceOperationFailedException(SerializationInfo info, StreamingContext
4848
public override void GetObjectData(SerializationInfo info, StreamingContext context)
4949
{
5050
// ReSharper disable once ExceptionNotDocumented
51-
info.AddValue("service_errors", JsonConvert.SerializeObject(Errors));
51+
info.AddValue("service_errors", OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(Errors));
5252
base.GetObjectData(info, context);
5353
}
5454
}

src/testing/unit/Compute/v2_1/SecurityGroupTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void DeserializeSecurityGroupRule()
9898
},
9999
'id': '55d75417-37df-48e2-96aa-20ba53a82900'
100100
}}";
101-
var result = JsonConvert.DeserializeObject<SecurityGroupRule>(JObject.Parse(json).ToString());
101+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<SecurityGroupRule>(JObject.Parse(json).ToString());
102102
Assert.Equal("0.0.0.0 / 24", result.CIDR);
103103
}
104104

src/testing/unit/ContentDeliveryNetworks/v1/ServiceCacheTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void SerializeTimeToLiveToSeconds()
1212
{
1313
var cache = new ServiceCache("cache", TimeSpan.FromSeconds(60));
1414

15-
var json = JsonConvert.SerializeObject(cache);
15+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(cache);
1616

1717
var result = JObject.Parse(json);
1818
Assert.Equal(60, result.Value<double>("ttl"));
@@ -22,9 +22,9 @@ public void SerializeTimeToLiveToSeconds()
2222
public void DeserializeTimeToLiveFromSeconds()
2323
{
2424
var cache = new ServiceCache("cache", TimeSpan.FromSeconds(60));
25-
var json = JsonConvert.SerializeObject(cache);
25+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(cache);
2626

27-
var result = JsonConvert.DeserializeObject<ServiceCache>(json);
27+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ServiceCache>(json);
2828

2929
Assert.Equal(60, result.TimeToLive.TotalSeconds);
3030
}

src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public void SerializeServiceCollection()
3232
Items = {new Service {Id = "service-id"}},
3333
Links = {new PageLink("next", "http://api.com/next")}
3434
};
35-
string json = JsonConvert.SerializeObject(services, Formatting.None);
35+
string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(services, Formatting.None);
3636
Assert.Contains("\"services\"", json);
3737
Assert.DoesNotContain("\"service\"", json);
3838

39-
var result = JsonConvert.DeserializeObject<ServiceCollection>(json);
39+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ServiceCollection>(json);
4040
Assert.NotNull(result);
4141
Assert.Equal(1, result.Count());
4242
Assert.Equal(1, result.Items.Count());
@@ -48,9 +48,9 @@ public void SerializeServiceCollection()
4848
public void SerializePageLink()
4949
{
5050
var link = new PageLink("next", "http://api.com/next");
51-
string json = JsonConvert.SerializeObject(link, Formatting.None);
51+
string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(link, Formatting.None);
5252

53-
var result = JsonConvert.DeserializeObject<PageLink>(json);
53+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<PageLink>(json);
5454
Assert.NotNull(result);
5555
Assert.True(result.IsNextPage);
5656
}

src/testing/unit/IdentifierTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void Serialize()
1717
var rawId = Guid.NewGuid();
1818
var id = (Identifier)rawId;
1919

20-
var result = JsonConvert.SerializeObject(id);
20+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(id);
2121

2222
Assert.Equal(string.Format("\"{0}\"", rawId.ToString("D")), result);
2323
}
@@ -27,7 +27,7 @@ public void Serialize_WithinAClass()
2727
{
2828
var thing = new Thing {Id = Guid.NewGuid()};
2929

30-
var result = JsonConvert.SerializeObject(thing, Formatting.None);
30+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing, Formatting.None);
3131

3232
Assert.Equal(string.Format("{{\"Id\":\"{0}\"}}", thing.Id), result);
3333
}
@@ -37,8 +37,8 @@ public void Deserialize()
3737
{
3838
var id = new Identifier(Guid.NewGuid());
3939

40-
var json = JsonConvert.SerializeObject(id);
41-
var result = JsonConvert.DeserializeObject<Identifier>(json);
40+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(id);
41+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Identifier>(json);
4242

4343
Assert.Equal(id, result);
4444
}

src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void Serialize()
1818
{"b", "things"}
1919
};
2020

21-
string result = JsonConvert.SerializeObject(options, Formatting.None, new DHCPOptionsConverter());
21+
string result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(options, Formatting.None, new DHCPOptionsConverter());
2222

2323
string expectedJson = JArray.Parse("[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]").ToString(Formatting.None);
2424
Assert.Equal(expectedJson, result);
@@ -29,7 +29,7 @@ public void Deserialize()
2929
{
3030
string json = JArray.Parse("[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]").ToString(Formatting.None);
3131

32-
var result = JsonConvert.DeserializeObject<Dictionary<string, string>>(json, new DHCPOptionsConverter());
32+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Dictionary<string, string>>(json, new DHCPOptionsConverter());
3333

3434
Assert.NotNull(result);
3535
Assert.Equal(2, result.Count);
@@ -53,8 +53,8 @@ public void OpenStackNet_UsesDHCPOptionConverter()
5353
}
5454
};
5555

56-
var json = JsonConvert.SerializeObject(port);
57-
var result = JsonConvert.DeserializeObject<Port>(json);
56+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(port);
57+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Port>(json);
5858

5959
Assert.NotNull(result.DHCPOptions);
6060
Assert.Equal(1, result.DHCPOptions.Count);

src/testing/unit/Serialization/EmptyEnumerableTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public void WhenDeserializingNullCollection_ItShouldUseAnEmptyCollection()
2222
{
2323
OpenStackNet.Configure();
2424
var thing = new ExampleThing{Messages = null};
25-
string json = JsonConvert.SerializeObject(thing);
25+
string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing);
2626
Assert.DoesNotContain("messages", json);
2727

28-
var result = JsonConvert.DeserializeObject<ExampleThing>(json);
28+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ExampleThing>(json);
2929

3030
Assert.NotNull(result.Messages);
3131
Assert.Empty(result.Messages);
@@ -37,7 +37,7 @@ public void WhenSerializingEmptyCollection_ItShouldBeIgnored()
3737
OpenStackNet.Configure();
3838
var thing = new ExampleThing { Messages = new List<string>() };
3939

40-
string json = JsonConvert.SerializeObject(thing);
40+
string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing);
4141

4242
Assert.DoesNotContain("messages", json);
4343
}

src/testing/unit/Serialization/RootWrapperConverterTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public RootWrapperConverterTests()
2828
[Fact]
2929
public void Serialize()
3030
{
31-
var json = JsonConvert.SerializeObject(new Thing());
31+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new Thing());
3232

3333
var jsonObj = JObject.Parse(json);
3434
JProperty rootProperty = jsonObj.Properties().FirstOrDefault();
@@ -39,23 +39,23 @@ public void Serialize()
3939
[Fact]
4040
public void Deserialize()
4141
{
42-
var json = JsonConvert.SerializeObject(new Thing {Id = "thing-id"});
43-
var thing = JsonConvert.DeserializeObject<Thing>(json);
42+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new Thing {Id = "thing-id"});
43+
var thing = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Thing>(json);
4444
Assert.Equal("thing-id", thing.Id);
4545
}
4646

4747
[Fact]
4848
public void SerializeWhenNotRoot()
4949
{
50-
var json = JsonConvert.SerializeObject(new List<Thing>{ new Thing() });
50+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new List<Thing>{ new Thing() });
5151

5252
Assert.DoesNotContain("\"thing\"", json);
5353
}
5454

5555
[Fact]
5656
public void SerializeWhenNested()
5757
{
58-
var json = JsonConvert.SerializeObject(new ThingCollection { new Thing() });
58+
var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new ThingCollection { new Thing() });
5959

6060
Assert.DoesNotContain("\"thing\"", json);
6161
}
@@ -64,7 +64,7 @@ public void SerializeWhenNested()
6464
public void DeserializeWhenNotRoot()
6565
{
6666
var json = JArray.Parse("[{'id':'thing-id'}]").ToString();
67-
var things = JsonConvert.DeserializeObject<List<Thing>>(json);
67+
var things = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<List<Thing>>(json);
6868
Assert.Equal(1, things.Count);
6969
Assert.Equal("thing-id", things[0].Id);
7070
}
@@ -73,7 +73,7 @@ public void DeserializeWhenNotRoot()
7373
public void DeserializeWhenNested()
7474
{
7575
var json = JObject.Parse("{'things':[{'id':'thing-id'}]}").ToString();
76-
var things = JsonConvert.DeserializeObject<ThingCollection>(json);
76+
var things = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ThingCollection>(json);
7777
Assert.NotNull(things);
7878
Assert.Equal(1, things.Count);
7979
Assert.Equal("thing-id", things[0].Id);
@@ -83,7 +83,7 @@ public void DeserializeWhenNested()
8383
public void ShouldIgnoreUnexpectedRootProperties()
8484
{
8585
var json = JObject.Parse("{'links': [{'name': 'next', 'link': 'http://nextlink'}], 'thing': {'id': 'thing-id'}}").ToString();
86-
var thing = JsonConvert.DeserializeObject<Thing>(json);
86+
var thing = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Thing>(json);
8787
Assert.NotNull(thing);
8888
Assert.Equal("thing-id", thing.Id);
8989
}

src/testing/unit/Serialization/TolerantEnumConverterTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,39 +25,39 @@ enum StuffStatus
2525
[Fact]
2626
public void WhenValueIsRecognized_MatchToValue()
2727
{
28-
var result = JsonConvert.DeserializeObject<ThingStatus>("\"ACTIVE\"");
28+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ThingStatus>("\"ACTIVE\"");
2929

3030
Assert.Equal(ThingStatus.Active, result);
3131
}
3232

3333
[Fact]
3434
public void WhenAttributedValueIsRecognized_MatchToValue()
3535
{
36-
var result = JsonConvert.DeserializeObject<ThingStatus>("\"REMOVE_FAILED\"");
36+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ThingStatus>("\"REMOVE_FAILED\"");
3737

3838
Assert.Equal(ThingStatus.RemoveFailed, result);
3939
}
4040

4141
[Fact]
4242
public void WhenValueIsUnrecognized_MatchToUnknownValue()
4343
{
44-
var result = JsonConvert.DeserializeObject<ThingStatus>("\"bad-enum-value\"");
44+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<ThingStatus>("\"bad-enum-value\"");
4545

4646
Assert.Equal(ThingStatus.Unknown, result);
4747
}
4848

4949
[Fact]
5050
public void WhenValueIsUnrecognized_AndUnknownIsNotPresent_MatchToFirstValue()
5151
{
52-
var result = JsonConvert.DeserializeObject<StuffStatus>("\"bad-enum-value\"");
52+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<StuffStatus>("\"bad-enum-value\"");
5353

5454
Assert.Equal(StuffStatus.Missing, result);
5555
}
5656

5757
[Fact]
5858
public void WhenValueIsUnrecognized_AndDestinationIsNullable_UseNull()
5959
{
60-
var result = JsonConvert.DeserializeObject<StuffStatus?>("\"bad-enum-value\"");
60+
var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<StuffStatus?>("\"bad-enum-value\"");
6161

6262
Assert.Null(result);
6363
}

0 commit comments

Comments
 (0)