More tests and fixes for IValueObjectConverter and IValueObjectFactory

Author: PawelGerr

src/Thinktecture.Runtime.Extensions.AspNetCore/AspNetCore/ModelBinding/TrimmingSmartEnumModelBinder.cs

@@ -8,7 +8,7 @@ namespace Thinktecture.AspNetCore.ModelBinding;
 /// </summary>
 /// <typeparam name="T">Type of the value object.</typeparam>
 public sealed class TrimmingSmartEnumModelBinder<T> : ValueObjectModelBinderBase<T, string>
-   where T : IKeyedValueObject<T, string>
+   where T : IValueObjectFactory<T, string>
 {
    /// <summary>
    /// Initializes a new instance of <see cref="ValueObjectModelBinder{T,TKey}"/>.

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/SmartEnums/SmartEnumCodeGenerator.cs

@@ -52,7 +52,9 @@ private void GenerateEnum(CancellationToken cancellationToken)
 
       _sb.Append(@"
    [global::System.ComponentModel.TypeConverter(typeof(global::Thinktecture.ValueObjectTypeConverter<").Append(_state.TypeFullyQualified).Append(", ").Append(_state.KeyProperty.TypeFullyQualified).Append(@">))]
-   partial ").Append(_state.IsReferenceType ? "class" : "struct").Append(" ").Append(_state.Name).Append(" : global::Thinktecture.IEnum<").Append(_state.KeyProperty.TypeFullyQualified).Append(", ").Append(_state.TypeFullyQualified).Append(">,");
+   partial ").Append(_state.IsReferenceType ? "class" : "struct").Append(" ").Append(_state.Name).Append(" : global::Thinktecture.IEnum<").Append(_state.KeyProperty.TypeFullyQualified).Append(", ").Append(_state.TypeFullyQualified).Append(@">,
+      global::Thinktecture.IValueObjectFactory<").Append(_state.TypeFullyQualified).Append(", ").Append(_state.KeyProperty.TypeFullyQualified).Append(@">,
+      global::Thinktecture.IValueObjectConverter<").Append(_state.KeyProperty.TypeFullyQualified).Append(">,");
 
       foreach (var desiredFactory in _state.Settings.DesiredFactories)
       {
@@ -64,8 +66,8 @@ private void GenerateEnum(CancellationToken cancellationToken)
 
          if (desiredFactory.UseForSerialization != SerializationFrameworks.None)
          {
-            _sb.Append(@",
-      global::Thinktecture.IValueObjectConverter<").Append(desiredFactory.TypeFullyQualified).Append(">");
+            _sb.Append(@"
+      global::Thinktecture.IValueObjectConverter<").Append(desiredFactory.TypeFullyQualified).Append(">,");
          }
       }
 

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ValueObjectCodeGenerator.cs

@@ -60,12 +60,14 @@ private void GenerateValueObject(bool emptyStringYieldsNull, CancellationToken c
       if (_state.HasKeyMember)
       {
          _sb.Append(@",
-      global::Thinktecture.IKeyedValueObject<").Append(_state.KeyMember.Member.TypeFullyQualifiedWithNullability).Append(">");
+      global::Thinktecture.IKeyedValueObject<").Append(_state.KeyMember.Member.TypeFullyQualifiedWithNullability).Append(@">,
+      global::Thinktecture.IValueObjectConverter<").Append(_state.KeyMember.Member.TypeFullyQualified).Append(">");
 
          if (!_state.Settings.SkipFactoryMethods)
          {
             _sb.Append(@",
-      global::Thinktecture.IKeyedValueObject<").Append(_state.TypeFullyQualified).Append(", ").Append(_state.KeyMember.Member.TypeFullyQualifiedWithNullability).Append(">");
+      global::Thinktecture.IKeyedValueObject<").Append(_state.TypeFullyQualified).Append(", ").Append(_state.KeyMember.Member.TypeFullyQualifiedWithNullability).Append(@">,
+      global::Thinktecture.IValueObjectFactory<").Append(_state.TypeFullyQualified).Append(", ").Append(_state.KeyMember.Member.TypeFullyQualified).Append(">");
          }
       }
       else

src/Thinktecture.Runtime.Extensions/IKeyedValueObject.cs

@@ -14,7 +14,7 @@ public interface IKeyedValueObject
 /// Common interface of keyed value objects.
 /// </summary>
 /// <typeparam name="TKey">Type of the key member.</typeparam>
-public interface IKeyedValueObject<out TKey> : IValueObjectConverter<TKey>, IKeyedValueObject
+public interface IKeyedValueObject<out TKey> : IKeyedValueObject
    where TKey : notnull
 {
    /// <summary>
@@ -32,7 +32,7 @@ public interface IKeyedValueObject<out TKey> : IValueObjectConverter<TKey>, IKey
 /// <remarks>
 /// Don't implement this interface directly. It will be implemented by a source generator.
 /// </remarks>
-public interface IKeyedValueObject<T, TKey> : IKeyedValueObject<TKey>, IValueObjectFactory<T, TKey>
+public interface IKeyedValueObject<T, TKey> : IKeyedValueObject<TKey>
    where TKey : notnull
 {
    /// <summary>

src/Thinktecture.Runtime.Extensions/IValueObjectConverter.cs

@@ -13,5 +13,5 @@ public interface IValueObjectConverter<out T>
    /// <summary>
    /// Converts the value object to type <typeparamref name="T"/>.
    /// </summary>
-   T ToValue() => throw new NotImplementedException("This method will be implemented by the source generator.");
+   T ToValue();
 }

src/Thinktecture.Runtime.Extensions/IValueObjectFactory.cs

@@ -33,5 +33,5 @@ public interface IValueObjectFactory<T, TValue> : IValueObjectFactory<TValue>
    /// <param name="provider">An object that provides culture-specific formatting information.</param>
    /// <param name="item">Item with key property equals to the provided <paramref name="value"/>.</param>
    /// <returns>Validation result.</returns>
-   static virtual ValidationResult? Validate(TValue? value, IFormatProvider? provider, out T? item) => throw new NotImplementedException("This method will be implemented by the source generator.");
+   static abstract ValidationResult? Validate(TValue? value, IFormatProvider? provider, out T? item);
 }

test/Thinktecture.Runtime.Extensions.AspNetCore.Tests/AspNetCore/ModelBinding/ValueObjectModelBinderProviderTests/GetBinder.cs

@@ -32,12 +32,19 @@ public void Should_return_binder_for_string_based_value_type()
    }
 
    [Fact]
-   public void Should_return_string_base_binder_specified_by_ValueObjectFactoryAttribute()
+   public void Should_return_string_base_binder_specified_by_ValueObjectFactoryAttribute_of_value_object_()
    {
       var binder = GetModelBinder<BoundaryWithFactories>();
       binder.Should().BeOfType<ValueObjectModelBinder<BoundaryWithFactories, string>>();
    }
 
+   [Fact]
+   public void Should_return_string_base_binder_specified_by_ValueObjectFactoryAttribute_smart_enum()
+   {
+      var binder = GetModelBinder<EnumWithFactory>();
+      binder.Should().BeOfType<TrimmingSmartEnumModelBinder<EnumWithFactory>>();
+   }
+
    [Fact]
    public void Should_return_null_for_non_enums_and_non_value_types()
    {

test/Thinktecture.Runtime.Extensions.AspNetCore.Tests/AspNetCore/ModelBinding/ValueObjectModelBinderTests/BindModelAsync.cs

@@ -197,7 +197,7 @@ public async Task Should_return_error_if_value_violates_validation_rules()
    }
 
    [Fact]
-   public async Task Should_bind_successfully_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
+   public async Task Should_bind_successfully_value_object_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
    {
       var ctx = await BindAsync<BoundaryWithFactories, string>("1:2");
 
@@ -207,7 +207,7 @@ public async Task Should_bind_successfully_having_string_base_factory_specified_
    }
 
    [Fact]
-   public async Task Should_return_error_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
+   public async Task Should_return_error_when_binding_value_object_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
    {
       var ctx = await BindAsync<BoundaryWithFactories, string>("1");
 
@@ -216,6 +216,26 @@ public async Task Should_return_error_having_string_base_factory_specified_by_Va
       ctx.Result.IsModelSet.Should().BeFalse();
    }
 
+   [Fact]
+   public async Task Should_bind_successfully_smart_enum_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
+   {
+      var ctx = await BindAsync<EnumWithFactory, string>("=1=");
+
+      ctx.ModelState.ErrorCount.Should().Be(0);
+      ctx.Result.IsModelSet.Should().BeTrue();
+      ctx.Result.Model.Should().Be(EnumWithFactory.Item1);
+   }
+
+   [Fact]
+   public async Task Should_return_error_when_binding_smart_enum_having_string_base_factory_specified_by_ValueObjectFactoryAttribute()
+   {
+      var ctx = await BindAsync<EnumWithFactory, string>("A");
+
+      ctx.ModelState.ErrorCount.Should().Be(1);
+      ctx.ModelState[ctx.ModelName]!.Errors.Should().BeEquivalentTo(new[] { new ModelError("Unknown item 'A'") });
+      ctx.Result.IsModelSet.Should().BeFalse();
+   }
+
    private static async Task<DefaultModelBindingContext> BindAsync<T, TKey>(
       string value)
       where T : IValueObjectFactory<T, TKey>