From 04f74edd8537bf524a9840b5f81cbfc19996f6e7 Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 23 May 2017 13:20:36 -0700 Subject: [PATCH] Revert "Disable building and testing FSharpWebSite to unblock the mirror when using latest CLI" This reverts commit b28002a9e530f4303ba216ee2dd670693b53e214. --- .../FSharpWebSiteTest.cs | 74 +++++++++---------- ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs index 5a59c9a229..44c50206cb 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs @@ -1,44 +1,44 @@ -// // 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. +// 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.Net; -// using System.Net.Http; -// using System.Threading.Tasks; -// using Xunit; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Xunit; -// namespace Microsoft.AspNetCore.Mvc.FunctionalTests -// { -// public class FSharpWebSiteTest : IClassFixture> -// { -// public FSharpWebSiteTest(MvcTestFixture fixture) -// { -// Client = fixture.Client; -// } +namespace Microsoft.AspNetCore.Mvc.FunctionalTests +{ + public class FSharpWebSiteTest : IClassFixture> + { + public FSharpWebSiteTest(MvcTestFixture fixture) + { + Client = fixture.Client; + } -// public HttpClient Client { get; } + public HttpClient Client { get; } -// [Fact] -// public async Task HomeIndex_ReturnsHtml() -// { -// // Act -// var response = await Client.GetAsync("http://localhost/"); -// var responseBody = await response.Content.ReadAsStringAsync(); + [Fact] + public async Task HomeIndex_ReturnsHtml() + { + // Act + var response = await Client.GetAsync("http://localhost/"); + var responseBody = await response.Content.ReadAsStringAsync(); -// // Assert -// Assert.Equal(HttpStatusCode.OK, response.StatusCode); -// Assert.Contains("

Hello from FSharpWebSite

", responseBody); -// } + // Assert + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Contains("

Hello from FSharpWebSite

", responseBody); + } -// [Fact] -// public async Task HomeAsyncAction_ReturnsContentAsynchronously() -// { -// // Act -// var response = await Client.GetAsync("http://localhost/home/asyncaction"); -// var responseBody = await response.Content.ReadAsStringAsync(); + [Fact] + public async Task HomeAsyncAction_ReturnsContentAsynchronously() + { + // Act + var response = await Client.GetAsync("http://localhost/home/asyncaction"); + var responseBody = await response.Content.ReadAsStringAsync(); -// // Assert -// Assert.Equal(HttpStatusCode.OK, response.StatusCode); -// Assert.Contains("Action completed asynchronously", responseBody); -// } -// } -// } + // Assert + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Contains("Action completed asynchronously", responseBody); + } + } +} diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 17b6030ae7..656d977670 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -31,7 +31,7 @@ - +