From d9ebb37906712528b0bf3ab826fa10d4ce28a20f Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 14 Oct 2014 09:48:24 -0700
Subject: [PATCH] Removing Microsoft.AspNet.Mvc dependency from ModelBinding

---
 .../DefaultBodyModelValidatorTests.cs         | 21 +++++++------------
 .../project.json                              |  1 -
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs
index be74654e5d..93448dd0d6 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs
@@ -6,10 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Microsoft.AspNet.Mvc.OptionDescriptors;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
 using Moq;
 using Xunit;
 
@@ -295,19 +292,17 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
         private ModelValidationContext GetModelValidationContext(object model, Type type)
         {
             var modelStateDictionary = new ModelStateDictionary();
-            var mvcOptions = new MvcOptions();
-            var setup = new MvcOptionsSetup();
-            setup.Invoke(mvcOptions);
-            var accessor = new Mock<IOptionsAccessor<MvcOptions>>();
-            accessor.SetupGet(a => a.Options)
-                    .Returns(mvcOptions);
+            var provider = new Mock<IModelValidatorProviderProvider>();
+            provider.SetupGet(p => p.ModelValidatorProviders)
+                    .Returns(new IModelValidatorProvider[]
+                    {
+                       new DataAnnotationsModelValidatorProvider(),
+                       new DataMemberModelValidatorProvider()
+                    });
             var modelMetadataProvider = new EmptyModelMetadataProvider();
             return new ModelValidationContext(
                 modelMetadataProvider,
-                new CompositeModelValidatorProvider(
-                    new DefaultModelValidatorProviderProvider(
-                        accessor.Object, Mock.Of<ITypeActivator>(),
-                        Mock.Of<IServiceProvider>())),
+                new CompositeModelValidatorProvider(provider.Object),
                 modelStateDictionary,
                 new ModelMetadata(
                     provider: modelMetadataProvider,
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
index 0fbf217211..64dede055a 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
@@ -4,7 +4,6 @@
     },
     "dependencies": {
         "Microsoft.AspNet.Http": "1.0.0-*",
-        "Microsoft.AspNet.Mvc": "",
         "Microsoft.AspNet.Mvc.ModelBinding": "",
         "Microsoft.AspNet.PipelineCore": "1.0.0-*",
         "Microsoft.AspNet.Routing": "1.0.0-*",