Result extension methods now use the new ResultDetailsTestBuilder classes (#359)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Models/BaseShouldReturnTestBuilderExtensions.cs

@@ -6,7 +6,9 @@
     using Builders.Contracts.Models;
     using Builders.And;
     using Builders.Base;
+    using Builders.Contracts.Results;
     using Builders.Models;
+    using Builders.Results;
     using Exceptions;
     using Internal.TestContexts;
     using Microsoft.AspNetCore.Mvc;
@@ -40,7 +42,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
         public static IAndTestBuilder ResultOfType<TResult>(
             this IBaseShouldReturnTestBuilder<TResult> builder,
             Type resultType,
-            Action<IModelDetailsTestBuilder<TResult>> resultTestBuilder)
+            Action<IResultDetailsTestBuilder<TResult>> resultTestBuilder)
         {
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
@@ -50,7 +52,7 @@ public static IAndTestBuilder ResultOfType<TResult>(
                 canBeAssignable: true,
                 allowDifferentGenericTypeDefinitions: true);
 
-            resultTestBuilder?.Invoke(new ModelDetailsTestBuilder<TResult>(actualBuilder.TestContext));
+            resultTestBuilder?.Invoke(new ResultDetailsTestBuilder<TResult>(actualBuilder.TestContext));
 
             return new AndTestBuilder(actualBuilder.TestContext);
         }
@@ -74,39 +76,50 @@ public static IAndTestBuilder ResultOfType<TResult>(
         /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
         public static IAndTestBuilder ResultOfType<TResult>(
             this IBaseShouldReturnTestBuilder builder,
-            Action<IModelDetailsTestBuilder<TResult>> resultTestBuilder)
+            Action<IResultDetailsTestBuilder<TResult>> resultTestBuilder)
         {
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
             InvocationResultValidator.ValidateInvocationResultType<TResult>(
                 actualBuilder.TestContext,
                 canBeAssignable: true);
 
-            resultTestBuilder?.Invoke(new ModelDetailsTestBuilder<TResult>(actualBuilder.TestContext));
+            resultTestBuilder?.Invoke(new ResultDetailsTestBuilder<TResult>(actualBuilder.TestContext));
 
             return new AndTestBuilder(actualBuilder.TestContext);
         }
 
         /// <summary>
-        /// Tests whether the result is deeply equal to the provided one.
+        /// Tests the result by using a test builder.
         /// </summary>
-        /// <typeparam name="TResult">Expected result type.</typeparam>
         /// <param name="builder">Instance of <see cref="IBaseShouldReturnTestBuilder"/> type.</param>
-        /// <param name="model">Expected result object.</param>
+        /// <param name="resultTestBuilder">Builder for testing the result.</param>
         /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
-        public static IAndTestBuilder Result<TResult>(
+        public static IAndTestBuilder Result(
             this IBaseShouldReturnTestBuilder builder,
-            TResult model)
+            Action<IResultDetailsTestBuilder> resultTestBuilder)
         {
             var actualBuilder = (BaseTestBuilderWithActionContext)builder;
 
-            InvocationResultValidator.ValidateInvocationResult(
-                actualBuilder.TestContext, 
-                model);
+            resultTestBuilder?.Invoke(new ResultDetailsTestBuilder(actualBuilder.TestContext));
 
             return new AndTestBuilder(actualBuilder.TestContext);
         }
 
+        /// <summary>
+        /// Tests whether the result is deeply equal to the provided one.
+        /// </summary>
+        /// <typeparam name="TResult">Expected result type.</typeparam>
+        /// <param name="builder">Instance of <see cref="IBaseShouldReturnTestBuilder"/> type.</param>
+        /// <param name="result">Expected result object.</param>
+        /// <returns>Test builder of <see cref="IAndTestBuilder"/> type.</returns>
+        public static IAndTestBuilder Result<TResult>(
+            this IBaseShouldReturnTestBuilder builder,
+            TResult result)
+            => builder
+                .Result(value => value
+                    .EqualTo(result));
+
         private static ActionTestContext ConvertMethodResult(ActionTestContext testContext)
         {
             var methodResult = testContext.MethodResult;

src/MyTested.AspNetCore.Mvc.Models/Builders/Results/ResultDetailsTestBuilder.cs

@@ -4,6 +4,8 @@
     using Contracts.Models;
     using Contracts.Results;
     using Internal.TestContexts;
+    using Models;
+    using Utilities.Validators;
 
     /// <summary>
     /// Used for testing the result members.
@@ -24,7 +26,11 @@ public ResultDetailsTestBuilder(ActionTestContext testContext)
         /// <inheritdoc />
         public IAndModelDetailsTestBuilder<TResult> EqualTo<TResult>(TResult result)
         {
-            throw new System.NotImplementedException();
+            InvocationResultValidator.ValidateInvocationResult(
+                this.TestContext,
+                result);
+
+            return new ModelDetailsTestBuilder<TResult>(this.TestContext);
         }
     }
 }

src/MyTested.AspNetCore.Mvc.Models/Builders/Results/ResultDetailsTestBuilder{TResult}.cs

@@ -4,6 +4,7 @@
     using Contracts.Results;
     using Internal.TestContexts;
     using Models;
+    using Utilities.Validators;
 
     /// <summary>
     /// Used for testing the result members.
@@ -25,7 +26,11 @@ public ResultDetailsTestBuilder(ActionTestContext testContext)
         /// <inheritdoc />
         public IAndModelDetailsTestBuilder<TResult> EqualTo(TResult result)
         {
-            throw new System.NotImplementedException();
+            InvocationResultValidator.ValidateInvocationResult(
+                this.TestContext,
+                result);
+
+            return this;
         }
     }
 }