Splitting EndToEnd tests out into their own project

Author: mathewc

WebJobs.Script.proj

@@ -154,19 +154,28 @@
   <Target Name="TestBuild" DependsOnTargets="CheckSkipStrongNames;Build">
     <ItemGroup>
       <UnitTestProjects Include="test\WebJobs.Script.Tests\WebJobs.Script.Tests.csproj"/>
+	  <IntegrationTestProjects Include="test\WebJobs.Script.Tests.Integration\WebJobs.Script.Tests.Integration.csproj"/>
     </ItemGroup>
 
     <MSBuild Projects="@(UnitTestProjects)"
-     
              Properties="$(SetConfiguration); $(SetPlatform)"
              BuildInParallel="$(BuildInParallel)">
       <Output TaskParameter="TargetOutputs" ItemName="UnitTestAssemblies"/>
     </MSBuild>
+    <MSBuild Projects="@(IntegrationTestProjects)"
+             Properties="$(SetConfiguration); $(SetPlatform)"
+             BuildInParallel="$(BuildInParallel)">
+      <Output TaskParameter="TargetOutputs" ItemName="IntegrationTestAssemblies"/>
+    </MSBuild>
   </Target>
 
   <Target Name="UnitTest" DependsOnTargets="TestBuild">
     <xunit Assemblies="@(UnitTestAssemblies)" ExcludeTraits="$(ExcludedTestTraits)" />
   </Target>
+  
+  <Target Name="IntegrationTest" DependsOnTargets="TestBuild">
+    <xunit Assemblies="@(IntegrationTestAssemblies)" ExcludeTraits="$(ExcludedTestTraits)" />
+  </Target>
 
   <PropertyGroup Condition=" '$(APPVEYOR_API_URL)' != '' ">
     <AppveyorModules>mocha-appveyor-reporter</AppveyorModules>
@@ -180,7 +189,7 @@
 
   <Target Name="MochaTest" DependsOnTargets="TestBuild" AfterTargets="UnitTest">
     <Exec Command="npm i mocha chai $(AppveyorModules)" />
-    <Exec Command=".\node_modules\.bin\mocha .\test\WebJobs.Script.Tests\TestScripts\Node\*.tests.js $(AppveyorReporter) --config=$(BuildConfiguration)" />
+    <Exec Command=".\node_modules\.bin\mocha .\test\WebJobs.Script.Tests.Integration\TestScripts\Node\*.tests.js $(AppveyorReporter) --config=$(BuildConfiguration)" />
   </Target>
 
   <Target Name="Clean" DependsOnTargets="GetBinplace">

WebJobs.Script.sln

@@ -410,7 +410,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebHook-Generic-CSharp-Dyna
 		sample\WebHook-Generic-CSharp-Dynamic\run.csx = sample\WebHook-Generic-CSharp-Dynamic\run.csx
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Script.Tests.Integration", "test\WebJobs.Script.Tests.Integration\WebJobs.Script.Tests.Integration.csproj", "{35A2025D-F68A-4B57-83A2-ED4EB9C3894D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WebJobs.Script.Tests.Shared", "test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.shproj", "{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{35a2025d-f68a-4b57-83a2-ed4eb9c3894d}*SharedItemsImports = 4
+		test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{35c9ccb7-d8b6-4161-bb0d-bcfa7c6dcffb}*SharedItemsImports = 13
+		test\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems*{38c609d3-b126-43b0-b9d8-6d62faee2abc}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -440,6 +449,10 @@ Global
 		{479B0873-CBDC-4AE9-85BA-DD6CF2DCA29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{479B0873-CBDC-4AE9-85BA-DD6CF2DCA29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{479B0873-CBDC-4AE9-85BA-DD6CF2DCA29D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35A2025D-F68A-4B57-83A2-ED4EB9C3894D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35A2025D-F68A-4B57-83A2-ED4EB9C3894D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35A2025D-F68A-4B57-83A2-ED4EB9C3894D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35A2025D-F68A-4B57-83A2-ED4EB9C3894D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -514,5 +527,7 @@ Global
 		{EF36E33B-646C-4EF4-B0E2-517E14F6DC38} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{98DBDE0D-364C-4865-9A4A-B17410D771F6} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{2F6EF597-6586-4F59-BBB6-BA7146FEFD27} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
+		{35A2025D-F68A-4B57-83A2-ED4EB9C3894D} = {FD93A1ED-5AC4-4F9B-9087-E1C24320F36E}
+		{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB} = {FD93A1ED-5AC4-4F9B-9087-E1C24320F36E}
 	EndGlobalSection
 EndGlobal

src/WebJobs.Script.Extensibility/Properties/AssemblyInfo.cs

@@ -13,4 +13,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("479b0873-cbdc-4ae9-85ba-dd6cf2dca29d")]
 
-[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]

src/WebJobs.Script.WebHost/Properties/AssemblyInfo.cs

@@ -19,4 +19,5 @@
 [assembly: Guid("63c9b2f4-f122-4acc-968f-9b8f0880a72f")]
 
 [assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]
 [assembly: NeutralResourcesLanguage("en-US")]

src/WebJobs.Script/Config/ScriptSettingsManager.cs

@@ -11,7 +11,7 @@ public class ScriptSettingsManager
         private static ScriptSettingsManager _instance = new ScriptSettingsManager();
         private readonly ConcurrentDictionary<string, string> _settingsCache = new ConcurrentDictionary<string, string>();
 
-        protected ScriptSettingsManager()
+        internal ScriptSettingsManager()
         {
         }
 

src/WebJobs.Script/Extensions/FileUtility.cs

@@ -1,17 +1,21 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.WebJobs.Script
 {
     public static class FileUtility
     {
+        public static void EnsureDirectoryExists(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+        }
+
         public static Task DeleteDirectoryAsync(string path, bool recursive)
         {
             return Task.Run(() =>

src/WebJobs.Script/Host/ScriptHost.cs

@@ -187,6 +187,7 @@ internal void AddFunctionError(string functionName, string error, bool isFunctio
         protected virtual void Initialize()
         {
             string hostLogPath = Path.Combine(ScriptConfig.RootLogPath, "Host");
+            FileUtility.EnsureDirectoryExists(hostLogPath);
             string debugSentinelFileName = Path.Combine(hostLogPath, ScriptConstants.DebugSentinelFileName);
             this.LastDebugNotify = File.GetLastWriteTime(debugSentinelFileName);
 

src/WebJobs.Script/Properties/AssemblyInfo.cs

@@ -19,4 +19,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1dc670cd-f42f-4d8f-97bd-0e1aa8221094")]
 
-[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.WebJobs.Script.Tests.Integration")]

test/WebJobs.Script.Tests/ApiHub/ApiHubTestHelper.cs renamed to test/WebJobs.Script.Tests.Integration/ApiHub/ApiHubTestHelper.cs

@@ -10,7 +10,7 @@
 using Microsoft.Azure.WebJobs.Script.Config;
 using Xunit;
 
-namespace Microsoft.Azure.WebJobs.Script.Tests.ApiHub
+namespace Microsoft.Azure.WebJobs.Script.Tests
 {
     public static class ApiHubTestHelper
     {

test/WebJobs.Script.Tests/ApiHub/FakeTabularConnectorAdapter.cs renamed to test/WebJobs.Script.Tests.Integration/ApiHub/FakeTabularConnectorAdapter.cs

@@ -9,7 +9,7 @@
 using Microsoft.Azure.ApiHub.Table.Internal;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Azure.WebJobs.Script.Tests.ApiHub
+namespace Microsoft.Azure.WebJobs.Script.Tests
 {
     internal class FakeTabularConnectorAdapter : ITabularConnectorAdapter
     {