257966: Parameterless overload of WebPage::ExecutePageHierarchy throws

pranavkm · pranavkm · commit a565f101ffe8 · 2012-04-05T10:55:27.000-07:00
when called.
diff --git a/src/System.Web.WebPages/Resources/WebPageResources.Designer.cs b/src/System.Web.WebPages/Resources/WebPageResources.Designer.cs
diff --git a/src/System.Web.WebPages/Resources/WebPageResources.resx b/src/System.Web.WebPages/Resources/WebPageResources.resx
@@ -216,6 +216,9 @@
   <data name="WebPage_CannotRequestDirectly" xml:space="preserve">
     <value>The file "{0}" cannot be requested directly because it calls the "{1}" method.</value>
   </data>
+  <data name="WebPage_ExecutePageHierarchyCannotBeInvoked" xml:space="preserve">
+    <value>ExecutePageHierarchy cannot be invoked if PageContext is null.</value>
+  </data>
   <data name="WebPage_FileNotSupported" xml:space="preserve">
     <value>The following file could not be rendered because its extension "{0}" might not be supported: "{1}".</value>
   </data>
diff --git a/src/System.Web.WebPages/WebPage.cs b/src/System.Web.WebPages/WebPage.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Web.WebPages.Html;
+using System.Web.WebPages.Resources;
 using System.Web.WebPages.Scope;
 
 namespace System.Web.WebPages
@@ -65,6 +66,11 @@ public static void RegisterPageExecutor(IWebPageRequestExecutor executor)
 
         public override void ExecutePageHierarchy()
         {
+            if (PageContext == null)
+            {
+                // The ExecutePageHierarchy in WebPageBase assumes a non-null PageContext. 
+                throw new InvalidOperationException(WebPageResources.WebPage_ExecutePageHierarchyCannotBeInvoked);
+            }
             using (ScopeStorage.CreateTransientScope(new ScopeStorageDictionary(ScopeStorage.CurrentScope, PageData)))
             {
                 ExecutePageHierarchy(_executors);
diff --git a/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs b/test/System.Web.WebPages.Test/WebPage/WebPageTest.cs
@@ -31,6 +31,16 @@ public void CreatePageFromVirtualPathAssignsVirtualPathFactory()
             Assert.Equal(page.VirtualPath, path);
         }
 
+        [Fact]
+        public void ExecutePageHierarchyThrowsIfPageContextIsNotSet()
+        {
+            // Arrange
+            var page = new Mock<WebPage>() { CallBase = true };
+
+            // Act and Assert
+            Assert.Throws<InvalidOperationException>(() => page.Object.ExecutePageHierarchy(), "ExecutePageHierarchy cannot be invoked if PageContext is null.");
+        }
+
         [Fact]
         public void NormalizeLayoutPagePathTest()
         {
