Commonize 'throw on view not found'

src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewResult.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -43,13 +42,7 @@ public async Task ExecuteResultAsync([NotNull] ActionContext context)
         private async Task<IView> FindView([NotNull] IDictionary<string, object> context,[NotNull] string viewName)
         {
             var result = await _viewEngine.FindView(context, viewName);
-            if (!result.Success)
-            {
-                var locationsText = string.Join(Environment.NewLine, result.SearchedLocations);
-                const string message = @"The view &apos;{0}&apos; was not found. The following locations were searched:{1}.";
-                throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, message, viewName, locationsText));
-            }
-
+            result.ThrowIfViewNotFound();
             return result.View;
         }
 

src/Microsoft.AspNet.Mvc.Core/ViewComponents/ViewViewComponentResult.cs

@@ -76,19 +76,8 @@ public async Task ExecuteAsync([NotNull] ViewComponentContext context)
 
         private async Task<IView> FindView([NotNull] IDictionary<string, object> context, [NotNull] string viewName)
         {
-            // Issue #161 in Jira tracks unduping this code.
             var result = await _viewEngine.FindView(context, viewName);
-            if (!result.Success)
-            {
-                var locationsText = string.Join(Environment.NewLine, result.SearchedLocations);
-                const string message = @"The view &apos;{0}&apos; was not found. The following locations were searched:{1}.";
-                throw new InvalidOperationException(String.Format(
-                    CultureInfo.CurrentCulture,
-                    message,
-                    viewName,
-                    locationsText));
-            }
-
+            result.ThrowIfViewNotFound();
             return result.View;
         }
     }

src/Microsoft.AspNet.Mvc.Razor/ViewEngine/RazorViewEngine.cs

@@ -35,8 +35,8 @@ public async Task<ViewEngineResult> FindView([NotNull] IDictionary<string, objec
             if (nameRepresentsPath)
             {
                 var view = await _virtualPathFactory.CreateInstance(viewName);
-                return view != null ? ViewEngineResult.Found(view) :
-                                      ViewEngineResult.NotFound(new[] { viewName });
+                return view != null ? ViewEngineResult.Found(viewName, view) :
+                                      ViewEngineResult.NotFound(viewName, new[] { viewName });
             }
             else
             {
@@ -50,20 +50,15 @@ public async Task<ViewEngineResult> FindView([NotNull] IDictionary<string, objec
                     IView view = await _virtualPathFactory.CreateInstance(path);
                     if (view != null)
                     {
-                        return ViewEngineResult.Found(view);
+                        return ViewEngineResult.Found(viewName, view);
                     }
                     searchedLocations.Add(path);
                 }
 
-                return ViewEngineResult.NotFound(searchedLocations);
+                return ViewEngineResult.NotFound(viewName, searchedLocations);
             }
         }
 
-        public Task<ViewEngineResult> FindComponentView(object actionContext, string viewName)
-        {
-            throw new NotImplementedException();
-        }
-
         private static bool IsSpecificPath(string name)
         {
             char c = name[0];

src/Microsoft.AspNet.Mvc.Rendering/Properties/Resources.resx

@@ -129,4 +129,7 @@
   <data name="ViewData_WrongTModelType" xml:space="preserve">
     <value>The model item passed into the ViewData is of type '{0}', but this ViewData instance requires a model item of type '{1}'.</value>
   </data>
+  <data name="ViewEngine_ViewNotFound" xml:space="preserve">
+    <value>The view '{0}' was not found. The following locations were searched:{1}.</value>
+  </data>
 </root>

src/Microsoft.AspNet.Mvc.Rendering/View/ViewEngineResult.cs

@@ -13,25 +13,42 @@ private ViewEngineResult()
 
         public IView View { get; private set; }
 
+        public string ViewName { get; private set; }
+
         public bool Success 
         { 
             get { return View != null; } 
         }
 
-        public static ViewEngineResult NotFound([NotNull] IEnumerable<string> searchedLocations)
+        public static ViewEngineResult NotFound([NotNull] string viewName, [NotNull] IEnumerable<string> searchedLocations)
         {
             return new ViewEngineResult
             {
-                SearchedLocations = searchedLocations
+                SearchedLocations = searchedLocations,
+                ViewName = viewName,
             };
         }
 
-        public static ViewEngineResult Found([NotNull] IView view)
+        public static ViewEngineResult Found([NotNull] string viewName, [NotNull] IView view)
         {
             return new ViewEngineResult
             {
-                View = view
+                View = view,
+                ViewName = viewName,
             };
         }
+
+        public void ThrowIfViewNotFound()
+        {
+            if (Success)
+            {
+                return;
+            }
+
+            var locationsText = Environment.NewLine + string.Join(Environment.NewLine, SearchedLocations);
+            throw new InvalidOperationException(Resources.FormatViewEngine_ViewNotFound(
+                ViewName,
+                 locationsText));
+        }
     }
 }