Skip to content

Commit cf1e211

Browse files
sliedigsliedig
committed
fix: resolved test issues
1 parent e011522 commit cf1e211

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

‎Unicorn.Contracts/ContractsService.Test/CreateContractFunctionTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public class CreateContractFunctionTest
2222
public CreateContractFunctionTest(ITestOutputHelper testOutputHelper)
2323
{
2424
_testOutputHelper = testOutputHelper;
25+
26+
// Set env variable for Powertools Metrics
27+
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE","ContractService");
2528
}
2629

2730
[Fact]
2831
public async Task CreateValidContractPublishesDraftContractStatusChangedEvent()
2932
{
30-
// Arrange
31-
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE","ContractService");
32-
3333
var request = TestHelpers.LoadApiGatewayProxyRequest("./events/create_valid_event.json");
3434

3535
var mockDynamoDbContext = new Mock<IDynamoDBContext>();

‎Unicorn.Contracts/ContractsService.Test/UpdateContractFunctionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public class UpdateContractFunctionTest
2222
public UpdateContractFunctionTest(ITestOutputHelper testOutputHelper)
2323
{
2424
_testOutputHelper = testOutputHelper;
25+
// Set env variable for Powertools Metrics
26+
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE","ContractService");
2527
}
2628

2729
[Trait("Category", "MetricsImplementation")]
2830
[Fact]
2931
public async Task UpdateContractPublishesApprovedContractStatusChangedEvent()
3032
{
31-
// Arrange
32-
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE","ContractService");
3333
var request = TestHelpers.LoadApiGatewayProxyRequest("./events/update_valid_event.json");
3434

3535
var mockDynamoDbContext = new Mock<IDynamoDBContext>();

‎Unicorn.Properties/PropertiesService.Tests/PropertiesApprovalSyncFunctionTest.cs

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace Unicorn.Properties.PropertiesService.Tests;
1414
public class PropertiesApprovalSyncFunctionTest
1515
{
1616
private readonly ITestOutputHelper _testOutputHelper;
17+
1718
private const string Token = "AQDIAAAAKgAAAAMAAAAAAAAAAapnwdMR3Z7RAg3IavSq2hbHt+CZPIQYaakFO6Em9Ik00VsGcaznxo" +
1819
"tIUGB2t7kihvuu/ffeoF+Z4yg4dggTxtzVwvRJwUDQr33/s/LhJyvEfNS57PXCv/CYFssJZ+28FRCAYb" +
1920
"GekKaopYhaUlvq0taLGMaEfIbRBeLUmLHInDkPPDbwTA==N0LRrCP3bIFW1MPkMQC3kd35p8yflvpThH" +
@@ -28,9 +29,11 @@ public class PropertiesApprovalSyncFunctionTest
2829
public PropertiesApprovalSyncFunctionTest(ITestOutputHelper testOutputHelper)
2930
{
3031
_testOutputHelper = testOutputHelper;
32+
// Set env variable for Powertools Metrics
33+
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE", "ContractService");
3134
}
3235

33-
[Fact]
36+
[Fact]
3437
public void StatusIsDraftSyncShouldNotSendTaskSuccess()
3538
{
3639
// Setup
@@ -44,13 +47,13 @@ public void StatusIsDraftSyncShouldNotSendTaskSuccess()
4447
ContractLastModifiedOn = DateTime.Today,
4548
SfnWaitApprovedTaskToken = null
4649
};
47-
50+
4851
var mockDynamoDbContext = new Mock<IDynamoDBContext>();
49-
52+
5053
mockDynamoDbContext
5154
.Setup(x => x.LoadAsync<ContractStatusItem>(It.IsAny<string>(), CancellationToken.None).Result)
5255
.Returns(retContractStatusItem);
53-
56+
5457
var mockStepFunctionsClient = new Mock<AmazonStepFunctionsClient>();
5558

5659
var context = TestHelpers.NewLambdaContext();
@@ -63,14 +66,14 @@ public void StatusIsDraftSyncShouldNotSendTaskSuccess()
6366
mockStepFunctionsClient.Verify(
6467
client => client.SendTaskSuccessAsync(It.IsAny<SendTaskSuccessRequest>(),
6568
It.IsAny<CancellationToken>()), Times.Never);
66-
6769
}
6870

6971

7072
[Fact]
7173
public Task StatusIsApprovedNoTokenSyncShouldNotSendTaskSuccess()
7274
{
73-
var ddbEvent = TestHelpers.LoadDynamoDbEventSource("./events/StreamEvents/contract_status_changed_approved.json");
75+
var ddbEvent =
76+
TestHelpers.LoadDynamoDbEventSource("./events/StreamEvents/contract_status_changed_approved.json");
7477

7578
var retContractStatusItem = new ContractStatusItem
7679
{
@@ -80,12 +83,12 @@ public Task StatusIsApprovedNoTokenSyncShouldNotSendTaskSuccess()
8083
ContractLastModifiedOn = DateTime.Today,
8184
SfnWaitApprovedTaskToken = null
8285
};
83-
86+
8487
var mockDynamoDbContext = new Mock<IDynamoDBContext>();
8588
mockDynamoDbContext
8689
.Setup(x => x.LoadAsync<ContractStatusItem>(It.IsAny<string>(), CancellationToken.None).Result)
8790
.Returns(retContractStatusItem);
88-
91+
8992
var mockStepFunctionsClient = new Mock<AmazonStepFunctionsClient>();
9093

9194
var context = TestHelpers.NewLambdaContext();
@@ -106,7 +109,9 @@ public Task StatusIsApprovedNoTokenSyncShouldNotSendTaskSuccess()
106109
[Fact]
107110
public Task StatusIsDraftWithTokenSyncShouldNotSendTaskSuccess()
108111
{
109-
var ddbEvent = TestHelpers.LoadDynamoDbEventSource("./events/StreamEvents/contract_status_draft_waiting_for_approval.json");
112+
var ddbEvent =
113+
TestHelpers.LoadDynamoDbEventSource(
114+
"./events/StreamEvents/contract_status_draft_waiting_for_approval.json");
110115

111116
var retContractStatusItem = new ContractStatusItem
112117
{
@@ -116,12 +121,12 @@ public Task StatusIsDraftWithTokenSyncShouldNotSendTaskSuccess()
116121
ContractLastModifiedOn = DateTime.Today,
117122
SfnWaitApprovedTaskToken = Token
118123
};
119-
124+
120125
var mockDynamoDbContext = new Mock<IDynamoDBContext>();
121126
mockDynamoDbContext
122127
.Setup(x => x.LoadAsync<ContractStatusItem>(It.IsAny<string>(), CancellationToken.None).Result)
123128
.Returns(retContractStatusItem);
124-
129+
125130
var mockStepFunctionsClient = new Mock<AmazonStepFunctionsClient>();
126131

127132
var context = TestHelpers.NewLambdaContext();
@@ -137,13 +142,15 @@ public Task StatusIsDraftWithTokenSyncShouldNotSendTaskSuccess()
137142

138143
return Task.CompletedTask;
139144
}
140-
141-
145+
146+
142147
[Fact]
143148
public Task StatusIsApprovedWithTokenSyncShouldSendTaskSuccess()
144149
{
145-
var ddbEvent = TestHelpers.LoadDynamoDbEventSource("./events/StreamEvents/contract_status_changed_approved_waiting_for_approval.json");
146-
150+
var ddbEvent =
151+
TestHelpers.LoadDynamoDbEventSource(
152+
"./events/StreamEvents/contract_status_changed_approved_waiting_for_approval.json");
153+
147154
var retContractStatusItem = new ContractStatusItem
148155
{
149156
PropertyId = "usa/anytown/main-street/999",
@@ -152,20 +159,20 @@ public Task StatusIsApprovedWithTokenSyncShouldSendTaskSuccess()
152159
ContractLastModifiedOn = DateTime.Today,
153160
SfnWaitApprovedTaskToken = Token
154161
};
155-
162+
156163
var mockStepFunctionsClient = new Mock<AmazonStepFunctionsClient>();
157164
var mockDynamoDbContext = new Mock<IDynamoDBContext>();
158165
mockDynamoDbContext
159-
.Setup(x =>
160-
x.LoadAsync<ContractStatusItem>(It.IsAny<string>(),
166+
.Setup(x =>
167+
x.LoadAsync<ContractStatusItem>(It.IsAny<string>(),
161168
CancellationToken.None).Result)
162169
.Returns(retContractStatusItem);
163170
var context = TestHelpers.NewLambdaContext();
164171

165172
var function =
166173
new PropertiesApprovalSyncFunction(mockStepFunctionsClient.Object, mockDynamoDbContext.Object);
167174
var handler = function.FunctionHandler(ddbEvent, context);
168-
175+
169176
mockStepFunctionsClient.Verify(
170177
client => client.SendTaskSuccessAsync(It.IsAny<SendTaskSuccessRequest>(),
171178
It.IsAny<CancellationToken>()), Times.Once);

‎Unicorn.Web/ApprovalService.Tests/RequestApprovalFunctionTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class RequestApprovalFunctionTest
1515
public RequestApprovalFunctionTest()
1616
{
1717
TestHelpers.SetEnvironmentVariables();
18+
// Set env variable for Powertools Metrics
19+
Environment.SetEnvironmentVariable("POWERTOOLS_METRICS_NAMESPACE","ContractService");
1820
}
1921

2022
[Fact]

0 commit comments

Comments
 (0)