Skip to content

Commit 6d78733

Browse files
committed
refactor
1 parent 9ca39e2 commit 6d78733

File tree

1 file changed

+11
-44
lines changed

1 file changed

+11
-44
lines changed

RestSharp.Tests/JsonTests.cs

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,7 @@ public void Ignore_ReadOnly_Property_That_Exists_In_Data()
425425
[Fact]
426426
public void Can_Deserialize_TimeSpan()
427427
{
428-
var doc = File.ReadAllText(Path.Combine("SampleData", "timespans.txt"));
429-
var d = new JsonDeserializer();
430-
var response = new RestResponse { Content = doc };
431-
var payload = d.Deserialize<TimeSpanTestStructure>(response);
428+
var payload = GetPayLoad<TimeSpanTestStructure>("timespans.txt");
432429

433430
Assert.Equal(new TimeSpan(468006), payload.Tick);
434431
Assert.Equal(new TimeSpan(0, 0, 0, 0, 125), payload.Millisecond);
@@ -465,10 +462,7 @@ public void Can_Deserialize_Unix_Json_Dates()
465462
[Fact]
466463
public void Can_Deserialize_JsonNet_Dates()
467464
{
468-
var doc = File.ReadAllText(Path.Combine("SampleData", "person.json.txt"));
469-
var d = new JsonDeserializer();
470-
var response = new RestResponse { Content = doc };
471-
var person = d.Deserialize<PersonForJson>(response);
465+
var person = GetPayLoad<PersonForJson>("person.json.txt");
472466

473467
Assert.Equal(
474468
new DateTime(2011, 6, 30, 8, 15, 46, DateTimeKind.Utc).ToString("u"),
@@ -478,10 +472,7 @@ public void Can_Deserialize_JsonNet_Dates()
478472
[Fact]
479473
public void Can_Deserialize_DateTime()
480474
{
481-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
482-
var d = new JsonDeserializer();
483-
var response = new RestResponse { Content = doc };
484-
var payload = d.Deserialize<DateTimeTestStructure>(response);
475+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
485476

486477
Assert.Equal(
487478
new DateTime(2011, 6, 30, 8, 15, 46, DateTimeKind.Utc).ToString("u"),
@@ -491,10 +482,7 @@ public void Can_Deserialize_DateTime()
491482
[Fact]
492483
public void Can_Deserialize_Nullable_DateTime_With_Value()
493484
{
494-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
495-
var d = new JsonDeserializer();
496-
var response = new RestResponse { Content = doc };
497-
var payload = d.Deserialize<DateTimeTestStructure>(response);
485+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
498486

499487
Assert.NotNull(payload.NullableDateTimeWithValue);
500488
Assert.Equal(
@@ -505,21 +493,15 @@ public void Can_Deserialize_Nullable_DateTime_With_Value()
505493
[Fact]
506494
public void Can_Deserialize_Nullable_DateTime_With_Null()
507495
{
508-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
509-
var d = new JsonDeserializer();
510-
var response = new RestResponse { Content = doc };
511-
var payload = d.Deserialize<DateTimeTestStructure>(response);
496+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
512497

513498
Assert.Null(payload.NullableDateTimeWithNull);
514499
}
515500

516501
[Fact]
517502
public void Can_Deserialize_DateTimeOffset()
518503
{
519-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
520-
var d = new JsonDeserializer();
521-
var response = new RestResponse { Content = doc };
522-
var payload = d.Deserialize<DateTimeTestStructure>(response);
504+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
523505

524506
Assert.Equal(
525507
new DateTime(2011, 6, 30, 8, 15, 46, DateTimeKind.Utc).ToString("u"),
@@ -529,10 +511,7 @@ public void Can_Deserialize_DateTimeOffset()
529511
[Fact]
530512
public void Can_Deserialize_Iso8601DateTimeLocal()
531513
{
532-
var doc = File.ReadAllText(Path.Combine("SampleData", "iso8601datetimes.txt"));
533-
var d = new JsonDeserializer();
534-
var response = new RestResponse { Content = doc };
535-
var payload = d.Deserialize<Iso8601DateTimeTestStructure>(response);
514+
var payload = GetPayLoad<Iso8601DateTimeTestStructure>("iso8601datetimes.txt");
536515

537516
Assert.Equal(
538517
new DateTime(2012, 7, 19, 10, 23, 25, DateTimeKind.Utc).ToString("u"),
@@ -542,10 +521,7 @@ public void Can_Deserialize_Iso8601DateTimeLocal()
542521
[Fact]
543522
public void Can_Deserialize_Iso8601DateTimeZulu()
544523
{
545-
var doc = File.ReadAllText(Path.Combine("SampleData", "iso8601datetimes.txt"));
546-
var d = new JsonDeserializer();
547-
var response = new RestResponse { Content = doc };
548-
var payload = d.Deserialize<Iso8601DateTimeTestStructure>(response);
524+
var payload = GetPayLoad<Iso8601DateTimeTestStructure>("iso8601datetimes.txt");
549525

550526
Assert.Equal(
551527
new DateTime(2012, 7, 19, 10, 23, 25, DateTimeKind.Utc).ToString("u"),
@@ -555,10 +531,7 @@ public void Can_Deserialize_Iso8601DateTimeZulu()
555531
[Fact]
556532
public void Can_Deserialize_Iso8601DateTimeWithOffset()
557533
{
558-
var doc = File.ReadAllText(Path.Combine("SampleData", "iso8601datetimes.txt"));
559-
var d = new JsonDeserializer();
560-
var response = new RestResponse { Content = doc };
561-
var payload = d.Deserialize<Iso8601DateTimeTestStructure>(response);
534+
var payload = GetPayLoad<Iso8601DateTimeTestStructure>("iso8601datetimes.txt");
562535

563536
Assert.Equal(
564537
new DateTime(2012, 7, 19, 10, 23, 25, DateTimeKind.Utc).ToString("u"),
@@ -568,10 +541,7 @@ public void Can_Deserialize_Iso8601DateTimeWithOffset()
568541
[Fact]
569542
public void Can_Deserialize_Nullable_DateTimeOffset_With_Value()
570543
{
571-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
572-
var d = new JsonDeserializer();
573-
var response = new RestResponse { Content = doc };
574-
var payload = d.Deserialize<DateTimeTestStructure>(response);
544+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
575545

576546
Assert.NotNull(payload.NullableDateTimeOffsetWithValue);
577547
Assert.Equal(
@@ -582,10 +552,7 @@ public void Can_Deserialize_Nullable_DateTimeOffset_With_Value()
582552
[Fact]
583553
public void Can_Deserialize_Nullable_DateTimeOffset_With_Null()
584554
{
585-
var doc = File.ReadAllText(Path.Combine("SampleData", "datetimes.txt"));
586-
var d = new JsonDeserializer();
587-
var response = new RestResponse { Content = doc };
588-
var payload = d.Deserialize<DateTimeTestStructure>(response);
555+
var payload = GetPayLoad<DateTimeTestStructure>("datetimes.txt");
589556

590557
Assert.Null(payload.NullableDateTimeOffsetWithNull);
591558
}

0 commit comments

Comments
 (0)