Skip to content

Commit 71c6243

Browse files
liliankasemliliankasem
authored
Cleanup worker profile tests (#8561)
1 parent 7971944 commit 71c6243

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

‎test/WebJobs.Script.Tests/Workers/Profiles/EnvironmentConditionTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
using System;
55
using System.ComponentModel.DataAnnotations;
6-
using Microsoft.Azure.WebJobs.Script.Tests;
6+
using Microsoft.Azure.WebJobs.Script.Workers;
7+
using Microsoft.Azure.WebJobs.Script.Workers.Profiles;
78
using Xunit;
89

9-
namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
10+
namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
1011
{
1112
public class EnvironmentConditionTests
1213
{

‎test/WebJobs.Script.Tests/Workers/Profiles/FalseConditionTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using Microsoft.Azure.WebJobs.Script.Workers;
45
using Xunit;
56

6-
namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
7+
namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
78
{
89
public class FalseConditionTests
910
{
1011
[Fact]
11-
public void FalseCondition_EvaluesFalse()
12+
public void FalseCondition_EvaluatesToFalse()
1213
{
1314
var falseCondition = new FalseCondition();
1415
Assert.False(falseCondition.Evaluate(), "False condition must always return false");

‎test/WebJobs.Script.Tests/Workers/Profiles/HostPropertyConditionTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.ComponentModel.DataAnnotations;
5-
using Microsoft.Azure.WebJobs.Script.Tests;
5+
using Microsoft.Azure.WebJobs.Script.Workers;
6+
using Microsoft.Azure.WebJobs.Script.Workers.Profiles;
67
using Xunit;
78

8-
namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
9+
namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
910
{
1011
public class HostPropertyConditionTests
1112
{

‎test/WebJobs.Script.Tests/Workers/Profiles/WorkerDescriptionProfileTests.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33

44
using System.Collections.Generic;
55
using System.ComponentModel.DataAnnotations;
6-
using Microsoft.Azure.WebJobs.Script.Tests;
7-
using Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles;
86
using Microsoft.Azure.WebJobs.Script.Tests.Workers.Rpc;
7+
using Microsoft.Azure.WebJobs.Script.Workers;
98
using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
109
using Xunit;
1110

12-
namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
11+
namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
1312
{
1413
public class WorkerDescriptionProfileTests
1514
{
@@ -21,9 +20,9 @@ public class WorkerDescriptionProfileTests
2120

2221
[Theory]
2322
[MemberData(nameof(WorkerDescriptionProfileExceptionData))]
24-
public void WorkerDescriptionProfile_ThrowsValidationException(string name, List<IWorkerProfileCondition> coditions, RpcWorkerDescription workerDescription)
23+
public void WorkerDescriptionProfile_ThrowsValidationException(string name, List<IWorkerProfileCondition> conditions, RpcWorkerDescription workerDescription)
2524
{
26-
Assert.Throws<ValidationException>(() => new WorkerDescriptionProfile(name, coditions, workerDescription));
25+
Assert.Throws<ValidationException>(() => new WorkerDescriptionProfile(name, conditions, workerDescription));
2726
}
2827

2928
public static IEnumerable<object[]> WorkerDescriptionProfileExceptionData()
@@ -43,16 +42,19 @@ public static IEnumerable<object[]> WorkerDescriptionProfileExceptionData()
4342

4443
[Theory]
4544
[MemberData(nameof(WorkerDescriptionProfileData))]
46-
public void WorkerDescriptionProfile_ApplyProfile(string name, List<IWorkerProfileCondition> coditions, RpcWorkerDescription workerDescription)
45+
public void WorkerDescriptionProfile_ApplyProfile(string name, List<IWorkerProfileCondition> conditions, RpcWorkerDescription workerDescription)
4746
{
4847
_testEnvironment.SetEnvironmentVariable("APPLICATIONINSIGHTS_ENABLE_AGENT", "true");
4948
var defaultDescription = RpcWorkerConfigTestUtilities.GetTestDefaultWorkerDescription("java", new string[] { "-DefaultArgs" });
5049

51-
var workerDescriptionProfile = new WorkerDescriptionProfile(name, coditions, workerDescription);
50+
var workerDescriptionProfile = new WorkerDescriptionProfile(name, conditions, workerDescription);
5251
defaultDescription = workerDescriptionProfile.ApplyProfile(defaultDescription);
5352

5453
Assert.Equal(defaultDescription.Arguments[0], argumentList[0]);
5554
Assert.NotEqual(defaultDescription.Arguments[0], "-DefaultArgs");
55+
56+
// Reset environment
57+
_testEnvironment = new TestEnvironment();
5658
}
5759

5860
public static IEnumerable<object[]> WorkerDescriptionProfileData()
@@ -69,16 +71,19 @@ public static IEnumerable<object[]> WorkerDescriptionProfileData()
6971

7072
[Theory]
7173
[MemberData(nameof(WorkerDescriptionProfileInvalidData))]
72-
public void WorkerDescriptionProfile_DoNotApplyProfile(string name, List<IWorkerProfileCondition> coditions, RpcWorkerDescription workerDescription)
74+
public void WorkerDescriptionProfile_DoNotApplyProfile(string name, List<IWorkerProfileCondition> conditions, RpcWorkerDescription workerDescription)
7375
{
7476
_testEnvironment.SetEnvironmentVariable("APPLICATIONINSIGHTS_ENABLE_AGENT", "false");
7577
var defaultDescription = RpcWorkerConfigTestUtilities.GetTestDefaultWorkerDescription("java", new string[] { "-DefaultArgs" });
7678

77-
var workerDescriptionProfile = new WorkerDescriptionProfile(name, coditions, workerDescription);
79+
var workerDescriptionProfile = new WorkerDescriptionProfile(name, conditions, workerDescription);
7880
defaultDescription = workerDescriptionProfile.ApplyProfile(defaultDescription);
7981

8082
Assert.NotNull(defaultDescription.Arguments[0]);
8183
Assert.Equal(defaultDescription.Arguments[0], "-DefaultArgs");
84+
85+
// Reset environment
86+
_testEnvironment = new TestEnvironment();
8287
}
8388

8489
public static IEnumerable<object[]> WorkerDescriptionProfileInvalidData()
@@ -115,6 +120,9 @@ public void WorkerDescriptionProfile_EvaluateConditions()
115120
workerDescriptionProfile = new WorkerDescriptionProfile("profileName", conditions, description);
116121

117122
Assert.False(workerDescriptionProfile.EvaluateConditions());
123+
124+
// Reset environment
125+
_testEnvironment = new TestEnvironment();
118126
}
119127
}
120128
}

‎test/WebJobs.Script.Tests/Workers/Profiles/WorkerProfileConditionDescriptorTests.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using Microsoft.Azure.WebJobs.Script.Workers;
5+
using Microsoft.Azure.WebJobs.Script.Workers.Profiles;
46
using Newtonsoft.Json;
57
using Newtonsoft.Json.Linq;
68
using Xunit;
79

8-
namespace Microsoft.Azure.WebJobs.Script.Workers.Profiles
10+
namespace Microsoft.Azure.WebJobs.Script.Tests.Workers.Profiles
911
{
1012
public class WorkerProfileConditionDescriptorTests
1113
{

0 commit comments

Comments
 (0)