Added generic class for serialization, that can be used in JSON conversion tests.

mjuen · mjuen · commit 5287ded79ab7 · 2020-04-22T13:53:25.000+02:00
diff --git a/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/ConvertTests.cs b/Enum.Ext/Enum.Ext.NewtonsoftJson.Tests/ConvertTests.cs
@@ -11,9 +11,9 @@ public class ConvertTests
         [Test]
         public void Test_ConvertToJsonWithSerializerOptions()
         {
-            var tempClass = new ClassToSerialize
+            var tempClass = new ClassToSerialize<Weekday>
             {
-                Weekday = Weekday.Monday
+                Item = Weekday.Monday
             };
 
             var serializerOptions = new JsonSerializerSettings
@@ -23,7 +23,7 @@ public void Test_ConvertToJsonWithSerializerOptions()
 
             var json = JsonConvert.SerializeObject(tempClass, serializerOptions);
 
-            json.Should().Be("{\"Weekday\":1}");
+            json.Should().Be("{\"Item\":1}");
         }
 
         [Test]
@@ -34,61 +34,51 @@ public void Test_ConvertFromJsonWithSerializerOptions()
                 Converters = { new JsonTypeSafeEnumConverter() }
             };
 
-            var tempClass = JsonConvert.DeserializeObject<ClassToSerialize>("{\"Weekday\":1}", serializerOptions);
+            var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<Weekday>>("{\"Item\":1}", serializerOptions);
 
-            tempClass.Weekday.Should().Be(Weekday.Monday);
+            tempClass.Item.Should().Be(Weekday.Monday);
         }
 
         [Test]
         public void Test_ConvertToJsonWithAnnotation()
         {
-            var tempClass = new ClassToSerializeWithAnnotation
+            var tempClass = new ClassToSerialize<WeekdayWithAnnotation>
             {
-                Weekday = WeekdayWithAnnotation.Monday
+                Item = WeekdayWithAnnotation.Monday
             };
 
             var json = JsonConvert.SerializeObject(tempClass);
 
-            json.Should().Be("{\"Weekday\":1}");
+            json.Should().Be("{\"Item\":1}");
         }
 
         [Test]
         public void Test_ConvertFromJsonWithAnnotation()
         {
-            var tempClass = JsonConvert.DeserializeObject<ClassToSerializeWithAnnotation>("{\"Weekday\":1}");
+            var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":1}");
 
-            tempClass.Weekday.Should().Be(WeekdayWithAnnotation.Monday);
+            tempClass.Item.Should().Be(WeekdayWithAnnotation.Monday);
         }
 
         [Test]
         public void Test_ConvertNullToJsonWithAnnotation()
         {
-            var tempClass = new ClassToSerializeWithAnnotation
+            var tempClass = new ClassToSerialize<WeekdayWithAnnotation>
             {
-                Weekday = null
+                Item = null
             };
 
             var json = JsonConvert.SerializeObject(tempClass);
 
-            json.Should().Be("{\"Weekday\":null}");
+            json.Should().Be("{\"Item\":null}");
         }
 
         [Test]
         public void Test_ConvertToNullFromJsonValueWithAnnotation()
         {
-            var tempClass = JsonConvert.DeserializeObject<ClassToSerializeWithAnnotation>("{\"Weekday\":null}");
+            var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":null}");
 
-            tempClass.Weekday.Should().Be(null);
-        }
-
-        public class ClassToSerialize
-        {
-            public Weekday Weekday { get; set; }
-        }
-
-        public class ClassToSerializeWithAnnotation
-        {
-            public WeekdayWithAnnotation? Weekday { get; set; }
+            tempClass.Item.Should().Be(null);
         }
     }
 }
diff --git a/Enum.Ext/Enum.Ext.SystemTextJson.Tests/ConvertTests.cs b/Enum.Ext/Enum.Ext.SystemTextJson.Tests/ConvertTests.cs
@@ -12,9 +12,9 @@ public class ConvertTests
         [Test]
         public void Test_ConvertToJsonWithSerializerOptions()
         {
-            var tempClass = new ClassToSerialize
+            var tempClass = new ClassToSerialize<Weekday>
             {
-                Weekday = Weekday.Monday
+                Item = Weekday.Monday
             };
 
             var serializerOptions = new JsonSerializerOptions
@@ -24,7 +24,7 @@ public void Test_ConvertToJsonWithSerializerOptions()
 
             var json = JsonSerializer.Serialize(tempClass, serializerOptions);
 
-            json.Should().Be("{\"Weekday\":1}");
+            json.Should().Be("{\"Item\":1}");
         }
 
         [Test]
@@ -35,61 +35,51 @@ public void Test_ConvertFromJsonWithSerializerOptions()
                 Converters = { new JsonTypeSafeEnumConverterFactory() }
             };
 
-            var tempClass = JsonSerializer.Deserialize<ClassToSerialize>("{\"Weekday\":1}", serializerOptions);
+            var tempClass = JsonSerializer.Deserialize<ClassToSerialize<Weekday>>("{\"Item\":1}", serializerOptions);
 
-            tempClass.Weekday.Should().Be(Weekday.Monday);
+            tempClass.Item.Should().Be(Weekday.Monday);
         }
 
         [Test]
         public void Test_ConvertToJsonWithAnnotation()
         {
-            var tempClass = new ClassToSerializeWithAnnotation
+            var tempClass = new ClassToSerialize<WeekdayWithAnnotation>
             {
-                Weekday = WeekdayWithAnnotation.Monday
+                Item = WeekdayWithAnnotation.Monday
             };
 
             var json = JsonSerializer.Serialize(tempClass);
 
-            json.Should().Be("{\"Weekday\":1}");
+            json.Should().Be("{\"Item\":1}");
         }
 
         [Test]
         public void Test_ConvertFromJsonWithAnnotation()
         {
-            var tempClass = JsonSerializer.Deserialize<ClassToSerializeWithAnnotation>("{\"Weekday\":1}");
+            var tempClass = JsonSerializer.Deserialize<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":1}");
 
-            tempClass.Weekday.Should().Be(WeekdayWithAnnotation.Monday);
+            tempClass.Item.Should().Be(WeekdayWithAnnotation.Monday);
         }
 
         [Test]
         public void Test_ConvertNullToJsonWithAnnotation()
         {
-            var tempClass = new ClassToSerializeWithAnnotation
+            var tempClass = new ClassToSerialize<Weekday>
             {
-                Weekday = null
+                Item = null
             };
 
             var json = JsonSerializer.Serialize(tempClass);
 
-            json.Should().Be("{\"Weekday\":null}");
+            json.Should().Be("{\"Item\":null}");
         }
 
         [Test]
         public void Test_ConvertToNullFromJsonValueWithAnnotation()
         {
-            var tempClass = JsonSerializer.Deserialize<ClassToSerializeWithAnnotation>("{\"Weekday\":null}");
+            var tempClass = JsonSerializer.Deserialize<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":null}");
 
-            tempClass.Weekday.Should().Be(null);
-        }
-
-        public class ClassToSerialize
-        {
-            public Weekday Weekday { get; set; }
-        }
-
-        public class ClassToSerializeWithAnnotation
-        {
-            public WeekdayWithAnnotation Weekday { get; set; }
+            tempClass.Item.Should().Be(null);
         }
     }
 }
diff --git a/Enum.Ext/Enum.Ext.SystemTextJson.Tests/WeekdayWithAnnotation.cs b/Enum.Ext/Enum.Ext.SystemTextJson.Tests/WeekdayWithAnnotation.cs
@@ -1,5 +1,4 @@
 ﻿using Enum.Ext.SystemTextJson;
-using Enum.Ext.Tests.Shared;
 
 using System.Text.Json.Serialization;
 
diff --git a/Enum.Ext/Enum.Ext.Tests.Shared/ClassToSerialize.cs b/Enum.Ext/Enum.Ext.Tests.Shared/ClassToSerialize.cs
@@ -0,0 +1,7 @@
+﻿namespace Enum.Ext.Tests.Shared
+{
+    public class ClassToSerialize<T> where T : TypeSafeEnum<T, int>
+    {
+        public T Item { get; set; }
+    }
+}
diff --git a/Enum.Ext/Enum.Ext.Tests/YearlyPriceTests.cs b/Enum.Ext/Enum.Ext.Tests/YearlyPriceTests.cs
@@ -1,8 +1,6 @@
 ﻿using FluentAssertions;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Enum.Ext.Tests
 {

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ public class ConvertTests`
`11`	`11`	`[Test]`
`12`	`12`	`public void Test_ConvertToJsonWithSerializerOptions()`
`13`	`13`	`{`
`14`		`- var tempClass = new ClassToSerialize`
	`14`	`+ var tempClass = new ClassToSerialize<Weekday>`
`15`	`15`	`{`
`16`		`- Weekday = Weekday.Monday`
	`16`	`+ Item = Weekday.Monday`
`17`	`17`	`};`
`18`	`18`
`19`	`19`	`var serializerOptions = new JsonSerializerSettings`
`@@ -23,7 +23,7 @@ public void Test_ConvertToJsonWithSerializerOptions()`
`23`	`23`
`24`	`24`	`var json = JsonConvert.SerializeObject(tempClass, serializerOptions);`
`25`	`25`
`26`		`- json.Should().Be("{\"Weekday\":1}");`
	`26`	`+ json.Should().Be("{\"Item\":1}");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[Test]`
`@@ -34,61 +34,51 @@ public void Test_ConvertFromJsonWithSerializerOptions()`
`34`	`34`	`Converters = { new JsonTypeSafeEnumConverter() }`
`35`	`35`	`};`
`36`	`36`
`37`		`- var tempClass = JsonConvert.DeserializeObject<ClassToSerialize>("{\"Weekday\":1}", serializerOptions);`
	`37`	`+ var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<Weekday>>("{\"Item\":1}", serializerOptions);`
`38`	`38`
`39`		`- tempClass.Weekday.Should().Be(Weekday.Monday);`
	`39`	`+ tempClass.Item.Should().Be(Weekday.Monday);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Test]`
`43`	`43`	`public void Test_ConvertToJsonWithAnnotation()`
`44`	`44`	`{`
`45`		`- var tempClass = new ClassToSerializeWithAnnotation`
	`45`	`+ var tempClass = new ClassToSerialize<WeekdayWithAnnotation>`
`46`	`46`	`{`
`47`		`- Weekday = WeekdayWithAnnotation.Monday`
	`47`	`+ Item = WeekdayWithAnnotation.Monday`
`48`	`48`	`};`
`49`	`49`
`50`	`50`	`var json = JsonConvert.SerializeObject(tempClass);`
`51`	`51`
`52`		`- json.Should().Be("{\"Weekday\":1}");`
	`52`	`+ json.Should().Be("{\"Item\":1}");`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`[Test]`
`56`	`56`	`public void Test_ConvertFromJsonWithAnnotation()`
`57`	`57`	`{`
`58`		`- var tempClass = JsonConvert.DeserializeObject<ClassToSerializeWithAnnotation>("{\"Weekday\":1}");`
	`58`	`+ var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":1}");`
`59`	`59`
`60`		`- tempClass.Weekday.Should().Be(WeekdayWithAnnotation.Monday);`
	`60`	`+ tempClass.Item.Should().Be(WeekdayWithAnnotation.Monday);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`[Test]`
`64`	`64`	`public void Test_ConvertNullToJsonWithAnnotation()`
`65`	`65`	`{`
`66`		`- var tempClass = new ClassToSerializeWithAnnotation`
	`66`	`+ var tempClass = new ClassToSerialize<WeekdayWithAnnotation>`
`67`	`67`	`{`
`68`		`- Weekday = null`
	`68`	`+ Item = null`
`69`	`69`	`};`
`70`	`70`
`71`	`71`	`var json = JsonConvert.SerializeObject(tempClass);`
`72`	`72`
`73`		`- json.Should().Be("{\"Weekday\":null}");`
	`73`	`+ json.Should().Be("{\"Item\":null}");`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`[Test]`
`77`	`77`	`public void Test_ConvertToNullFromJsonValueWithAnnotation()`
`78`	`78`	`{`
`79`		`- var tempClass = JsonConvert.DeserializeObject<ClassToSerializeWithAnnotation>("{\"Weekday\":null}");`
	`79`	`+ var tempClass = JsonConvert.DeserializeObject<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":null}");`
`80`	`80`
`81`		`- tempClass.Weekday.Should().Be(null);`
`82`		`- }`
`83`		`-`
`84`		`- public class ClassToSerialize`
`85`		`- {`
`86`		`- public Weekday Weekday { get; set; }`
`87`		`- }`
`88`		`-`
`89`		`- public class ClassToSerializeWithAnnotation`
`90`		`- {`
`91`		`- public WeekdayWithAnnotation? Weekday { get; set; }`
	`81`	`+ tempClass.Item.Should().Be(null);`
`92`	`82`	`}`
`93`	`83`	`}`
`94`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ public class ConvertTests`
`12`	`12`	`[Test]`
`13`	`13`	`public void Test_ConvertToJsonWithSerializerOptions()`
`14`	`14`	`{`
`15`		`- var tempClass = new ClassToSerialize`
	`15`	`+ var tempClass = new ClassToSerialize<Weekday>`
`16`	`16`	`{`
`17`		`- Weekday = Weekday.Monday`
	`17`	`+ Item = Weekday.Monday`
`18`	`18`	`};`
`19`	`19`
`20`	`20`	`var serializerOptions = new JsonSerializerOptions`
`@@ -24,7 +24,7 @@ public void Test_ConvertToJsonWithSerializerOptions()`
`24`	`24`
`25`	`25`	`var json = JsonSerializer.Serialize(tempClass, serializerOptions);`
`26`	`26`
`27`		`- json.Should().Be("{\"Weekday\":1}");`
	`27`	`+ json.Should().Be("{\"Item\":1}");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`[Test]`
`@@ -35,61 +35,51 @@ public void Test_ConvertFromJsonWithSerializerOptions()`
`35`	`35`	`Converters = { new JsonTypeSafeEnumConverterFactory() }`
`36`	`36`	`};`
`37`	`37`
`38`		`- var tempClass = JsonSerializer.Deserialize<ClassToSerialize>("{\"Weekday\":1}", serializerOptions);`
	`38`	`+ var tempClass = JsonSerializer.Deserialize<ClassToSerialize<Weekday>>("{\"Item\":1}", serializerOptions);`
`39`	`39`
`40`		`- tempClass.Weekday.Should().Be(Weekday.Monday);`
	`40`	`+ tempClass.Item.Should().Be(Weekday.Monday);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`[Test]`
`44`	`44`	`public void Test_ConvertToJsonWithAnnotation()`
`45`	`45`	`{`
`46`		`- var tempClass = new ClassToSerializeWithAnnotation`
	`46`	`+ var tempClass = new ClassToSerialize<WeekdayWithAnnotation>`
`47`	`47`	`{`
`48`		`- Weekday = WeekdayWithAnnotation.Monday`
	`48`	`+ Item = WeekdayWithAnnotation.Monday`
`49`	`49`	`};`
`50`	`50`
`51`	`51`	`var json = JsonSerializer.Serialize(tempClass);`
`52`	`52`
`53`		`- json.Should().Be("{\"Weekday\":1}");`
	`53`	`+ json.Should().Be("{\"Item\":1}");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[Test]`
`57`	`57`	`public void Test_ConvertFromJsonWithAnnotation()`
`58`	`58`	`{`
`59`		`- var tempClass = JsonSerializer.Deserialize<ClassToSerializeWithAnnotation>("{\"Weekday\":1}");`
	`59`	`+ var tempClass = JsonSerializer.Deserialize<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":1}");`
`60`	`60`
`61`		`- tempClass.Weekday.Should().Be(WeekdayWithAnnotation.Monday);`
	`61`	`+ tempClass.Item.Should().Be(WeekdayWithAnnotation.Monday);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`[Test]`
`65`	`65`	`public void Test_ConvertNullToJsonWithAnnotation()`
`66`	`66`	`{`
`67`		`- var tempClass = new ClassToSerializeWithAnnotation`
	`67`	`+ var tempClass = new ClassToSerialize<Weekday>`
`68`	`68`	`{`
`69`		`- Weekday = null`
	`69`	`+ Item = null`
`70`	`70`	`};`
`71`	`71`
`72`	`72`	`var json = JsonSerializer.Serialize(tempClass);`
`73`	`73`
`74`		`- json.Should().Be("{\"Weekday\":null}");`
	`74`	`+ json.Should().Be("{\"Item\":null}");`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`[Test]`
`78`	`78`	`public void Test_ConvertToNullFromJsonValueWithAnnotation()`
`79`	`79`	`{`
`80`		`- var tempClass = JsonSerializer.Deserialize<ClassToSerializeWithAnnotation>("{\"Weekday\":null}");`
	`80`	`+ var tempClass = JsonSerializer.Deserialize<ClassToSerialize<WeekdayWithAnnotation>>("{\"Item\":null}");`
`81`	`81`
`82`		`- tempClass.Weekday.Should().Be(null);`
`83`		`- }`
`84`		`-`
`85`		`- public class ClassToSerialize`
`86`		`- {`
`87`		`- public Weekday Weekday { get; set; }`
`88`		`- }`
`89`		`-`
`90`		`- public class ClassToSerializeWithAnnotation`
`91`		`- {`
`92`		`- public WeekdayWithAnnotation Weekday { get; set; }`
	`82`	`+ tempClass.Item.Should().Be(null);`
`93`	`83`	`}`
`94`	`84`	`}`
`95`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Enum.Ext.SystemTextJson;`
`2`		`-using Enum.Ext.Tests.Shared;`
`3`	`2`
`4`	`3`	`using System.Text.Json.Serialization;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using FluentAssertions;`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using System;`
`4`		`-using System.Collections.Generic;`
`5`		`-using System.Text;`
`6`	`4`
`7`	`5`	`namespace Enum.Ext.Tests`
`8`	`6`	`{`