2147483647
-
viewstart-content
page-content
@@ -32,7 +31,6 @@ public static IEnumerable InstrumentationData
var expectedLineMappings = new[]
{
- Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 2, true),
@@ -52,30 +50,26 @@ public static IEnumerable InstrumentationData
var expected2 = @"
2147483647
-
viewstart-content
view-with-partial-content
-
partial-content
-
partial-content
";
var expectedLineMappings2 = new[]
{
- Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 26, true),
Tuple.Create(27, 39, false),
// Html.PartialAsync()
- Tuple.Create(27, 3, true),
+ Tuple.Create(28, 2, true),
Tuple.Create(30, 8, true),
Tuple.Create(38, 4, false),
Tuple.Create(42, 1, true),
Tuple.Create(43, 20, true),
Tuple.Create(66, 1, true),
// Html.RenderPartial()
- Tuple.Create(27, 3, true),
+ Tuple.Create(28, 2, true),
Tuple.Create(30, 8, true),
Tuple.Create(38, 4, false),
Tuple.Create(42, 1, true),
@@ -179,7 +173,6 @@ public async Task SwitchingFromNonInstrumentedToInstrumentedWorksForLayoutAndVie
// Arrange - 1
var expectedLineMappings = new[]
{
- Tuple.Create(90, 1, true),
Tuple.Create(92, 16, false),
Tuple.Create(108, 1, true),
Tuple.Create(0, 2, true),
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
index ebfb970c3b..1715bc6e58 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
@@ -46,8 +46,7 @@ _ViewStart that specifies partial Layout
public async Task PartialLayoutPaths_SpecifiedInPage_GetResolvedByViewEngine(string actionName)
{
var expected =
-@"
-Layout specified in page
+@"Layout specified in page
";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@@ -65,8 +64,7 @@ Layout specified in page
public async Task NonPartialLayoutPaths_GetResolvedByViewEngine(string actionName)
{
var expected =
-@"
-Page With Non Partial Layout
+@"Page With Non Partial Layout
";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@@ -86,7 +84,6 @@ public async Task PartialsCanBeSpecifiedWithPartialPath(string actionName)
{
var expected =
@"
-
Non Shared Partial
";
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TagHelpersTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TagHelpersTest.cs
index 02608163ba..383979c20c 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TagHelpersTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TagHelpersTest.cs
@@ -108,46 +108,34 @@ public static TheoryData TagHelpersAreInheritedFromViewImportsPagesData
{
"ViewWithLayoutAndNestedTagHelper",
@"layout:root-content
-
-
nested-content "
},
{
"ViewWithInheritedRemoveTagHelper",
@"layout:root-content
-
-
page:
nested-content "
},
{
"ViewWithInheritedTagHelperPrefix",
@"layout:root-content
-
-
page:root-content "
},
{
"ViewWithOverriddenTagHelperPrefix",
@"layout:root-content
-
-
page:root-content "
},
{
"ViewWithNestedInheritedTagHelperPrefix",
@"layout:root-content
-
-
page:root-content "
},
{
"ViewWithNestedOverriddenTagHelperPrefix",
@"layout:root-content
-
-
page:root-content "
},
};
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs
index 5eeff1bd97..b8c5eb2fcb 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs
@@ -31,7 +31,6 @@ public static IEnumerable RazorView_ExecutesPageAndLayoutData
{
"ViewWithLayout",
@"
-
ViewWithLayout-Content
"
};
@@ -39,7 +38,6 @@ public static IEnumerable RazorView_ExecutesPageAndLayoutData
{
"ViewWithFullPath",
@"
-
ViewWithFullPath-content
"
};
@@ -47,10 +45,8 @@ public static IEnumerable RazorView_ExecutesPageAndLayoutData
{
"ViewWithNestedLayout",
@"
-
/ViewEngine/ViewWithNestedLayout
-
ViewWithNestedLayout-Content
"
@@ -119,9 +115,7 @@ public async Task RazorView_PassesViewContextBetweenViewAndLayout()
{
var expected =
@"Page title
-
-partial-content
-component-content";
+partial-contentcomponent-content";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@@ -212,7 +206,6 @@ public static IEnumerable RazorViewEngine_RendersPartialViewsData
{
"PartialViewWithNamePassedIn",
@"
-
ViewWithLayout-Content
"
};
@@ -220,7 +213,6 @@ public static IEnumerable RazorViewEngine_RendersPartialViewsData
{
"ViewWithFullPath",
@"
-
ViewWithFullPath-content
"
};
@@ -228,10 +220,8 @@ public static IEnumerable RazorViewEngine_RendersPartialViewsData
{
"ViewWithNestedLayout",
@"
-
/PartialViewEngine/ViewWithNestedLayout
-
ViewWithNestedLayout-Content
"
@@ -270,7 +260,6 @@ public async Task LayoutValueIsPassedBetweenNestedViewStarts()
{
// Arrange
var expected = @"viewstart-value
-
~/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
index-content";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
@@ -288,8 +277,7 @@ public static IEnumerable RazorViewEngine_UsesExpandersForLayoutsData
get
{
var expected1 =
- @"
-View With Layout
+ @"View With Layout
";
yield return new[] { "en-GB", expected1 };
@@ -301,8 +289,7 @@ View With Layout
}
var expected2 =
- @"
-View With Layout
+ @"View With Layout
";
yield return new[] { "fr", expected2 };
@@ -352,11 +339,9 @@ public async Task ViewComponentsExecuteLayout()
// Arrange
var expected =
@"View With Component With Layout
-
Page Content
ViewComponent With Title
-
-Component With Layout ";
+Component With Layout ";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@@ -402,10 +387,8 @@ public async Task PartialsRenderedViaRenderPartialAsync_CanRenderLayouts()
{
// Arrange
var expected =
-@"
-Partial that specifies Layout
- Partial that does not specify Layout
- ";
+@"Partial that specifies Layout
+ Partial that does not specify Layout ";
var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
var client = server.CreateClient();
@@ -421,8 +404,7 @@ public async Task PartialsRenderedViaPartialAsync_CanRenderLayouts()
{
// Arrange
var expected =
-@"
-Partial that specifies Layout
+@"Partial that specifies Layout
Partial that does not specify Layout
";
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
index 23fc107021..90373040b9 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
@@ -21,7 +21,6 @@