7.0 upgrade

T-rav · T-rav · commit e80ba65afc26 · 2024-01-05T12:37:48.000-07:00
diff --git a/source/StoneAge.System.Utils.Tests/Async/ParallelForEachAsyncTests.cs b/source/StoneAge.System.Utils.Tests/Async/ParallelForEachAsyncTests.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using StoneAge.System.Utils.Async;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -16,13 +17,13 @@ public class ParallelForEachAsyncTests
         public async Task Should_Iterate_Collection()
         {
             // arrange
-            var result = new List<int>();
+            var result = new ConcurrentBag<int>();
             var input = Enumerable.Range(1, 20);
             // act
             await input.ForEachAsync(async x =>
             {
                 result.Add(x + 1);
-                Thread.Sleep(10000);
+                await Task.Delay(10);
             }, 2);
             // assert
             result.Count().Should().Be(20);
@@ -38,6 +39,7 @@ public async Task When_Empty_List_Should_Do_Nothing()
             await input.ForEachAsync(async x =>
             {
                 result.Add(x + 1);
+                await Task.Delay(10);
             }, 2);
             // assert
             result.Count().Should().Be(0);
diff --git a/source/StoneAge.System.Utils.Tests/Json/JsonExtensionsTests.cs b/source/StoneAge.System.Utils.Tests/Json/JsonExtensionsTests.cs
@@ -1,4 +1,5 @@
-﻿using NUnit.Framework;
+﻿using FluentAssertions;
+using NUnit.Framework;
 using StoneAge.System.Utils.Json;
 
 namespace StoneAge.System.Utils.Tests.Json
@@ -14,8 +15,8 @@ public void TryDeserialize_WhenPopulatedParsableModel_ShouldReturnTrue()
             //---------------Execute Test ----------------------
             var result = model.TryDeserialize<TestObject>();
             //---------------Test Result -----------------------
-            Assert.IsTrue(result.IsValid);
-            Assert.IsNotNull(result.Model);
+            result.IsValid.Should().BeTrue();
+            result.Model.Should().NotBeNull();
         }
 
         [Test]
@@ -26,8 +27,8 @@ public void TryDeserialize_WhenEmptyParsableModel_ShouldReturnTrue()
             //---------------Execute Test ----------------------
             var result = model.TryDeserialize<TestObject>();
             //---------------Test Result -----------------------
-            Assert.IsTrue(result.IsValid);
-            Assert.IsNotNull(result.Model);
+            result.IsValid.Should().BeTrue();
+            result.Model.Should().NotBeNull();
         }
 
         [Test]
@@ -38,8 +39,8 @@ public void TryDeserialize_WhenNotParsableModel_ShouldReturnFalse()
             //---------------Execute Test ----------------------
             var result = model.TryDeserialize<TestObject>();
             //---------------Test Result -----------------------
-            Assert.IsFalse(result.IsValid);
-            Assert.IsNull(result.Model);
+            result.IsValid.Should().BeFalse();
+            result.Model.Should().BeNull();
         }
 
         [Test]
@@ -55,7 +56,7 @@ public void Serialize_WhenObjectContainTitleCaseProperties_ShouldReturnCamelcase
             //---------------Execute Test ----------------------
             var result = input.Serialize();
             //---------------Test Result -----------------------
-            Assert.AreEqual(expected, result);
+            result.Should().Be(expected);
         }
 
         [Test]
@@ -71,7 +72,7 @@ public void Serialize_WhenObjectContainTitleCaseProperties_ShouldReturnLowerCase
             //---------------Execute Test ----------------------
             var result = input.Serialize_With_LowerCase_Settings();
             //---------------Test Result -----------------------
-            Assert.AreEqual(expected, result);
+            result.Should().Be(expected);
         }
 
         [Test]
@@ -82,8 +83,8 @@ public void Deserialize_WhenObjectContainTitleCaseProperties_ShouldReturnCamelca
             //---------------Execute Test ----------------------
             var result = input.Deserialize<TestObject>();
             //---------------Test Result -----------------------
-            Assert.AreEqual(1, result.Foo);
-            Assert.AreEqual("bar", result.MagicProperty);
+            result.Foo.Should().Be(1);
+            result.MagicProperty.Should().Be("bar");
         }
 
     }
diff --git a/source/StoneAge.System.Utils.Tests/List/ListExtensionsTests.cs b/source/StoneAge.System.Utils.Tests/List/ListExtensionsTests.cs
@@ -1,6 +1,5 @@
 ﻿using FluentAssertions;
 using NUnit.Framework;
-using StoneAge.System.Utils.Json;
 using System.Linq;
 
 namespace StoneAge.System.Utils.Tests.Json
diff --git a/source/StoneAge.System.Utils.Tests/StoneAge.System.Utils.Tests.csproj b/source/StoneAge.System.Utils.Tests/StoneAge.System.Utils.Tests.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/StoneAge.System.Utils.Tests/Time/UtcNowTests.cs b/source/StoneAge.System.Utils.Tests/Time/UtcNowTests.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using FluentAssertions;
 using NUnit.Framework;
 using StoneAge.System.Utils.Time;
 
@@ -16,7 +17,8 @@ public void Now_ShouldReturnUtcOffsetTime()
             var actual = sut.Now();
             //---------------Assert-----------------------
             var expected = DateTime.Now.ToUniversalTime();
-            Assert.AreEqual(expected.ToString("yyyy-MM-dd hh:mm:ss"), actual.ToString("yyyy-MM-dd hh:mm:ss"));
+            actual.ToString("yyyy-MM-dd hh:mm:ss").Should().Be(expected.ToString("yyyy-MM-dd hh:mm:ss"));
+
         }
     }
 }
diff --git a/source/StoneAge.System.Utils/StoneAge.System.Utils.csproj b/source/StoneAge.System.Utils/StoneAge.System.Utils.csproj
@@ -1,22 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageId>StoneAge.System.Utils.DotNetCore</PackageId>
     <Authors>Travis Frisinger</Authors>
     <Company>StoneAge Technologies</Company>
     <Product>StoneAge.System.Utils.DotNetCore</Product>
     <Description>Some useful utilities for JSON parsing, email validation, time and object property hashing, and object property copying</Description>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/StoneAgeTechnologies/System.Util.DotNetCore</PackageProjectUrl>
-    <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <FileVersion>5.0.0.0</FileVersion>
-    <Version>5.0.0</Version>
+    <AssemblyVersion>7.0.0.0</AssemblyVersion>
+    <FileVersion>7.0.0.0</FileVersion>
+    <Version>7.0.0</Version>
     <PackageReleaseNotes>Restored parallelization</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using FluentAssertions;`
`2`	`3`	`using NUnit.Framework;`
`3`	`4`	`using StoneAge.System.Utils.Time;`
`4`	`5`
`@@ -16,7 +17,8 @@ public void Now_ShouldReturnUtcOffsetTime()`
`16`	`17`	`var actual = sut.Now();`
`17`	`18`	`//---------------Assert-----------------------`
`18`	`19`	`var expected = DateTime.Now.ToUniversalTime();`
`19`		`- Assert.AreEqual(expected.ToString("yyyy-MM-dd hh:mm:ss"), actual.ToString("yyyy-MM-dd hh:mm:ss"));`
	`20`	`+ actual.ToString("yyyy-MM-dd hh:mm:ss").Should().Be(expected.ToString("yyyy-MM-dd hh:mm:ss"));`
	`21`	`+`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`	`}`