Merge pull request #138 from pfpack/release/2.2.0-preview.9_tagged-union

release/2.2.0-preview.9_tagged-union
pfpack · Feb 11, 2024 · e5cff55 · e5cff55
2 parents 2b0e21c + 2478d64
commit e5cff55
Show file tree

Hide file tree

Showing 80 changed files with 394 additions and 420 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -79,11 +79,11 @@ jobs:
     - name: Pack TaggedUnion
       run: dotnet pack ./src/*/*/TaggedUnion.csproj --no-restore -o ~/nuget  -c Release
 
-    - name: Restore TaggedUnion.Tests
-      run: dotnet restore ./src/*/*/TaggedUnion.Tests.csproj
+    - name: Restore TaggedUnion.Tests.Old
+      run: dotnet restore ./src/*/*/TaggedUnion.Tests.Old.csproj
 
-    - name: Test TaggedUnion.Tests
-      run: dotnet test ./src/*/*/TaggedUnion.Tests.csproj --no-restore  -c Release
+    - name: Test TaggedUnion.Tests.Old
+      run: dotnet test ./src/*/*/TaggedUnion.Tests.Old.csproj --no-restore  -c Release
 
     # Result
 

diff --git a/src/core-taggeds-union/TaggedUnion.Tests.Old/GlobalUsings.cs b/src/core-taggeds-union/TaggedUnion.Tests.Old/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using NUnit.Framework;
+global using NUnit.Framework.Legacy;
diff --git a/....Extensions.Obsolete.Test/OrInitialize.cs → ....Extensions.Obsolete.Test/OrInitialize.cs b/....Extensions.Obsolete.Test/OrInitialize.cs → ....Extensions.Obsolete.Test/OrInitialize.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using PrimeFuncPack.UnitTest;
+using PrimeFuncPack.UnitTest;
 using System;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -13,7 +12,7 @@ public void OrInitialize_OtherFactoryIsNull_ExpectArgumentNullException(
         TaggedUnion<RefType, StructType> source)
     {
         var ex = Assert.Throws<ArgumentNullException>(() => _ = TaggedUnionExtensions.OrInitialize(source, null!));
-        Assert.AreEqual("otherFactory", ex!.ParamName);
+        ClassicAssert.AreEqual("otherFactory", ex!.ParamName);
     }
 
     [Test]
@@ -23,7 +22,7 @@ public void OrInitialize_SourceIsFirst_ExpectSource()
         var other = TaggedUnion<object, StructType>.Second(SomeTextStructType);
 
         var actual = TaggedUnionExtensions.OrInitialize(source, () => other);
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -33,7 +32,7 @@ public void OrInitialize_SourceIsSecond_ExpectSource()
         var other = TaggedUnion<object, RefType>.Second(PlusFifteenIdRefType);
 
         var actual = TaggedUnionExtensions.OrInitialize(source, () => other);
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -43,6 +42,6 @@ public void OrInitialize_SourceIsDefault_ExpectOther()
         var other = TaggedUnion<object, StructType>.First(new object());
 
         var actual = TaggedUnionExtensions.OrInitialize(source, () => other);
-        Assert.AreEqual(other, actual);
+        ClassicAssert.AreEqual(other, actual);
     }
 }
diff --git a/...nsions.Obsolete.Test/OrInitializeAsync.cs → ...nsions.Obsolete.Test/OrInitializeAsync.cs b/...nsions.Obsolete.Test/OrInitializeAsync.cs → ...nsions.Obsolete.Test/OrInitializeAsync.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using PrimeFuncPack.UnitTest;
+using PrimeFuncPack.UnitTest;
 using System;
 using System.Threading.Tasks;
 using static PrimeFuncPack.UnitTest.TestData;
@@ -14,7 +13,7 @@ public void OrInitializeAsync_OtherFactoryAsyncIsNull_ExpectArgumentNullExceptio
         TaggedUnion<RefType, StructType> source)
     {
         var ex = Assert.ThrowsAsync<ArgumentNullException>(async () => _ = await TaggedUnionExtensions.OrInitializeAsync(source, null!));
-        Assert.AreEqual("otherFactoryAsync", ex!.ParamName);
+        ClassicAssert.AreEqual("otherFactoryAsync", ex!.ParamName);
     }
 
     [Test]
@@ -24,7 +23,7 @@ public async Task OrInitializeAsync_SourceIsFirst_ExpectSource()
         var other = TaggedUnion<RefType?, StructType>.First(ZeroIdRefType);
 
         var actual = await TaggedUnionExtensions.OrInitializeAsync(source, () => Task.FromResult(other));
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -34,7 +33,7 @@ public async Task OrInitializeAsync_SourceIsSecond_ExpectSource()
         var other = default(TaggedUnion<object, StructType>);
 
         var actual = await TaggedUnionExtensions.OrInitializeAsync(source, () => Task.FromResult(other));
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -44,6 +43,6 @@ public async Task OrInitializeAsync_SourceIsDefault_ExpectOther()
         var other = TaggedUnion<int, RefType>.Second(new RefType());
 
         var actual = await TaggedUnionExtensions.OrInitializeAsync(source, () => Task.FromResult(other));
-        Assert.AreEqual(other, actual);
+        ClassicAssert.AreEqual(other, actual);
     }
 }
diff --git a/...s.Obsolete.Test/OrInitializeValueAsync.cs → ...s.Obsolete.Test/OrInitializeValueAsync.cs b/...s.Obsolete.Test/OrInitializeValueAsync.cs → ...s.Obsolete.Test/OrInitializeValueAsync.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using PrimeFuncPack.UnitTest;
+using PrimeFuncPack.UnitTest;
 using System;
 using System.Threading.Tasks;
 using static PrimeFuncPack.UnitTest.TestData;
@@ -14,7 +13,7 @@ public void OrInitializeValueAsync_OtherFactoryAsyncIsNull_ExpectArgumentNullExc
         TaggedUnion<RefType, StructType> source)
     {
         var ex = Assert.ThrowsAsync<ArgumentNullException>(async () => _ = await TaggedUnionExtensions.OrInitializeValueAsync(source, null!));
-        Assert.AreEqual("otherFactoryAsync", ex!.ParamName);
+        ClassicAssert.AreEqual("otherFactoryAsync", ex!.ParamName);
     }
 
     [Test]
@@ -24,7 +23,7 @@ public async Task OrInitializeValueAsync_SourceIsFirst_ExpectSource()
         var other = default(TaggedUnion<StructType, DateTime>);
 
         var actual = await TaggedUnionExtensions.OrInitializeValueAsync(source, () => ValueTask.FromResult(other));
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -34,7 +33,7 @@ public async Task OrInitializeValueAsync_SourceIsSecond_ExpectSource()
         var other = TaggedUnion<object, StructType>.Second(SomeTextStructType);
 
         var actual = await TaggedUnionExtensions.OrInitializeValueAsync(source, () => ValueTask.FromResult(other));
-        Assert.AreEqual(source, actual);
+        ClassicAssert.AreEqual(source, actual);
     }
 
     [Test]
@@ -44,6 +43,6 @@ public async Task OrInitializeValueAsync_SourceIsDefault_ExpectOther()
         var other = TaggedUnion<RefType, object>.First(MinusFifteenIdRefType);
 
         var actual = await TaggedUnionExtensions.OrInitializeValueAsync(source, () => ValueTask.FromResult(other));
-        Assert.AreEqual(other, actual);
+        ClassicAssert.AreEqual(other, actual);
     }
 }
diff --git a/...gedUnion.Extensions.Obsolete.Test/Test.cs → ...gedUnion.Extensions.Obsolete.Test/Test.cs b/...gedUnion.Extensions.Obsolete.Test/Test.cs → ...gedUnion.Extensions.Obsolete.Test/Test.cs
diff --git a/...n.Tests/TaggedUnion.Static.Test/Equals.cs → ...sts.Old/TaggedUnion.Static.Test/Equals.cs b/...n.Tests/TaggedUnion.Static.Test/Equals.cs → ...sts.Old/TaggedUnion.Static.Test/Equals.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using PrimeFuncPack.UnitTest;
+using PrimeFuncPack.UnitTest;
 using System;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -14,7 +13,7 @@ public void Equals_UnionAIsDefaultAndUnionBIsDefault_ExpectTrue()
         var unionB = new TaggedUnion<StructType, RefType>();
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -26,7 +25,7 @@ public void Equals_UnionAFirstValueEqualsUnionBFirstValue_ExpectTrue(
         var unionB = TaggedUnion<object?, StructType>.First(sourceValue);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -47,7 +46,7 @@ public void Equals_UnionASecondValueEqualsUnionBSecondValue_ExpectTrue()
         var unionB = (TaggedUnion<RefType, StructType>)bValue;
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -57,7 +56,7 @@ public void Equals_UnionAIsDefaultAndUnionBIsFirst_ExpectFalse()
         var unionB = TaggedUnion<RefType?, StructType>.First(null);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -67,7 +66,7 @@ public void Equals_UnionAIsDefaultAndUnionBIsSecond_ExpectFalse()
         var unionB = TaggedUnion<object, StructType>.Second(default);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -77,7 +76,7 @@ public void Equals_UnionAIsFirstAndUnionBIsDefault_ExpectFalse()
         var unionB = default(TaggedUnion<RefType, StructType>);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -87,7 +86,7 @@ public void Equals_UnionAIsFirstAndUnionBIsSecond_ExpectFalse()
         var unionB = TaggedUnion<StructType, StructType>.Second(SomeTextStructType);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -97,7 +96,7 @@ public void Equals_UnionAIsSecondAndUnionBIsDefault_ExpectFalse()
         var unionB = default(TaggedUnion<StructType, RefType>);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -107,7 +106,7 @@ public void Equals_UnionAIsSecondAndUnionBIsFirst_ExpectFalse()
         var unionB = TaggedUnion<RefType, RefType>.First(ZeroIdRefType);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -128,7 +127,7 @@ public void Equals_UnionAFirstValueIsNotEqualUnionBFirstValue_ExpectFalse()
         var unionB = TaggedUnion<RefType, StructType?>.First(bValue);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -147,6 +146,6 @@ public void Equals_UnionASecondValueIsNotEqualUnionBSecondValue_ExpectFalse()
         var unionB = TaggedUnion<RefType, StructType>.Second(bValue);
 
         var actual = TaggedUnion.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 }
diff --git a/...ion.Tests/TaggedUnion.Static.Test/Test.cs → ...Tests.Old/TaggedUnion.Static.Test/Test.cs b/...ion.Tests/TaggedUnion.Static.Test/Test.cs → ...Tests.Old/TaggedUnion.Static.Test/Test.cs
diff --git a/...gedUnion.Test/Equality/Equality.Static.cs → ...gedUnion.Test/Equality/Equality.Static.cs b/...gedUnion.Test/Equality/Equality.Static.cs → ...gedUnion.Test/Equality/Equality.Static.cs
@@ -1,5 +1,4 @@
-using NUnit.Framework;
-using PrimeFuncPack.UnitTest;
+using PrimeFuncPack.UnitTest;
 using System;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -14,7 +13,7 @@ public void EqualsStatic_UnionAIsDefaultAndUnionBIsDefault_ExpectTrue()
         var unionB = new TaggedUnion<RefType, StructType>();
 
         var actual = TaggedUnion<RefType, StructType>.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -33,7 +32,7 @@ public void EqualsStatic_UnionAFirstValueEqualsUnionBFirstValue_ExpectTrue()
         var unionB = (TaggedUnion<StructType, RefType?>)bValue;
 
         var actual = TaggedUnion<StructType, RefType?>.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -43,7 +42,7 @@ public void EqualsStatic_UnionASecondValueEqualsUnionBSecondValue_ExpectTrue()
         var unionB = (TaggedUnion<StructType, RefType?>)MinusFifteenIdRefType;
 
         var actual = TaggedUnion<StructType, RefType?>.Equals(unionA, unionB);
-        Assert.True(actual);
+        ClassicAssert.True(actual);
     }
 
     [Test]
@@ -53,7 +52,7 @@ public void EqualsStatic_UnionAIsDefaultAndUnionBIsFirst_ExpectFalse()
         var unionB = TaggedUnion<StructType, RefType>.First(default);
 
         var actual = TaggedUnion<StructType, RefType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -63,7 +62,7 @@ public void EqualsStatic_UnionAIsDefaultAndUnionBIsSecond_ExpectFalse()
         var unionB = TaggedUnion<StructType, RefType?>.Second(null);
 
         var actual = TaggedUnion<StructType, RefType?>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -73,7 +72,7 @@ public void EqualsStatic_UnionAIsFirstAndUnionBIsDefault_ExpectFalse()
         var unionB = default(TaggedUnion<StructType, RefType>);
 
         var actual = TaggedUnion<StructType, RefType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -83,7 +82,7 @@ public void EqualsStatic_UnionAIsFirstAndUnionBIsSecond_ExpectFalse()
         var unionB = TaggedUnion<RefType, RefType>.Second(PlusFifteenIdRefType);
 
         var actual = TaggedUnion<RefType, RefType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -93,7 +92,7 @@ public void EqualsStatic_UnionAIsSecondAndUnionBIsDefault_ExpectFalse()
         var unionB = default(TaggedUnion<StructType, RefType>);
 
         var actual = TaggedUnion<StructType, RefType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -103,7 +102,7 @@ public void EqualsStatic_UnionAIsSecondAndUnionBIsFirst_ExpectFalse()
         var unionB = TaggedUnion<StructType, StructType>.First(SomeTextStructType);
 
         var actual = TaggedUnion<StructType, StructType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -124,7 +123,7 @@ public void EqualsStatic_UnionAFirstValueIsNotEqualUnionBFirstValue_ExpectFalse(
         var unionB = TaggedUnion<RefType, StructType?>.First(bValue);
 
         var actual = TaggedUnion<RefType, StructType?>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 
     [Test]
@@ -143,6 +142,6 @@ public void EqualsStatic_UnionASecondValueIsNotEqualUnionBSecondValue_ExpectFals
         var unionB = TaggedUnion<RefType, StructType>.Second(bValue);
 
         var actual = TaggedUnion<RefType, StructType>.Equals(unionA, unionB);
-        Assert.False(actual);
+        ClassicAssert.False(actual);
     }
 }