Use vFlatArray

GarageGroup · Jan 24, 2024 · 0a23d70 · 0a23d70
1 parent 14c3525
commit 0a23d70
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 65 deletions.
diff --git a/src/filter-value/Filter.Value.Test/Filter.Value.Test.csproj b/src/filter-value/Filter.Value.Test/Filter.Value.Test.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -18,9 +19,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/filter-value/Filter.Value.Test/Test.DataverseFilterValue/DataverseFilterValueTest.cs b/src/filter-value/Filter.Value.Test/Test.DataverseFilterValue/DataverseFilterValueTest.cs
@@ -12,10 +12,10 @@ private static DataverseFilterValue InitializeFilterValue(string value)
     {
         const BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic;
 
-        var constructor = typeof(DataverseFilterValue).GetConstructor(bindingFlags, null, new[] { typeof(string), typeof(int) }, null);
+        var constructor = typeof(DataverseFilterValue).GetConstructor(bindingFlags, null, [typeof(string), typeof(int)], null);
         Debug.Assert(constructor is not null);
 
-        var filterValue = constructor.Invoke(new object[] { value, 0 }) as DataverseFilterValue;
+        var filterValue = constructor.Invoke([value, 0]) as DataverseFilterValue;
         Debug.Assert(filterValue is not null);
 
         return filterValue;

diff --git a/src/filter-value/Filter.Value/Filter.Value.csproj b/src/filter-value/Filter.Value/Filter.Value.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>

diff --git a/src/filter/Filter.Test/Filter.Test.csproj b/src/filter/Filter.Test/Filter.Test.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -18,9 +19,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/filter/Filter.Test/Test.Filter.Comparison/DataverseComparisonFilterTest.cs b/src/filter/Filter.Test/Test.Filter.Comparison/DataverseComparisonFilterTest.cs
@@ -1,56 +1,50 @@
-using System.Collections.Generic;
+using Xunit;
 
 namespace GarageGroup.Infra.Dataverse.Api.Filter.Test;
 
 public static partial class DataverseComparisonFilterTest
 {
-    public static IEnumerable<object[]> QueryTestData
+    public static TheoryData<DataverseComparisonFilter, string> QueryTestData
         =>
-        new[]
+        new()
         {
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "Field1",
                     DataverseComparisonOperator.Equal,
                     DataverseFilterValue.FromRawString("SomeValue")),
                 "Field1 eq SomeValue"
             },
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "_some_file_name",
                     DataverseComparisonOperator.Inequal,
                     DataverseFilterValue.FromRawString("null")),
                 "_some_file_name ne null"
             },
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "Some Field",
                     DataverseComparisonOperator.Greater,
                     DataverseFilterValue.FromRawString("157")),
                 "Some+Field gt 157"
             },
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "Some'Field",
                     DataverseComparisonOperator.GreaterOrEqual,
                     DataverseFilterValue.FromRawString("Some value")),
                 "Some%27Field ge Some value"
             },
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "some_field",
                     DataverseComparisonOperator.Less,
                     DataverseFilterValue.FromRawString("SomeValue")),
                 "some_field lt SomeValue"
             },
-            new object[]
             {
-                new DataverseComparisonFilter(
+                new(
                     "some_field",
                     DataverseComparisonOperator.LessOrEqual,
                     DataverseFilterValue.FromRawString("SomeValue")),

diff --git a/src/filter/Filter.Test/Test.Filter.Logical/DataverseLogicalFilterTest.cs b/src/filter/Filter.Test/Test.Filter.Logical/DataverseLogicalFilterTest.cs
@@ -1,24 +1,22 @@
-using System.Collections.Generic;
 using PrimeFuncPack.UnitTest;
+using Xunit;
 
 namespace GarageGroup.Infra.Dataverse.Api.Filter.Test;
 
 public static partial class DataverseLogicalFilterTest
 {
-    public static IEnumerable<object[]> QueryTestData
+    public static TheoryData<DataverseLogicalFilter, string> QueryTestData
         =>
-        new[]
+        new()
         {
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.And,
                     default),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.And,
                     new IDataverseFilter[]
                     {
@@ -27,19 +25,17 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.And,
                     new IDataverseFilter[]
                     {
                         new StubDataverseFilter("Some query")
                     }),
                 "Some query"
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.And,
                     new IDataverseFilter[]
                     {
@@ -49,9 +45,8 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "(Some query)"
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.And,
                     new IDataverseFilter[]
                     {
@@ -61,16 +56,14 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "(Some query1 and Query2 and Query3)"
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.Or,
                     default),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.Or,
                     new IDataverseFilter[]
                     {
@@ -79,19 +72,17 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.Or,
                     new IDataverseFilter[]
                     {
                         new StubDataverseFilter("Some query")
                     }),
                 "Some query"
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.Or,
                     new IDataverseFilter[]
                     {
@@ -101,9 +92,8 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "(Some query)"
             },
-            new object[]
             {
-                new DataverseLogicalFilter(
+                new(
                     DataverseLogicalOperator.Or,
                     new IDataverseFilter[]
                     {

diff --git a/src/filter/Filter.Test/Test.Filter.Null/DataverseNotNullFilterTest.cs b/src/filter/Filter.Test/Test.Filter.Null/DataverseNotNullFilterTest.cs
@@ -1,5 +1,4 @@
-using System;
-using Xunit;
+using Xunit;
 
 namespace GarageGroup.Infra.Dataverse.Api.Filter.Test;
 

diff --git a/src/filter/Filter.Test/Test.Filter.Set/DataverseSetFilterTest.cs b/src/filter/Filter.Test/Test.Filter.Set/DataverseSetFilterTest.cs
@@ -1,24 +1,22 @@
-using System.Collections.Generic;
+using Xunit;
 
 namespace GarageGroup.Infra.Dataverse.Api.Filter.Test;
 
 public static partial class DataverseSetFilterTest
 {
-    public static IEnumerable<object[]> QueryTestData
+    public static TheoryData<DataverseSetFilter, string> QueryTestData
         =>
-        new[]
+        new()
         {
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "SomeField",
                     DataverseSetOperator.In,
                     default),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "Some Field",
                     DataverseSetOperator.In,
                     new[]
@@ -27,9 +25,8 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "Some+Field eq Some value"
             },
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "SomeField",
                     DataverseSetOperator.In,
                     new[]
@@ -40,17 +37,15 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "(SomeField eq One or SomeField eq Two or SomeField eq Three)"
             },
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "SomeField",
                     DataverseSetOperator.NotIn,
                     default),
                 string.Empty
             },
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "SomeField",
                     DataverseSetOperator.NotIn,
                     new[]
@@ -59,9 +54,8 @@ public static IEnumerable<object[]> QueryTestData
                     }),
                 "SomeField ne Some value"
             },
-            new object[]
             {
-                new DataverseSetFilter(
+                new(
                     "Some'Field",
                     DataverseSetOperator.NotIn,
                     new[]

diff --git a/src/filter/Filter/Filter.csproj b/src/filter/Filter/Filter.csproj
@@ -2,18 +2,19 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Dataverse.Api.Filter</AssemblyName>
-    <Version>0.2.0</Version>
+    <Version>0.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GarageGroup.Infra.Dataverse.Api.Filter.Value" Version="0.2.0" />
-    <PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.2.1" />
+    <PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.3.0" />
   </ItemGroup>
 
 </Project>