updating tests to latest releases

brettsam · brettsam · commit 4297925c965d · 2018-10-02T17:10:11.000-07:00
diff --git a/test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndToEndTestsBase.cs
@@ -7,9 +7,8 @@
 using Microsoft.Azure.Documents;
 using Microsoft.Azure.Documents.Client;
 using Microsoft.Azure.WebJobs.Script.Models;
-using Microsoft.Azure.WebJobs.Script.Rpc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.WindowsAzure.Storage.Queue;
 using Xunit;
 
@@ -24,8 +23,8 @@ public CosmosDBEndToEndTestsBase(TTestFixture fixture) : base(fixture)
 
         protected async Task CosmosDBTriggerToBlobTest()
         {
-            // CosmosDB tests need the following environment vars:
-            // "AzureWebJobsCosmosDBConnectionString" -- the connection string to the account
+            // CosmosDB tests need the following connection string:
+            // "ConnectionStrings:CosmosDB" -- the connection string to the account
 
             // Waiting for the Processor to acquire leases
             await Task.Delay(10000);
@@ -59,8 +58,8 @@ protected async Task CosmosDBTriggerToBlobTest()
 
         protected async Task CosmosDBTest()
         {
-            // DocumentDB tests need the following environment vars:
-            // "AzureWebJobsCosmosDBConnectionString" -- the connection string to the account
+            // DocumentDB tests need the following connection string:
+            // "ConnectionStrings:CosmosDB" -- the connection string to the account
             string id = Guid.NewGuid().ToString();
 
             await Fixture.Host.BeginFunctionAsync("CosmosDBOut", id);
@@ -98,7 +97,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()
                     new ExtensionPackageReference
                     {
                         Id = "Microsoft.Azure.WebJobs.Extensions.CosmosDB",
-                        Version = "3.0.0-beta9*"
+                        Version = "3.0.1"
                     }
             };
         }
@@ -120,8 +119,11 @@ public async Task InitializeDocumentClient()
         {
             if (DocumentClient == null)
             {
-                var builder = new System.Data.Common.DbConnectionStringBuilder();
-                builder.ConnectionString = Environment.GetEnvironmentVariable("AzureWebJobsCosmosDBConnectionString");
+                var builder = new System.Data.Common.DbConnectionStringBuilder
+                {
+                    ConnectionString = TestHelpers.GetTestConfiguration().GetConnectionString("CosmosDB")
+                };
+
                 var serviceUri = new Uri(builder["AccountEndpoint"].ToString());
 
                 DocumentClient = new DocumentClient(serviceUri, builder["AccountKey"].ToString());
diff --git a/test/WebJobs.Script.Tests.Integration/EventHubs/EventHubsEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/EventHubs/EventHubsEndToEndTestsBase.cs
@@ -67,7 +67,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()
                     new ExtensionPackageReference
                     {
                         Id = "Microsoft.Azure.WebJobs.Extensions.EventHubs",
-                        Version = "3.0.0-11458"
+                        Version = "3.0.0"
                     }
                 };
             }
diff --git a/test/WebJobs.Script.Tests.Integration/TestFunctionHost.cs b/test/WebJobs.Script.Tests.Integration/TestFunctionHost.cs
@@ -64,7 +64,11 @@ public TestFunctionHost(string scriptPath, string logPath,
                       services.Replace(new ServiceDescriptor(typeof(IOptions<ScriptApplicationHostOptions>), new OptionsWrapper<ScriptApplicationHostOptions>(_hostOptions)));
                       services.Replace(new ServiceDescriptor(typeof(IOptionsMonitor<ScriptApplicationHostOptions>), optionsMonitor));
 
-                      services.AddSingleton<IConfigureBuilder<IConfigurationBuilder>>(_ => new DelegatedConfigureBuilder<IConfigurationBuilder>(configureAppConfiguration));
+                      services.AddSingleton<IConfigureBuilder<IConfigurationBuilder>>(_ => new DelegatedConfigureBuilder<IConfigurationBuilder>(c =>
+                      {
+                          c.AddTestSettings();
+                          configureAppConfiguration?.Invoke(c);
+                      }));
 
                       configureServices?.Invoke(services);
                   })
diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs
@@ -2,6 +2,7 @@
 // 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.Threading.Tasks;
@@ -61,8 +62,6 @@ protected virtual ExtensionPackageReference[] GetExtensionsToInstall()
 
         public async Task InitializeAsync()
         {
-            Environment.SetEnvironmentVariable(LanguageWorkerConstants.FunctionWorkerRuntimeSettingName, _functionsWorkerRuntime);
-            
             _copiedRootPath = Path.Combine(Path.GetTempPath(), "FunctionsE2E", DateTime.UtcNow.ToString("yyMMdd-HHmmss"));
             FileUtility.CopyDirectory(_rootPath, _copiedRootPath);
 
@@ -80,7 +79,13 @@ public async Task InitializeAsync()
             }
 
             string logPath = Path.Combine(Path.GetTempPath(), @"Functions");
-            Host = new TestFunctionHost(_copiedRootPath, logPath, ConfigureJobHost);
+            Host = new TestFunctionHost(_copiedRootPath, logPath, ConfigureJobHost, configureAppConfiguration: s =>
+            {
+                s.AddInMemoryCollection(new Dictionary<string, string>()
+                {
+                    { LanguageWorkerConstants.FunctionWorkerRuntimeSettingName, _functionsWorkerRuntime }
+                });
+            });
 
             string connectionString = Host.JobHostServices.GetService<IConfiguration>().GetWebJobsConnectionString(ConnectionStringNames.Storage);
             CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString);
diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs
@@ -28,15 +28,14 @@ public abstract class EndToEndTestsBase<TTestFixture> :
         IClassFixture<TTestFixture> where TTestFixture : EndToEndTestFixture, new()
     {
         private INameResolver _nameResolver;
+        private IConfiguration _configuration;
         private static readonly ScriptSettingsManager SettingsManager = ScriptSettingsManager.Instance;
 
         public EndToEndTestsBase(TTestFixture fixture)
         {
-            var config = new ConfigurationBuilder()
-                .AddEnvironmentVariables()
-                .Build();
+            _configuration = TestHelpers.GetTestConfiguration();
 
-            _nameResolver = new DefaultNameResolver(config);
+            _nameResolver = new DefaultNameResolver(_configuration);
             Fixture = fixture;
         }
 
@@ -342,8 +341,8 @@ protected async Task<Document> WaitForDocumentAsync(string itemId, string textTo
         {
             var docUri = UriFactory.CreateDocumentUri("ItemDb", "ItemCollection", itemId);
 
-            // We know the tests are using the default INameResolver and the default setting.
-            var connectionString = _nameResolver.Resolve("AzureWebJobsCosmosDBConnectionString");
+            // We know the tests are using the default connection string.
+            var connectionString = _configuration.GetConnectionString("CosmosDB");
             var builder = new DbConnectionStringBuilder
             {
                 ConnectionString = connectionString
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -27,7 +27,7 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="1.9.1" />
+    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.EventHubs" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta4-10082" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0" />

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()`
`67`	`67`	`new ExtensionPackageReference`
`68`	`68`	`{`
`69`	`69`	`Id = "Microsoft.Azure.WebJobs.Extensions.EventHubs",`
`70`		`- Version = "3.0.0-11458"`
	`70`	`+ Version = "3.0.0"`
`71`	`71`	`}`
`72`	`72`	`};`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,14 @@ public abstract class EndToEndTestsBase<TTestFixture> :`
`28`	`28`	`IClassFixture<TTestFixture> where TTestFixture : EndToEndTestFixture, new()`
`29`	`29`	`{`
`30`	`30`	`private INameResolver _nameResolver;`
	`31`	`+ private IConfiguration _configuration;`
`31`	`32`	`private static readonly ScriptSettingsManager SettingsManager = ScriptSettingsManager.Instance;`
`32`	`33`
`33`	`34`	`public EndToEndTestsBase(TTestFixture fixture)`
`34`	`35`	`{`
`35`		`- var config = new ConfigurationBuilder()`
`36`		`- .AddEnvironmentVariables()`
`37`		`- .Build();`
	`36`	`+ _configuration = TestHelpers.GetTestConfiguration();`
`38`	`37`
`39`		`- _nameResolver = new DefaultNameResolver(config);`
	`38`	`+ _nameResolver = new DefaultNameResolver(_configuration);`
`40`	`39`	`Fixture = fixture;`
`41`	`40`	`}`
`42`	`41`
`@@ -342,8 +341,8 @@ protected async Task<Document> WaitForDocumentAsync(string itemId, string textTo`
`342`	`341`	`{`
`343`	`342`	`var docUri = UriFactory.CreateDocumentUri("ItemDb", "ItemCollection", itemId);`
`344`	`343`
`345`		`- // We know the tests are using the default INameResolver and the default setting.`
`346`		`- var connectionString = _nameResolver.Resolve("AzureWebJobsCosmosDBConnectionString");`
	`344`	`+ // We know the tests are using the default connection string.`
	`345`	`+ var connectionString = _configuration.GetConnectionString("CosmosDB");`
`347`	`346`	`var builder = new DbConnectionStringBuilder`
`348`	`347`	`{`
`349`	`348`	`ConnectionString = connectionString`