Fix tests broken during conversion

pranavkm · pranavkm · commit 056a251b8c06 · 2017-02-02T10:41:28.000-08:00
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/TestProjectHelpers.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/xunit/TestProjectHelpers.cs
@@ -9,24 +9,27 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.xunit
 {
     public class TestProjectHelpers
     {
-            public static string GetProjectRoot()
-            {
-                var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
+        private const string SolutionName = "Hosting.sln";
 
-                var directoryInfo = new DirectoryInfo(applicationBasePath);
-                do
-                {
-                    var projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "project.json"));
-                    if (projectFileInfo.Exists)
-                    {
-                        return projectFileInfo.DirectoryName;
-                    }
+        public static string GetSolutionRoot()
+        {
+            var applicationName = PlatformServices.Default.Application.ApplicationName;
+            var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
 
-                    directoryInfo = directoryInfo.Parent;
+            var directoryInfo = new DirectoryInfo(applicationBasePath);
+            do
+            {
+                var projectFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, SolutionName));
+                if (projectFileInfo.Exists)
+                {
+                    return projectFileInfo.DirectoryName;
                 }
-                while (directoryInfo.Parent != null);
 
-                throw new Exception($"Project root could not be found using {applicationBasePath}");
+                directoryInfo = directoryInfo.Parent;
             }
+            while (directoryInfo.Parent != null);
+
+            throw new Exception($"Solution file {SolutionName} could not be found using {applicationBasePath}");
         }
     }
+}
diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs
@@ -1,17 +1,13 @@
 ﻿// 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.Diagnostics;
 using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.xunit;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using Xunit.Sdk;
 
 namespace Microsoft.AspNetCore.Hosting.FunctionalTests
 {
@@ -26,7 +22,7 @@ public void ShutdownTest()
                 .AddConsole()
                 .CreateLogger(nameof(ShutdownTest));
 
-            string applicationPath = Path.Combine(TestProjectHelpers.GetProjectRoot(), "..",
+            var applicationPath = Path.Combine(TestProjectHelpers.GetSolutionRoot(), "test",
                 "Microsoft.AspNetCore.Hosting.TestSites");
 
             var deploymentParameters = new DeploymentParameters(
