From 617586a984b1eff9ca0ca8126dd0b1dab2ea16f2 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 6 Nov 2018 10:31:33 -0800 Subject: [PATCH] Keep a couple of tests and remove most tests from 2.1 Fixes https://github.com/aspnet/MvcPrecompilation/issues/293 --- ...plicationUsingRelativePathsTest_CoreCLR.cs | 60 -------- ...ApplicationWithConfigureMvcTest_CoreCLR.cs | 62 -------- ...icationWithCustomInputFilesTest_CoreCLR.cs | 105 -------------- .../ApplicationWithParseErrorsTest_CoreCLR.cs | 50 ------- .../ApplicationWithTagHelpersTest_CoreCLR.cs | 60 -------- .../PublishWithDebugTest_CoreCLR.cs | 56 ------- ...PublishWithEmbedViewSourcesTest_CoreCLR.cs | 62 -------- .../CoreCLRTests/RazorPagesAppTest_CoreCLR.cs | 134 ----------------- .../RazorSdkNeitherUsedTest_CoreCLR.cs | 46 ------ .../RazorSdkPrecompilationUsedTest_CoreCLR.cs | 45 ------ .../CoreCLRTests/RazorSdkUsedTest_CoreCLR.cs | 47 ------ .../CoreCLRTests/SimpleAppTest_CoreCLR.cs | 2 +- ...SimpleAppWithAssemblyRenameTest_CoreCLR.cs | 52 ------- .../StrongNamedAppTest_CoreCLR.cs | 42 ------ .../ViewCompilationOptionsTest_CoreCLR.cs | 57 -------- ...plicationUsingRelativePathsTest_Desktop.cs | 63 -------- ...ApplicationWithConfigureMvcTest_Desktop.cs | 65 --------- ...icationWithCustomInputFilesTest_Desktop.cs | 108 -------------- .../ApplicationWithParseErrorsTest_Desktop.cs | 53 ------- .../ApplicationWithTagHelpersTest_Desktop.cs | 63 -------- .../PublishWithDebugTest_Desktop.cs | 59 -------- ...PublishWithEmbedViewSourcesTest_Desktop.cs | 65 --------- .../DesktopTests/RazorPagesAppTest_Desktop.cs | 137 ------------------ .../DesktopTests/SimpleAppTest_Desktop.cs | 2 +- ...SimpleAppWithAssemblyRenameTest_Desktop.cs | 55 ------- .../StrongNamedAppTest_Desktop.cs | 45 ------ .../ViewCompilationOptionsTest_Desktop.cs | 60 -------- ...mingPrecompiledViews.Manage.Home.Index.txt | 13 -- ...plicationUsingRelativePaths.Home.About.txt | 8 - ...plicationUsingRelativePaths.Home.Index.txt | 8 - ...ApplicationWithConfigureMvc.Home.Index.txt | 2 - ...ConfigureMvc.Home.ViewWithPreprocessor.txt | 1 - ...hRazorSdkPrecompilationUsed.Home.Index.txt | 8 - ...ApplicationWithRazorSdkUsed.Home.Index.txt | 8 - ...hTagHelpers.Home.ClassLibraryTagHelper.txt | 25 ---- ...tionWithTagHelpers.Home.LocalTagHelper.txt | 25 ---- .../Resources/RazorPages.Index.txt | 2 - ...ages.Nested1.Nested2.PageWithTagHelper.txt | 2 - .../Resources/RazorPages.PageWithModel.txt | 2 - .../Resources/RazorPages.PageWithRoute.txt | 2 - ...leAppWithAssemblyRenameTest.Home.Index.txt | 2 - .../Resources/StrongNamedApp.Home.Index.txt | 1 - 42 files changed, 2 insertions(+), 1762 deletions(-) delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationWithConfigureMvcTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationWithCustomInputFilesTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/PublishWithEmbedViewSourcesTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/RazorSdkNeitherUsedTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/RazorSdkPrecompilationUsedTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/RazorSdkUsedTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/SimpleAppWithAssemblyRenameTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/StrongNamedAppTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/CoreCLRTests/ViewCompilationOptionsTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationWithConfigureMvcTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationWithCustomInputFilesTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/PublishWithEmbedViewSourcesTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/RazorPagesAppTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/SimpleAppWithAssemblyRenameTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/StrongNamedAppTest_Desktop.cs delete mode 100644 test/FunctionalTests/DesktopTests/ViewCompilationOptionsTest_Desktop.cs delete mode 100644 test/FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.About.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithRazorSdkPrecompilationUsed.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithRazorSdkUsed.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt delete mode 100644 test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt delete mode 100644 test/FunctionalTests/Resources/RazorPages.Index.txt delete mode 100644 test/FunctionalTests/Resources/RazorPages.Nested1.Nested2.PageWithTagHelper.txt delete mode 100644 test/FunctionalTests/Resources/RazorPages.PageWithModel.txt delete mode 100644 test/FunctionalTests/Resources/RazorPages.PageWithRoute.txt delete mode 100644 test/FunctionalTests/Resources/SimpleAppWithAssemblyRenameTest.Home.Index.txt delete mode 100644 test/FunctionalTests/Resources/StrongNamedApp.Home.Index.txt diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs deleted file mode 100644 index e115718137..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ApplicationUsingRelativePathsTest_CoreCLR : - LoggedTest, IClassFixture> - { - public ApplicationUsingRelativePathsTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_WorksForViewsUsingRelativePath() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.Index.txt", response); - } - } - - [Fact] - public async Task Precompilation_WorksForViewsUsingDirectoryTraversal() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.About.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithConfigureMvcTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithConfigureMvcTest_CoreCLR.cs deleted file mode 100644 index 0916f7af1e..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithConfigureMvcTest_CoreCLR.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ApplicationWithConfigureMvcTest_CoreCLR - : LoggedTest, IClassFixture> - { - public ApplicationWithConfigureMvcTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_RunsConfiguredCompilationCallbacks() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationWithConfigureMvc.Home.Index.txt", response); - } - } - - [Fact] - public async Task Precompilation_UsesConfiguredParseOptions() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/ViewWithPreprocessor", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent( - "ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt", - response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithCustomInputFilesTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithCustomInputFilesTest_CoreCLR.cs deleted file mode 100644 index bce4f0a260..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithCustomInputFilesTest_CoreCLR.cs +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ApplicationWithCustomInputFilesTest_CoreCLR - : LoggedTest, IClassFixture> - { - public ApplicationWithCustomInputFilesTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task ApplicationWithCustomInputFiles_Works() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var expectedText = "Hello Index!"; - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - Assert.Equal(expectedText, response.Trim()); - } - } - - [Fact] - public async Task MvcRazorFilesToCompile_OverridesTheFilesToBeCompiled() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var expectedViews = new[] - { - "/Views/Home/About.cshtml", - "/Views/Home/Index.cshtml", - }; - - // Act - var response2 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/GetPrecompiledResourceNames", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - var actual = response2.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) - .OrderBy(p => p, StringComparer.OrdinalIgnoreCase); - Assert.Equal(expectedViews, actual); - } - } - - [Fact] - public async Task MvcRazorFilesToCompile_SpecificallyDoesNotPublishFilesToBeCompiled() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var viewsNotPublished = new[] - { - "Index.cshtml", - "About.cshtml", - }; - - var viewsPublished = new[] - { - "NotIncluded.cshtml", - }; - var viewsDirectory = Path.Combine(deployment.ContentRoot, "Views", "Home"); - - // Act & Assert - foreach (var file in viewsPublished) - { - var filePath = Path.Combine(viewsDirectory, file); - Assert.True(File.Exists(filePath), $"{filePath} was not published."); - } - - foreach (var file in viewsNotPublished) - { - var filePath = Path.Combine(viewsDirectory, file); - Assert.False(File.Exists(filePath), $"{filePath} was published."); - } - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs deleted file mode 100644 index 77159e5e13..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; - -namespace FunctionalTests -{ - public class ApplicationWithParseErrorsTest_CoreCLR - : IClassFixture> - { - public ApplicationWithParseErrorsTest_CoreCLR(CoreCLRApplicationTestFixture fixture) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task PublishingPrintsParseErrors() - { - // Arrange - var applicationPath = ApplicationPaths.GetTestAppDirectory("ApplicationWithParseErrors"); - var indexPath = Path.Combine(applicationPath, "Views", "Home", "Index.cshtml"); - var viewImportsPath = Path.Combine(applicationPath, "Views", "Home", "About.cshtml"); - var expectedErrors = new[] - { - indexPath + " (0): The code block is missing a closing \"}\" character. Make sure you have a matching \"}\" character for all the \"{\" characters within this block, and that none of the \"}\" characters are being interpreted as markup.", - viewImportsPath + " (1): A space or line break was encountered after the \"@\" character. Only valid identifiers, keywords, comments, \"(\" and \"{\" are valid at the start of a code block and they must occur immediately following \"@\" with no space in between.", - - }; - var testSink = new TestSink(); - var loggerFactory = new TestLoggerFactory(testSink, enabled: true); - - // Act - await Assert.ThrowsAsync(() => Fixture.CreateDeploymentAsync(loggerFactory)); - - // Assert - var logs = testSink.Writes.Select(w => w.State.ToString().Trim()).ToList(); - foreach (var expectedError in expectedErrors) - { - Assert.Contains(logs, log => log.Contains(expectedError)); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs deleted file mode 100644 index b1d3664da6..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ApplicationWithTagHelpersTest_CoreCLR : - LoggedTest, IClassFixture> - { - public ApplicationWithTagHelpersTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_WorksForViewsThatUseTagHelpersFromProjectReferences() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/ClassLibraryTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt", response); - } - } - - [Fact] - public async Task Precompilation_WorksForViewsThatUseTagHelpersFromCurrentProject() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/LocalTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.LocalTagHelper.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs deleted file mode 100644 index c66e4b68a5..0000000000 --- a/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class PublishWithDebugTest_CoreCLR : - LoggedTest, IClassFixture - { - public PublishWithDebugTest_CoreCLR( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task PublishingInDebugWorks() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Assert - var expected = Path.Combine(deployment.ContentRoot, $"{Fixture.ApplicationName}.PrecompiledViews.dll"); - Assert.True(File.Exists(expected), $"File {expected} does not exist."); - } - } - - public class TestFixture : CoreCLRApplicationTestFixture - { - public TestFixture() - { - PublishOnly = true; - } - - protected override DeploymentParameters GetDeploymentParameters() - { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.Configuration = "Debug"; - - return deploymentParameters; - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/PublishWithEmbedViewSourcesTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/PublishWithEmbedViewSourcesTest_CoreCLR.cs deleted file mode 100644 index b6a3e54ae7..0000000000 --- a/test/FunctionalTests/CoreCLRTests/PublishWithEmbedViewSourcesTest_CoreCLR.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class PublishWithEmbedViewSourcesTest_CoreCLR - : LoggedTest, IClassFixture> - { - public PublishWithEmbedViewSourcesTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_CanEmbedViewSourcesAsResources() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var logger = loggerFactory.CreateLogger(Fixture.ApplicationName); - var expectedViews = new[] - { - "/Areas/TestArea/Views/Home/Index.cshtml", - "/Views/Home/About.cshtml", - "/Views/Home/Index.cshtml", - }; - var expectedText = "Hello Index!"; - - // Act - 1 - var response1 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/Index", - logger); - - // Assert - 1 - Assert.Equal(expectedText, response1.Trim()); - - // Act - 2 - var response2 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/GetPrecompiledResourceNames", - logger); - - // Assert - 2 - var actual = response2.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) - .OrderBy(p => p, StringComparer.OrdinalIgnoreCase); - Assert.Equal(expectedViews, actual); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs deleted file mode 100644 index 9c9a107cb8..0000000000 --- a/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class RazorPagesAppTest_CoreCLR : - LoggedTest, IClassFixture> - { - public RazorPagesAppTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksForIndexPage_UsingFolderName() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Index.txt", response); - } - } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksForIndexPage_UsingFileName() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/Index", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Index.txt", response); - } - } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksForPageWithModel() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/PageWithModel?person=Dan", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.PageWithModel.txt", response); - } - } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksForPageWithRoute() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/PageWithRoute/Dan", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.PageWithRoute.txt", response); - } - } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksForPageInNestedFolder() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/Nested1/Nested2/PageWithTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Nested1.Nested2.PageWithTagHelper.txt", response); - } - } - - [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] - public async Task Precompilation_WorksWithPageConventions() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await RetryHelper.RetryRequest( - () => deployment.HttpClient.GetAsync("/Auth/Index"), - loggerFactory.CreateLogger(Fixture.ApplicationName), - retryCount: 5); - - // Assert - Assert.Equal("/Login?ReturnUrl=%2FAuth%2FIndex", response.RequestMessage.RequestUri.PathAndQuery); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/RazorSdkNeitherUsedTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/RazorSdkNeitherUsedTest_CoreCLR.cs deleted file mode 100644 index faea04ab38..0000000000 --- a/test/FunctionalTests/CoreCLRTests/RazorSdkNeitherUsedTest_CoreCLR.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - // Tests that cover cases where both Razor SDK and MvcPrecompilation are installed. This is the default in 2.1 - public class RazorSdkNeitherUsedTest_CoreCLR : LoggedTest, IClassFixture> - { - public RazorSdkNeitherUsedTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Publish_HasNoPrecompilation() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await RetryHelper.RetryRequest( - () => deployment.HttpClient.GetAsync(deployment.ApplicationBaseUri), - loggerFactory.CreateLogger(Fixture.ApplicationName), - retryCount: 5); - - // Assert - Assert.False(File.Exists(Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkNeitherUsed.PrecompiledViews.dll"))); - Assert.False(File.Exists(Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkNeitherUsed.Views.dll"))); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/RazorSdkPrecompilationUsedTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/RazorSdkPrecompilationUsedTest_CoreCLR.cs deleted file mode 100644 index 130553d855..0000000000 --- a/test/FunctionalTests/CoreCLRTests/RazorSdkPrecompilationUsedTest_CoreCLR.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - // Tests that cover cases where both Razor SDK and MvcPrecompilation are installed. This is the default in 2.1 - public class RazorSdkPrecompilationUsedTest_CoreCLR : LoggedTest, IClassFixture> - { - public RazorSdkPrecompilationUsedTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Publish_UsesRazorSDK() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - Assert.True(File.Exists(Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkPrecompilationUsed.PrecompiledViews.dll"))); - Assert.False(File.Exists(Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkPrecompilationUsed.Views.dll"))); - TestEmbeddedResource.AssertContent("ApplicationWithRazorSdkPrecompilationUsed.Home.Index.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/RazorSdkUsedTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/RazorSdkUsedTest_CoreCLR.cs deleted file mode 100644 index 6f1a4ff918..0000000000 --- a/test/FunctionalTests/CoreCLRTests/RazorSdkUsedTest_CoreCLR.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - // Tests that cover cases where both Razor SDK and MvcPrecompilation are installed. This is the default in 2.1 - public class RazorSdkUsedTest_CoreCLR : LoggedTest, IClassFixture> - { - public RazorSdkUsedTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Publish_UsesRazorSDK() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var expectedViewLocation = Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkUsed.Views.dll"); - var expectedPrecompiledViewsLocation = Path.Combine(deployment.ContentRoot, "ApplicationWithRazorSdkUsed.PrecompiledViews.dll"); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - Assert.False(File.Exists(expectedPrecompiledViewsLocation), $"{expectedPrecompiledViewsLocation} existed, but shouldn't have."); - Assert.True(File.Exists(expectedViewLocation), $"{expectedViewLocation} didn't exist."); - TestEmbeddedResource.AssertContent("ApplicationWithRazorSdkUsed.Home.Index.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs index 9b90c31a17..30ecf38d36 100644 --- a/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs @@ -22,7 +22,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [Fact(Skip = "Unblocking the build - https://github.com/aspnet/MvcPrecompilation/issues/224")] + [Fact] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/test/FunctionalTests/CoreCLRTests/SimpleAppWithAssemblyRenameTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/SimpleAppWithAssemblyRenameTest_CoreCLR.cs deleted file mode 100644 index dddd8cf097..0000000000 --- a/test/FunctionalTests/CoreCLRTests/SimpleAppWithAssemblyRenameTest_CoreCLR.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class SimpleAppWithAssemblyRenameTest_CoreCLR : - LoggedTest, IClassFixture - { - public SimpleAppWithAssemblyRenameTest_CoreCLR( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_WorksForSimpleApps() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("SimpleAppWithAssemblyRenameTest.Home.Index.txt", response); - } - } - - public class TestFixture : CoreCLRApplicationTestFixture - { - public TestFixture() - : base( - typeof(SimpleAppWithAssemblyRename.Startup).Assembly.GetName().Name, - ApplicationPaths.GetTestAppDirectory(nameof(SimpleAppWithAssemblyRename))) - { - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/StrongNamedAppTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/StrongNamedAppTest_CoreCLR.cs deleted file mode 100644 index 4559a416fa..0000000000 --- a/test/FunctionalTests/CoreCLRTests/StrongNamedAppTest_CoreCLR.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class StrongNamedAppTest_CoreCLR : - LoggedTest, IClassFixture> - { - public StrongNamedAppTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task PrecompiledAssembliesUseSameStrongNameAsApplication() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("StrongNamedApp.Home.Index.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/ViewCompilationOptionsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ViewCompilationOptionsTest_CoreCLR.cs deleted file mode 100644 index 6b80eca31d..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ViewCompilationOptionsTest_CoreCLR.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ViewCompilationOptions_CoreCLR_ScenarioRefAssembliesDoNotGetPublished : - LoggedTest, IClassFixture - { - public ViewCompilationOptions_CoreCLR_ScenarioRefAssembliesDoNotGetPublished( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task PublishingWithOption_AllowsPublishingRefAssemblies() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act & Assert - Assert.True(Directory.Exists(Path.Combine(deployment.ContentRoot, "refs"))); - } - } - - public class TestFixture : CoreCLRApplicationTestFixture - { - public TestFixture() - { - PublishOnly = true; - } - - protected override DeploymentParameters GetDeploymentParameters() - { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.PublishEnvironmentVariables.Add( - new KeyValuePair("MvcRazorExcludeRefAssembliesFromPublish", "false")); - - return deploymentParameters; - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs deleted file mode 100644 index 4122fb7b65..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationUsingRelativePathsTest_Desktop : - LoggedTest, IClassFixture> - { - public ApplicationUsingRelativePathsTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsUsingRelativePath() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.Index.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsUsingDirectoryTraversal() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.About.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithConfigureMvcTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithConfigureMvcTest_Desktop.cs deleted file mode 100644 index 5e2db02762..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationWithConfigureMvcTest_Desktop.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationWithConfigureMvcTest_Desktop - : LoggedTest, IClassFixture> - { - public ApplicationWithConfigureMvcTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_RunsConfiguredCompilationCallbacks() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationWithConfigureMvc.Home.Index.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_UsesConfiguredParseOptions() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/ViewWithPreprocessor", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent( - "ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt", - response); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithCustomInputFilesTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithCustomInputFilesTest_Desktop.cs deleted file mode 100644 index cd519e5518..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationWithCustomInputFilesTest_Desktop.cs +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationWithCustomInputFilesTest_Desktop - : LoggedTest, IClassFixture> - { - public ApplicationWithCustomInputFilesTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task ApplicationWithCustomInputFiles_Works() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var expectedText = "Hello Index!"; - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - Assert.Equal(expectedText, response.Trim()); - } - } - - [ConditionalFact] - public async Task MvcRazorFilesToCompile_OverridesTheFilesToBeCompiled() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var expectedViews = new[] - { - "/Views/Home/About.cshtml", - "/Views/Home/Index.cshtml", - }; - - // Act - var response2 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/GetPrecompiledResourceNames", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - var actual = response2.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) - .OrderBy(p => p, StringComparer.OrdinalIgnoreCase); - Assert.Equal(expectedViews, actual); - } - } - - [ConditionalFact] - public async Task MvcRazorFilesToCompile_SpecificallyDoesNotPublishFilesToBeCompiled() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var viewsNotPublished = new[] - { - "Index.cshtml", - "About.cshtml", - }; - - var viewsPublished = new[] - { - "NotIncluded.cshtml", - }; - var viewsDirectory = Path.Combine(deployment.ContentRoot, "Views", "Home"); - - // Act & Assert - foreach (var file in viewsPublished) - { - var filePath = Path.Combine(viewsDirectory, file); - Assert.True(File.Exists(filePath), $"{filePath} was not published."); - } - - foreach (var file in viewsNotPublished) - { - var filePath = Path.Combine(viewsDirectory, file); - Assert.False(File.Exists(filePath), $"{filePath} was published."); - } - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs deleted file mode 100644 index 587cbd9b32..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationWithParseErrorsTest_Desktop - : IClassFixture> - { - public ApplicationWithParseErrorsTest_Desktop(DesktopApplicationTestFixture fixture) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task PublishingPrintsParseErrors() - { - // Arrange - var applicationPath = ApplicationPaths.GetTestAppDirectory("ApplicationWithParseErrors"); - var indexPath = Path.Combine(applicationPath, "Views", "Home", "Index.cshtml"); - var viewImportsPath = Path.Combine(applicationPath, "Views", "Home", "About.cshtml"); - var expectedErrors = new[] - { - indexPath + " (0): The code block is missing a closing \"}\" character. Make sure you have a matching \"}\" character for all the \"{\" characters within this block, and that none of the \"}\" characters are being interpreted as markup.", - viewImportsPath + " (1): A space or line break was encountered after the \"@\" character. Only valid identifiers, keywords, comments, \"(\" and \"{\" are valid at the start of a code block and they must occur immediately following \"@\" with no space in between.", - - }; - var testSink = new TestSink(); - var loggerFactory = new TestLoggerFactory(testSink, enabled: true); - - // Act - await Assert.ThrowsAsync(() => Fixture.CreateDeploymentAsync(loggerFactory)); - - // Assert - var logs = testSink.Writes.Select(w => w.State.ToString().Trim()).ToList(); - foreach (var expectedError in expectedErrors) - { - Assert.Contains(logs, log => log.Contains(expectedError)); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs deleted file mode 100644 index 8b3508be2b..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationWithTagHelpersTest_Desktop : - LoggedTest, IClassFixture> - { - public ApplicationWithTagHelpersTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsThatUseTagHelpersFromProjectReferences() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/ClassLibraryTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsThatUseTagHelpersFromCurrentProject() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/LocalTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.LocalTagHelper.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs b/test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs deleted file mode 100644 index 8dd660f420..0000000000 --- a/test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class PublishWithDebugTest_Desktop : - LoggedTest, IClassFixture - { - public PublishWithDebugTest_Desktop( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task PublishingInDebugWorks() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Assert - var expected = Path.Combine(deployment.ContentRoot, $"{Fixture.ApplicationName}.PrecompiledViews.dll"); - Assert.True(File.Exists(expected), $"File {expected} does not exist."); - } - } - - public class TestFixture : DesktopApplicationTestFixture - { - public TestFixture() - { - PublishOnly = true; - } - - protected override DeploymentParameters GetDeploymentParameters() - { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.Configuration = "Debug"; - - return deploymentParameters; - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/PublishWithEmbedViewSourcesTest_Desktop.cs b/test/FunctionalTests/DesktopTests/PublishWithEmbedViewSourcesTest_Desktop.cs deleted file mode 100644 index eea2b45da7..0000000000 --- a/test/FunctionalTests/DesktopTests/PublishWithEmbedViewSourcesTest_Desktop.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class PublishWithEmbedViewSourcesTest_Desktop - : LoggedTest, IClassFixture> - { - public PublishWithEmbedViewSourcesTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_CanEmbedViewSourcesAsResources() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - var logger = loggerFactory.CreateLogger(Fixture.ApplicationName); - var expectedViews = new[] - { - "/Areas/TestArea/Views/Home/Index.cshtml", - "/Views/Home/About.cshtml", - "/Views/Home/Index.cshtml", - }; - var expectedText = "Hello Index!"; - - // Act - 1 - var response1 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/Index", - logger); - - // Assert - 1 - Assert.Equal(expectedText, response1.Trim()); - - // Act - 2 - var response2 = await deployment.HttpClient.GetStringWithRetryAsync( - "Home/GetPrecompiledResourceNames", - logger); - - // Assert - 2 - var actual = response2.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) - .OrderBy(p => p, StringComparer.OrdinalIgnoreCase); - Assert.Equal(expectedViews, actual); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/RazorPagesAppTest_Desktop.cs b/test/FunctionalTests/DesktopTests/RazorPagesAppTest_Desktop.cs deleted file mode 100644 index bbdf42bdaf..0000000000 --- a/test/FunctionalTests/DesktopTests/RazorPagesAppTest_Desktop.cs +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class RazorPagesAppTest_Desktop : - LoggedTest, IClassFixture> - { - public RazorPagesAppTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_WorksForIndexPage_UsingFolderName() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Index.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForIndexPage_UsingFileName() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/Index", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Index.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForPageWithModel() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/PageWithModel?person=Dan", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.PageWithModel.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForPageWithRoute() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/PageWithRoute/Dan", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.PageWithRoute.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForPageInNestedFolder() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - "/Nested1/Nested2/PageWithTagHelper", - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("RazorPages.Nested1.Nested2.PageWithTagHelper.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksWithPageConventions() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await RetryHelper.RetryRequest( - () => deployment.HttpClient.GetAsync("/Auth/Index"), - loggerFactory.CreateLogger(Fixture.ApplicationName), - retryCount: 5); - - // Assert - Assert.Equal("/Login?ReturnUrl=%2FAuth%2FIndex", response.RequestMessage.RequestUri.PathAndQuery); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs b/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs index fb70a5a53e..e3fa91caa5 100644 --- a/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs @@ -25,7 +25,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [ConditionalFact(Skip = "Unblocking the build - https://github.com/aspnet/MvcPrecompilation/issues/224")] + [ConditionalFact] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/test/FunctionalTests/DesktopTests/SimpleAppWithAssemblyRenameTest_Desktop.cs b/test/FunctionalTests/DesktopTests/SimpleAppWithAssemblyRenameTest_Desktop.cs deleted file mode 100644 index bb16ce3dea..0000000000 --- a/test/FunctionalTests/DesktopTests/SimpleAppWithAssemblyRenameTest_Desktop.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class SimpleAppWithAssemblyRenameTest_Desktop : - LoggedTest, IClassFixture - { - public SimpleAppWithAssemblyRenameTest_Desktop( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_WorksForSimpleApps() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("SimpleAppWithAssemblyRenameTest.Home.Index.txt", response); - } - } - - public class TestFixture : DesktopApplicationTestFixture - { - public TestFixture() - : base( - typeof(SimpleAppWithAssemblyRename.Startup).Assembly.GetName().Name, - ApplicationPaths.GetTestAppDirectory(nameof(SimpleAppWithAssemblyRename))) - { - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/StrongNamedAppTest_Desktop.cs b/test/FunctionalTests/DesktopTests/StrongNamedAppTest_Desktop.cs deleted file mode 100644 index 16f63fbe3b..0000000000 --- a/test/FunctionalTests/DesktopTests/StrongNamedAppTest_Desktop.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class StrongNamedAppTest_Desktop : - LoggedTest, IClassFixture> - { - public StrongNamedAppTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task PrecompiledAssembliesUseSameStrongNameAsApplication() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("StrongNamedApp.Home.Index.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ViewCompilationOptionsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ViewCompilationOptionsTest_Desktop.cs deleted file mode 100644 index 053b7456a9..0000000000 --- a/test/FunctionalTests/DesktopTests/ViewCompilationOptionsTest_Desktop.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ViewCompilationOptions_Desktop_ScenarioRefAssembliesDoNotGetPublished : - LoggedTest, IClassFixture - { - public ViewCompilationOptions_Desktop_ScenarioRefAssembliesDoNotGetPublished( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task PublishingWithOption_AllowsPublishingRefAssemblies() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act & Assert - Assert.True(Directory.Exists(Path.Combine(deployment.ContentRoot, "refs"))); - } - } - - public class TestFixture : DesktopApplicationTestFixture - { - public TestFixture() - { - PublishOnly = true; - } - - protected override DeploymentParameters GetDeploymentParameters() - { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.PublishEnvironmentVariables.Add( - new KeyValuePair("MvcRazorExcludeRefAssembliesFromPublish", "false")); - - return deploymentParameters; - } - } - } -} diff --git a/test/FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt b/test/FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt deleted file mode 100644 index e4baad155e..0000000000 --- a/test/FunctionalTests/Resources/ApplicationConsumingPrecompiledViews.Manage.Home.Index.txt +++ /dev/null @@ -1,13 +0,0 @@ - - - - ClassLibraryWithPrecompiledViews.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - -

Admin home page

- - - - Test section - - - diff --git a/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.About.txt b/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.About.txt deleted file mode 100644 index c3b073162c..0000000000 --- a/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.About.txt +++ /dev/null @@ -1,8 +0,0 @@ - - - - -ApplicationUsingRelativePaths.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -Hello from Index! - - \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.Index.txt b/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.Index.txt deleted file mode 100644 index c3b073162c..0000000000 --- a/test/FunctionalTests/Resources/ApplicationUsingRelativePaths.Home.Index.txt +++ /dev/null @@ -1,8 +0,0 @@ - - - - -ApplicationUsingRelativePaths.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -Hello from Index! - - \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt b/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt deleted file mode 100644 index 6ed3f16836..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.Index.txt +++ /dev/null @@ -1,2 +0,0 @@ -ApplicationWithConfigureMvc.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -
Hello world! \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt b/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt deleted file mode 100644 index 8d0df2adff..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithConfigureMvc.Home.ViewWithPreprocessor.txt +++ /dev/null @@ -1 +0,0 @@ -Hello from Test123 \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationWithRazorSdkPrecompilationUsed.Home.Index.txt b/test/FunctionalTests/Resources/ApplicationWithRazorSdkPrecompilationUsed.Home.Index.txt deleted file mode 100644 index ed399bf490..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithRazorSdkPrecompilationUsed.Home.Index.txt +++ /dev/null @@ -1,8 +0,0 @@ - - - - -ApplicationWithRazorSdkPrecompilationUsed.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -Hello from Index! - - \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationWithRazorSdkUsed.Home.Index.txt b/test/FunctionalTests/Resources/ApplicationWithRazorSdkUsed.Home.Index.txt deleted file mode 100644 index ed93ca56a8..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithRazorSdkUsed.Home.Index.txt +++ /dev/null @@ -1,8 +0,0 @@ - - - - -ApplicationWithRazorSdkUsed.Views, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -Hello from Index! - - \ No newline at end of file diff --git a/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt b/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt deleted file mode 100644 index f3a28a4d23..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.ClassLibraryTagHelper.txt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ApplicationWithTagHelpers - - - - -
- -ApplicationWithTagHelpers.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -
To boldy tag that no one has ever tagged before...
- - - - -
-
-

© 2016 - ApplicationWithTagHelpers

-
-
- - ApplicationWithTagHelpers.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - diff --git a/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt b/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt deleted file mode 100644 index 43afc098bd..0000000000 --- a/test/FunctionalTests/Resources/ApplicationWithTagHelpers.Home.LocalTagHelper.txt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ApplicationWithTagHelpers - - - - -
- -ApplicationWithTagHelpers.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -TestTagHelper content. - - - - -
-
-

© 2016 - ApplicationWithTagHelpers

-
-
- - ApplicationWithTagHelpers.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - diff --git a/test/FunctionalTests/Resources/RazorPages.Index.txt b/test/FunctionalTests/Resources/RazorPages.Index.txt deleted file mode 100644 index ff3f1d2458..0000000000 --- a/test/FunctionalTests/Resources/RazorPages.Index.txt +++ /dev/null @@ -1,2 +0,0 @@ - -Hello world! \ No newline at end of file diff --git a/test/FunctionalTests/Resources/RazorPages.Nested1.Nested2.PageWithTagHelper.txt b/test/FunctionalTests/Resources/RazorPages.Nested1.Nested2.PageWithTagHelper.txt deleted file mode 100644 index 9cf6533fae..0000000000 --- a/test/FunctionalTests/Resources/RazorPages.Nested1.Nested2.PageWithTagHelper.txt +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/test/FunctionalTests/Resources/RazorPages.PageWithModel.txt b/test/FunctionalTests/Resources/RazorPages.PageWithModel.txt deleted file mode 100644 index 1cdbdae92e..0000000000 --- a/test/FunctionalTests/Resources/RazorPages.PageWithModel.txt +++ /dev/null @@ -1,2 +0,0 @@ - -Greetings Dan! \ No newline at end of file diff --git a/test/FunctionalTests/Resources/RazorPages.PageWithRoute.txt b/test/FunctionalTests/Resources/RazorPages.PageWithRoute.txt deleted file mode 100644 index 1cdbdae92e..0000000000 --- a/test/FunctionalTests/Resources/RazorPages.PageWithRoute.txt +++ /dev/null @@ -1,2 +0,0 @@ - -Greetings Dan! \ No newline at end of file diff --git a/test/FunctionalTests/Resources/SimpleAppWithAssemblyRenameTest.Home.Index.txt b/test/FunctionalTests/Resources/SimpleAppWithAssemblyRenameTest.Home.Index.txt deleted file mode 100644 index 29d346230b..0000000000 --- a/test/FunctionalTests/Resources/SimpleAppWithAssemblyRenameTest.Home.Index.txt +++ /dev/null @@ -1,2 +0,0 @@ - -NewAssemblyName.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/test/FunctionalTests/Resources/StrongNamedApp.Home.Index.txt b/test/FunctionalTests/Resources/StrongNamedApp.Home.Index.txt deleted file mode 100644 index edfb07d5d7..0000000000 --- a/test/FunctionalTests/Resources/StrongNamedApp.Home.Index.txt +++ /dev/null @@ -1 +0,0 @@ -Hello from view in StrongNamedApp.PrecompiledViews, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60