v1.3.0

.github/workflows/github-actions-ci.yaml

@@ -0,0 +1,24 @@
+name: Continuous Integration
+
+on:
+  pull_request:
+    branches: [ "main" ]
+  push:
+    branches: [ "releases/**" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup .NET 8.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.x'
+
+      - name: Build
+        run: dotnet build --property:Configuration=Debug "PosInformatique.FluentAssertions.Json.sln"
+
+      - name: Test with the dotnet CLI
+        run: dotnet test --property:Configuration=Debug "PosInformatique.FluentAssertions.Json.sln"

.github/workflows/github-actions-release.yml

@@ -0,0 +1,36 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      VersionPrefix:
+        type: string
+        description: The version of the library
+        required: true
+        default: 1.3.0
+      VersionSuffix:
+        type: string
+        description: The version suffix of the library (for example rc.1)
+
+run-name: ${{ inputs.VersionPrefix }}-${{ inputs.VersionSuffix }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup .NET 8.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.x'
+
+      - name: Build
+        run: dotnet pack 
+          --property:Configuration=Release
+          --property:VersionPrefix=${{ github.event.inputs.VersionPrefix }}
+          --property:VersionSuffix=${{ github.event.inputs.VersionSuffix }}
+          "src/FluentAssertions.Json/FluentAssertions.Json.csproj"
+
+      - name: Publish the package to nuget.org
+        run: dotnet nuget push "src/FluentAssertions.Json/bin/Release/*.nupkg" --api-key "${{ secrets.NUGET_APIKEY }}" --source https://api.nuget.org/v3/index.json

Directory.Build.props

@@ -31,10 +31,6 @@
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\.editorconfig" Link=".editorconfig" />
-  </ItemGroup>
 
   <!-- Common NuGet packages -->
   <ItemGroup>

PosInformatique.FluentAssertions.Json.sln

@@ -22,12 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7928175B
 		tests\.editorconfig = tests\.editorconfig
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E7CF7FC5-E257-4A28-8641-F41032340CA9}"
-	ProjectSection(SolutionItems) = preProject
-		build\azure-pipelines-ci.yaml = build\azure-pipelines-ci.yaml
-		build\azure-pipelines-release.yaml = build\azure-pipelines-release.yaml
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,7 +42,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7928175B-C3B3-4F81-B956-BF4E4F816436} = {882949E5-7DCE-4EB6-8E9A-CB88FD0ED1F9}
-		{E7CF7FC5-E257-4A28-8641-F41032340CA9} = {882949E5-7DCE-4EB6-8E9A-CB88FD0ED1F9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0582B8EB-4FA4-488E-9953-9B7CEEE4E94F}

src/FluentAssertions.Json/FluentAssertions.Json.csproj

@@ -11,8 +11,12 @@
     <PackageProjectUrl>https://github.com/PosInformatique/PosInformatique.FluentAssertions.Json</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
+      1.3.0
+      - Add new overload BeJsonDeserializableInto() method to test the string collections.
+      - Add new overload BeJsonDeserializableInto() method to test the string and numeric values.
+
       1.2.0
-      - Add new override BeJsonSerializableInto() method to test polymorphism serialization with discriminator JSON property.
+      - Add new overload BeJsonSerializableInto() method to test polymorphism serialization with discriminator JSON property.
       - Add the support to assert the deserialization of root JSON array.
 
       1.1.0

src/FluentAssertions.Json/JsonFluentAssertionsExtensions.cs

@@ -12,6 +12,7 @@
     using FluentAssertions.Collections;
     using FluentAssertions.Common;
     using FluentAssertions.Equivalency;
+    using FluentAssertions.Numeric;
     using FluentAssertions.Primitives;
     using PosInformatique.FluentAssertions.Json;
 
@@ -105,7 +106,7 @@
         /// </summary>
         /// <typeparam name="TElement">Type of the element of the collection to check the JSON deserialization.</typeparam>
         /// <typeparam name="T">Type of the object to deserialize from JSON.</typeparam>
-        /// <param name="assertions"><see cref="ObjectAssertions"/> which contains the JSON collection subject to deserialize.</param>
+        /// <param name="assertions"><see cref="GenericCollectionAssertions{T}"/> which contains the JSON collection subject to deserialize.</param>
         /// <param name="expectedObject">Expected collection deserialized expected.</param>
         /// <param name="options"><see cref="JsonSerializerOptions"/> to use to assert the deserialization. If not specified
         /// the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/> of the <see cref="FluentAssertionsJson.Configuration"/>
@@ -115,6 +116,49 @@
             BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, GetSerializerOptions(options));
         }
 
+        /// <summary>
+        /// Check if the JSON subject string collection is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the object to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="StringCollectionAssertions"/> which contains the JSON string collection subject to deserialize.</param>
+        /// <param name="expectedObject">Expected string collection deserialized expected.</param>
+        /// <param name="options"><see cref="JsonSerializerOptions"/> to use to assert the deserialization. If not specified
+        /// the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/> of the <see cref="FluentAssertionsJson.Configuration"/>
+        /// will be used.</param>
+        public static void BeJsonDeserializableInto<T>(this StringCollectionAssertions assertions, T expectedObject, JsonSerializerOptions? options = null)
+        {
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, GetSerializerOptions(options));
+        }
+
+        /// <summary>
+        /// Check if the JSON subject numeric is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the object to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="NumericAssertions{T}"/> which contains the JSON numeric subject to deserialize.</param>
+        /// <param name="expectedObject">Expected numeric value deserialized expected.</param>
+        /// <param name="options"><see cref="JsonSerializerOptions"/> to use to assert the deserialization. If not specified
+        /// the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/> of the <see cref="FluentAssertionsJson.Configuration"/>
+        /// will be used.</param>
+        public static void BeJsonDeserializableInto<T>(this NumericAssertions<T> assertions, T expectedObject, JsonSerializerOptions? options = null)
+            where T : struct, IComparable<T>
+        {
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, GetSerializerOptions(options));
+        }
+
+        /// <summary>
+        /// Check if the JSON subject string is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the object to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="StringAssertions"/> which contains the JSON string subject to deserialize.</param>
+        /// <param name="expectedObject">Expected string value deserialized expected.</param>
+        /// <param name="options"><see cref="JsonSerializerOptions"/> to use to assert the deserialization. If not specified
+        /// the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/> of the <see cref="FluentAssertionsJson.Configuration"/>
+        /// will be used.</param>
+        public static void BeJsonDeserializableInto<T>(this StringAssertions assertions, T expectedObject, JsonSerializerOptions? options = null)
+        {
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, GetSerializerOptions(options));
+        }
+
         /// <summary>
         /// Check if the JSON subject object is deserializable into the specified <paramref name="expectedObject"/> argument.
         /// </summary>
@@ -150,6 +194,58 @@
             BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, optionsCopy);
         }
 
+        /// <summary>
+        /// Check if the JSON subject string collection is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the object to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="ObjectAssertions"/> which contains the JSON string collection subject to deserialize.</param>
+        /// <param name="expectedObject">Expected string collection deserialized expected.</param>
+        /// <param name="configureOptions">Allows to change the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/>
+        /// of the <see cref="FluentAssertionsJson.Configuration"/> used to assert the deserialization.</param>
+        public static void BeJsonDeserializableInto<T>(this StringCollectionAssertions assertions, T expectedObject, Action<JsonSerializerOptions> configureOptions)
+        {
+            var optionsCopy = new JsonSerializerOptions(FluentAssertionsJson.Configuration.JsonSerializerOptions);
+
+            configureOptions(optionsCopy);
+
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, optionsCopy);
+        }
+
+        /// <summary>
+        /// Check if the JSON subject numeric is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the numeric value to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="ObjectAssertions"/> which contains the JSON numeric subject to deserialize.</param>
+        /// <param name="expectedObject">Expected numeric value deserialized expected.</param>
+        /// <param name="configureOptions">Allows to change the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/>
+        /// of the <see cref="FluentAssertionsJson.Configuration"/> used to assert the deserialization.</param>
+        public static void BeJsonDeserializableInto<T>(this NumericAssertions<T> assertions, T expectedObject, Action<JsonSerializerOptions> configureOptions)
+            where T : struct, IComparable<T>
+        {
+            var optionsCopy = new JsonSerializerOptions(FluentAssertionsJson.Configuration.JsonSerializerOptions);
+
+            configureOptions(optionsCopy);
+
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, optionsCopy);
+        }
+
+        /// <summary>
+        /// Check if the JSON subject string is deserializable into the specified <paramref name="expectedObject"/> argument.
+        /// </summary>
+        /// <typeparam name="T">Type of the string value to deserialize from JSON.</typeparam>
+        /// <param name="assertions"><see cref="StringAssertions"/> which contains the JSON string subject to deserialize.</param>
+        /// <param name="expectedObject">Expected string value deserialized expected.</param>
+        /// <param name="configureOptions">Allows to change the default <see cref="IFluentAssertionsJsonConfiguration.JsonSerializerOptions"/>
+        /// of the <see cref="FluentAssertionsJson.Configuration"/> used to assert the deserialization.</param>
+        public static void BeJsonDeserializableInto<T>(this StringAssertions assertions, T expectedObject, Action<JsonSerializerOptions> configureOptions)
+        {
+            var optionsCopy = new JsonSerializerOptions(FluentAssertionsJson.Configuration.JsonSerializerOptions);
+
+            configureOptions(optionsCopy);
+
+            BeJsonDeserializableIntoCore(assertions.Subject, expectedObject, optionsCopy);
+        }
+
         private static void BeJsonSerializableIntoCore<TBase>(ObjectAssertions assertions, object? expectedJson, JsonSerializerOptions options)
         {
             if (assertions.Subject is not null && assertions.Subject is not TBase)

tests/FluentAssertions.Json.Tests/FluentAssertions.Json.Tests.csproj

@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>disable</Nullable>
 
     <!-- Disable the StyleCop 'XML comment analysis is disabled due to project configuration' warning. -->
     <NoWarn>$(NoWarn);SA0001</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>