Skip to content

Commit 6ac789e

Browse files
authored
clean up env vars in a test (#9357)
1 parent e56bb5a commit 6ac789e

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

test/WebJobs.Script.Tests/Extensions/ScriptJwtBearerExtensionsTests.cs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Linq;
77
using Microsoft.Azure.WebJobs.Script.Config;
88
using Microsoft.Extensions.DependencyInjection;
9-
using NuGet.Configuration;
109
using Xunit;
1110
using static Microsoft.Azure.WebJobs.Script.EnvironmentSettingNames;
1211

@@ -24,22 +23,21 @@ public void CreateTokenValidationParameters_HasExpectedAudience(bool isPlacehold
2423
var podName = "RandomPodName";
2524
var containerName = "RandomContainerName";
2625
var siteName = "RandomSiteName";
27-
ScriptSettingsManager.Instance.SetSetting(AzureWebsiteName, siteName);
28-
ScriptSettingsManager.Instance.SetSetting(WebsitePodName, podName);
29-
ScriptSettingsManager.Instance.SetSetting(ContainerName, string.Empty);
3026

3127
var expectedWithSiteName = new string[]
3228
{
33-
string.Format(ScriptConstants.SiteAzureFunctionsUriFormat, ScriptSettingsManager.Instance.GetSetting(AzureWebsiteName)),
34-
string.Format(ScriptConstants.SiteUriFormat, ScriptSettingsManager.Instance.GetSetting(AzureWebsiteName))
29+
string.Format(ScriptConstants.SiteAzureFunctionsUriFormat, siteName),
30+
string.Format(ScriptConstants.SiteUriFormat, siteName)
3531
};
36-
var expectedWithPodName = new string[]
32+
var expectedWithPodName = new string[] { podName };
33+
var expectedWithContainerName = Array.Empty<string>();
34+
35+
var testData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
3736
{
38-
ScriptSettingsManager.Instance.GetSetting(WebsitePodName)
37+
[AzureWebsiteName] = siteName,
38+
[WebsitePodName] = podName,
39+
[ContainerName] = string.Empty
3940
};
40-
var expectedWithContainerName = new string[] { };
41-
42-
var testData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
4341

4442
if (isPlaceholderModeEnabled)
4543
{
@@ -54,17 +52,13 @@ public void CreateTokenValidationParameters_HasExpectedAudience(bool isPlacehold
5452
}
5553
else
5654
{
57-
ScriptSettingsManager.Instance.SetSetting(ContainerName, containerName);
58-
expectedWithContainerName = new string[]
59-
{
60-
ScriptSettingsManager.Instance.GetSetting(ContainerName)
61-
};
55+
expectedWithContainerName = new string[] { containerName };
6256
testData[AzureWebsiteInstanceId] = string.Empty;
6357
testData[ContainerName] = containerName;
6458
}
6559

6660
testData[ContainerEncryptionKey] = Convert.ToBase64String(TestHelpers.GenerateKeyBytes());
67-
using (new TestScopedEnvironmentVariable(testData))
61+
using (new TestScopedSettings(ScriptSettingsManager.Instance, testData))
6862
{
6963
var tokenValidationParameters = ScriptJwtBearerExtensions.CreateTokenValidationParameters();
7064
var audiences = tokenValidationParameters.ValidAudiences.ToList();

0 commit comments

Comments
 (0)