add IFormattable

lucasteles · May 24, 2023 · f320a4f · f320a4f
1 parent a428728
commit f320a4f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/src/Cnpj.cs b/src/Cnpj.cs
@@ -11,7 +11,7 @@ namespace BrazilModels;
 [TypeConverter(typeof(StringTypeConverter<Cnpj>))]
 [Swashbuckle.AspNetCore.Annotations.SwaggerSchemaFilter(typeof(StringSchemaFilter))]
 [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-public readonly record struct Cnpj : IComparable<Cnpj>
+public readonly record struct Cnpj : IComparable<Cnpj>, IFormattable
 {
     /// <summary>
     /// CNPJ Size
@@ -82,6 +82,10 @@ public Cnpj(in ReadOnlySpan<char> value) : this(value, true) { }
     /// <returns>CNPJ as string</returns>
     public string ToString(bool withMask) => Format(Value, withMask);
 
+    /// <inheritdoc />
+    string IFormattable.ToString(string? format, IFormatProvider? formatProvider) =>
+        Value.ToString(formatProvider);
+
     static Exception CnpjException(in ReadOnlySpan<char> value) =>
         new FormatException($"Invalid CNPJ: {value}");
 

diff --git a/src/Cpf.cs b/src/Cpf.cs
@@ -11,7 +11,7 @@ namespace BrazilModels;
 [TypeConverter(typeof(StringTypeConverter<Cpf>))]
 [Swashbuckle.AspNetCore.Annotations.SwaggerSchemaFilter(typeof(StringSchemaFilter))]
 [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-public readonly record struct Cpf : IComparable<Cpf>
+public readonly record struct Cpf : IComparable<Cpf>, IFormattable
 {
     /// <summary>
     /// CPF Size
@@ -72,6 +72,10 @@ public Cpf(in ReadOnlySpan<char> value) : this(value, true) { }
     /// <returns>CPF as string</returns>
     public string ToString(bool withMask) => Format(Value, withMask);
 
+    /// <inheritdoc />
+    string IFormattable.ToString(string? format, IFormatProvider? formatProvider) =>
+        Value.ToString(formatProvider);
+
     /// <summary>
     /// Convert CPF to string representation without mask
     /// </summary>

diff --git a/src/CpfCnpj.cs b/src/CpfCnpj.cs
@@ -27,7 +27,7 @@ public enum DocumentType
 [TypeConverter(typeof(StringTypeConverter<CpfCnpj>))]
 [Swashbuckle.AspNetCore.Annotations.SwaggerSchemaFilter(typeof(StringSchemaFilter))]
 [DebuggerDisplay("{DebuggerDisplay(),nq}")]
-public readonly record struct CpfCnpj : IComparable<CpfCnpj>
+public readonly record struct CpfCnpj : IComparable<CpfCnpj>, IFormattable
 {
     /// <summary>
     /// Defines if the Document is an CPF or CNPJ
@@ -98,6 +98,10 @@ public CpfCnpj(in ReadOnlySpan<char> value)
     /// <returns>CPF/CNPJ as string</returns>
     public string ToString(bool withMask) => Format(Value, Type, withMask);
 
+    /// <inheritdoc />
+    string IFormattable.ToString(string? format, IFormatProvider? formatProvider) =>
+        Value.ToString(formatProvider);
+
     static Exception CpfCnpjException(in ReadOnlySpan<char> value) =>
         new FormatException($"Invalid CpfCnpj: {value}");
 

diff --git a/tests/BrazilModels.Tests/Usings.cs b/tests/BrazilModels.Tests/Usings.cs
@@ -3,4 +3,4 @@
 global using BrazilModels.Tests.Utils;
 global using FluentAssertions;
 global using NUnit.Framework;
-global using PropertyTestAttribute = FsCheck.NUnit.PropertyAttribute;
+
diff --git a/tests/BrazilModels.Tests/Utils/Generators.cs b/tests/BrazilModels.Tests/Utils/Generators.cs
@@ -4,6 +4,11 @@
 
 namespace BrazilModels.Tests.Utils;
 
+public sealed class PropertyTestAttribute : FsCheck.NUnit.PropertyAttribute
+{
+    public PropertyTestAttribute() => this.QuietOnSuccess = true;
+}
+
 public abstract record DocumentValue(string Value)
 {
     public static implicit operator string(DocumentValue document) => document.Value;