Merge pull request #48 from mpekurny/master

Upgrade to support .NET 9 and remove support for .NET 6 & 7
getgauge · Nov 26, 2024 · c95efbc · c95efbc
2 parents 1efbe80 + f28511d
commit c95efbc
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 121 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: Build with dotnet on windows
       if: matrix.os == 'windows-latest'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: build package
         run: ./build.sh package

diff --git a/Gauge.CSharp.Lib.UnitTests/Attribute/FilteredHookAttributeTests.cs b/Gauge.CSharp.Lib.UnitTests/Attribute/FilteredHookAttributeTests.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using Gauge.CSharp.Lib.Attribute;
-using NUnit.Framework;
+using Gauge.CSharp.Lib.Attribute;
 
 namespace Gauge.CSharp.Lib.UnitTests.Attribute
 {
@@ -25,26 +23,26 @@ public TestHookAttribute(params string[] filterTags) : base(filterTags)
         [Test]
         public void ShouldCreateAttributeWithMultipleTags()
         {
-            var filterTags = new[] {"foo", "bar"};
+            var filterTags = new[] { "foo", "bar" };
             var filteredHookAttribute = new TestHookAttribute(filterTags);
 
             foreach (var filterTag in filterTags)
-                Assert.IsTrue(filteredHookAttribute.FilterTags.Contains(filterTag));
+                Assert.That(filteredHookAttribute.FilterTags, Does.Contain(filterTag));
         }
 
         [Test]
         public void ShouldCreateAttributeWithNoParameters()
         {
             var filteredHookAttribute = new TestHookAttribute();
-            Assert.IsNotNull(filteredHookAttribute);
+            Assert.That(filteredHookAttribute, Is.Not.Null);
         }
 
         [Test]
         public void ShouldCreateAttributeWithOneTag()
         {
             var filterTag = "foo";
             var filteredHookAttribute = new TestHookAttribute(filterTag);
-            Assert.IsTrue(filteredHookAttribute.FilterTags.Contains(filterTag));
+            Assert.That(filteredHookAttribute.FilterTags, Does.Contain(filterTag));
         }
     }
 }
diff --git a/Gauge.CSharp.Lib.UnitTests/DataStoreFactoryTests.cs b/Gauge.CSharp.Lib.UnitTests/DataStoreFactoryTests.cs
@@ -18,7 +18,7 @@ public void Setup()
     public void AddDataStore_ShouldSetTheSuiteDataStore_WhenCalledForSuiteDataStoreType()
     {
         DataStoreFactory.AddDataStore(1, DataStoreType.Suite);
-        Assert.IsNotNull(DataStoreFactory.SuiteDataStore);
+        Assert.That(DataStoreFactory.SuiteDataStore, Is.Not.Null);
     }
 
     [Test]
@@ -27,21 +27,21 @@ public void AddDataStore_ShouldNotOverwriteTheSuiteDataStore_WhenCalledForSuiteD
         DataStoreFactory.AddDataStore(1, DataStoreType.Suite);
         var dataStore = DataStoreFactory.SuiteDataStore;
         DataStoreFactory.AddDataStore(1, DataStoreType.Suite);
-        Assert.AreSame(dataStore, DataStoreFactory.SuiteDataStore);
+        Assert.That(dataStore, Is.SameAs(DataStoreFactory.SuiteDataStore));
     }
 
     [Test]
     public void AddDataStore_ShouldSetTheSpecDataStore_WhenCalledForSpecDataStoreType()
     {
         DataStoreFactory.AddDataStore(1, DataStoreType.Spec);
-        Assert.IsNotNull(DataStoreFactory.GetDataStoresByStream(1)[DataStoreType.Spec]);
+        Assert.That(DataStoreFactory.GetDataStoresByStream(1)[DataStoreType.Spec], Is.Not.Null);
     }
 
     [Test]
     public void AddDataStore_ShouldSetTheScenaroDataStore_WhenCalledForScenarioDataStoreType()
     {
         DataStoreFactory.AddDataStore(1, DataStoreType.Scenario);
-        Assert.IsNotNull(DataStoreFactory.GetDataStoresByStream(1)[DataStoreType.Scenario]);
+        Assert.That(DataStoreFactory.GetDataStoresByStream(1)[DataStoreType.Scenario], Is.Not.Null);
     }
 
     [Test]
@@ -52,8 +52,8 @@ public void AddDataStore_ShouldKeepSeparateDataStores_WhenCalledForDifferentStre
         var dict1 = DataStoreFactory.GetDataStoresByStream(1)[DataStoreType.Scenario];
         var dict2 = DataStoreFactory.GetDataStoresByStream(2)[DataStoreType.Scenario];
 
-        Assert.AreNotSame(dict1, dict2);
+        Assert.That(dict1, Is.Not.SameAs(dict2));
         dict1.Add("mykey", new object());
-        Assert.IsNull(dict2.Get("mykey"));
+        Assert.That(dict2.Get("mykey"), Is.Null);
     }
 }
diff --git a/Gauge.CSharp.Lib.UnitTests/DataStoreTests.cs b/Gauge.CSharp.Lib.UnitTests/DataStoreTests.cs
@@ -27,7 +27,7 @@ public void ShouldClearDataStore()
         _dataStore.Add("fruit", "apple");
         _dataStore.Clear();
 
-        Assert.AreEqual(_dataStore.Count, 0);
+        Assert.That(_dataStore.Count, Is.EqualTo(0));
     }
 
     [Test]
@@ -36,7 +36,7 @@ public void ShouldGetNullWhenKeyDoesNotExist()
         _dataStore.Add("fruit", "banana");
         var fruit = _dataStore.Get("banana");
 
-        Assert.IsNull(fruit);
+        Assert.That(fruit, Is.Null);
     }
 
     [Test]
@@ -45,14 +45,14 @@ public void ShouldGetStrongTypedValue()
         _dataStore.Add("banana", new Fruit { Name = "Banana" });
         var fruit = _dataStore.Get<Fruit>("banana");
 
-        Assert.IsInstanceOf<Fruit>(fruit);
-        Assert.AreEqual("Banana", fruit.Name);
+        Assert.That(fruit, Is.InstanceOf<Fruit>());
+        Assert.That(fruit.Name, Is.EqualTo("Banana"));
     }
 
     [Test]
     public void ShouldInitializeDataStore()
     {
-        Assert.AreEqual(_dataStore.Count, 0);
+        Assert.That(_dataStore.Count, Is.EqualTo(0));
     }
 
     public class Sample
@@ -68,16 +68,16 @@ public void ShouldInsertComplexTypeIntoDataStore()
         _dataStore.Add("bar", new Sample { Name = "Hello", Country = "India" });
         var value = _dataStore.Get("bar") as Sample;
 
-        Assert.AreEqual(value.Name, "Hello");
+        Assert.That(value.Name, Is.EqualTo("Hello"));
     }
 
     [Test]
     public void ShouldInsertValueIntoDataStore()
     {
         _dataStore.Add("foo", 23);
 
-        Assert.AreEqual(_dataStore.Count, 1);
-        Assert.AreEqual(_dataStore.Get("foo"), 23);
+        Assert.That(_dataStore.Count, Is.EqualTo(1));
+        Assert.That(_dataStore.Get("foo"), Is.EqualTo(23));
     }
 
     [Test]
@@ -95,7 +95,7 @@ public void ShouldReturnNullWhenAskingForInvalidKeyWithStrongType()
 
         var fruit = _dataStore.Get<Fruit>("random");
 
-        Assert.IsNull(fruit);
+        Assert.That(fruit, Is.Null);
     }
 
     [Test]
@@ -112,6 +112,6 @@ public void ShouldUpdateDataForGivenKey()
 
         var value = _dataStore.Get("foo");
 
-        Assert.AreEqual(value, "rumpelstiltskin");
+        Assert.That(value, Is.EqualTo("rumpelstiltskin"));
     }
 }
diff --git a/Gauge.CSharp.Lib.UnitTests/DefaultClassInstanceManagerTests.cs b/Gauge.CSharp.Lib.UnitTests/DefaultClassInstanceManagerTests.cs
@@ -21,8 +21,8 @@ public void ShouldGetInstanceForType()
         var type = typeof(object);
         var instance = new DefaultClassInstanceManager().Get(type);
 
-        Assert.NotNull(instance);
-        Assert.AreEqual(instance.GetType(), type);
+        Assert.That(instance, Is.Not.Null);
+        Assert.That(instance.GetType(), Is.EqualTo(type));
     }
 
     [Test]
@@ -33,7 +33,7 @@ public void ShouldGetMemoizedInstanceForType()
         var instance = instanceManager.Get(type);
         var anotherInstance = instanceManager.Get(type);
 
-        Assert.AreSame(instance, anotherInstance);
+        Assert.That(instance, Is.SameAs(anotherInstance));
     }
 
     [Test]
@@ -45,7 +45,7 @@ public async Task InvokeMethod_ShouldCreateInstanceAndInvokeMethod_WhenInstanceI
 
         await instanceManager.InvokeMethod(methodInfo, 1);
 
-        Assert.IsTrue(MethodInvokeTests.InvokeMethod1Called);
+        Assert.That(MethodInvokeTests.InvokeMethod1Called);
     }
 
     [Test]
@@ -60,7 +60,7 @@ public async Task InvokeMethod_ShouldSetDataStores_WhenDataStoresAreInitialized(
 
         await instanceManager.InvokeMethod(methodInfo, 1);
 
-        Assert.IsTrue(MethodInvokeTests.InvokeMethod2Called);
+        Assert.That(MethodInvokeTests.InvokeMethod2Called);
     }
 
     [Test]
@@ -72,7 +72,7 @@ public async Task InvokeMethod_ShouldNotFail_WhenMethodInvokedIsNotAsync()
 
         await instanceManager.InvokeMethod(methodInfo, 1);
 
-        Assert.IsTrue(MethodInvokeTests.InvokeMethod3Called);
+        Assert.That(MethodInvokeTests.InvokeMethod3Called);
     }
 }
 
@@ -91,9 +91,12 @@ public Task InvokeMethod1()
     public Task InvokeMethod2()
     {
         InvokeMethod2Called = true;
-        Assert.IsNotNull(SuiteDataStore.Store.Value);
-        Assert.IsNotNull(SpecDataStore.Store.Value);
-        Assert.IsNotNull(ScenarioDataStore.Store.Value);
+        Assert.Multiple(() =>
+        {
+            Assert.That(SuiteDataStore.Store.Value, Is.Not.Null);
+            Assert.That(SpecDataStore.Store.Value, Is.Not.Null);
+            Assert.That(ScenarioDataStore.Store.Value, Is.Not.Null);
+        });
         return Task.CompletedTask;
     }
 

diff --git a/Gauge.CSharp.Lib.UnitTests/Gauge.CSharp.Lib.UnitTests.csproj b/Gauge.CSharp.Lib.UnitTests/Gauge.CSharp.Lib.UnitTests.csproj
@@ -1,14 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+		<PackageReference Include="NUnit" Version="4.2.2" />
+		<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
 	</ItemGroup>
 
 	<ItemGroup>