Skip to content

Commit 651c5ba

Browse files
CopilotStuartFerguson
Copilot
and
StuartFerguson
committed
Stabilize nightly integration tests around midnight
Co-authored-by: StuartFerguson <16325469+StuartFerguson@users.noreply.github.com>
1 parent ee6755e commit 651c5ba

3 files changed

Lines changed: 19 additions & 25 deletions

File tree

‎EstateReportingAPI.IntegrationTests/FactTransactionsControllerTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,10 @@ public async Task FactTransactionsControllerController_GetMerchantsByLastDaleDat
646646
await ClearStandingData();
647647
648648
// Last Hour
649-
await helper.AddMerchant("Test Estate", "Merchant 1", todaysDateTime.AddMinutes(-10));
650-
await helper.AddMerchant("Test Estate", "Merchant 2", todaysDateTime.AddMinutes(-10));
651-
await helper.AddMerchant("Test Estate", "Merchant 3", todaysDateTime.AddMinutes(-10));
652-
await helper.AddMerchant("Test Estate", "Merchant 4", todaysDateTime.AddMinutes(-10));
649+
await helper.AddMerchant("Test Estate", "Merchant 1", todaysDateTime);
650+
await helper.AddMerchant("Test Estate", "Merchant 2", todaysDateTime);
651+
await helper.AddMerchant("Test Estate", "Merchant 3", todaysDateTime);
652+
await helper.AddMerchant("Test Estate", "Merchant 4", todaysDateTime);
653653
654654
// Yesterday
655655
await helper.AddMerchant("Test Estate", "Merchant 5", todaysDateTime.AddDays(-1));
@@ -736,10 +736,10 @@ public async Task FactTransactionsControllerController_GetMerchantsTransactionKp
736736
await ClearStandingData();
737737
738738
// Last Hour
739-
await helper.AddMerchant("Test Estate", "Merchant 1", todaysDateTime.AddMinutes(-10));
740-
await helper.AddMerchant("Test Estate", "Merchant 2", todaysDateTime.AddMinutes(-10));
741-
await helper.AddMerchant("Test Estate", "Merchant 3", todaysDateTime.AddMinutes(-10));
742-
await helper.AddMerchant("Test Estate", "Merchant 4", todaysDateTime.AddMinutes(-10));
739+
await helper.AddMerchant("Test Estate", "Merchant 1", todaysDateTime);
740+
await helper.AddMerchant("Test Estate", "Merchant 2", todaysDateTime);
741+
await helper.AddMerchant("Test Estate", "Merchant 3", todaysDateTime);
742+
await helper.AddMerchant("Test Estate", "Merchant 4", todaysDateTime);
743743
744744
// Yesterday
745745
await helper.AddMerchant("Test Estate", "Merchant 5", todaysDateTime.AddDays(-1));
@@ -1324,7 +1324,7 @@ public async Task FactTransactionsControllerController_TodaysFailedSales_SalesRe
13241324
foreach ((Guid productId, String productName, Decimal? productValue) product in productList) {
13251325
var transactionCount = transactionCounts.Single(m => m.Key == merchant.Name).Value;
13261326
for (int i = 0; i < transactionCount; i++) {
1327-
Transaction transaction = await helper1.BuildTransactionX(todaysDateTime.AddHours(-1), merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
1327+
Transaction transaction = await helper1.BuildTransactionX(todaysDateTime, merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
13281328
todaysTransactions.Add(transaction);
13291329
}
13301330
}
@@ -1340,7 +1340,7 @@ public async Task FactTransactionsControllerController_TodaysFailedSales_SalesRe
13401340
foreach ((Guid productId, String productName, Decimal? productValue) product in productList) {
13411341
var transactionCount = transactionCounts.Single(m => m.Key == merchant.Name).Value;
13421342
for (int i = 0; i < transactionCount; i++) {
1343-
Transaction transaction = await helper1.BuildTransactionX(comparisonDate.AddHours(-1), merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
1343+
Transaction transaction = await helper1.BuildTransactionX(comparisonDate, merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
13441344
comparisonDateTransactions.Add(transaction);
13451345
}
13461346
}
@@ -1870,4 +1870,4 @@ public async Task FactTransactionsController_TransactionSearch_SortingTest_Trans
18701870
searchResult[1].TransactionAmount.ShouldBe(200);
18711871
searchResult[2].TransactionAmount.ShouldBe(100);
18721872
}
1873-
}*/
1873+
}*/

‎EstateReportingAPI.IntegrationTests/MerchantEndpointTests.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,19 @@ public async Task MerchantEndpoint_GetMerchantKpis_MerchantKpisReturned()
155155
await this.helper.AddMerchant("Test Estate", $"Test Merchant 1",100, now, now,
156156
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
157157
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
158-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 2", 200, now, now.AddMinutes(-10),
158+
await this.helper.AddMerchant("Test Estate", $"Test Merchant 2", 200, now, now,
159159
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
160160
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
161-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 3",300, now, now.AddHours(-2),
161+
await this.helper.AddMerchant("Test Estate", $"Test Merchant 3",300, now, now.AddDays(-1),
162162
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
163163
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
164-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 4",400, now, now.AddHours(-3),
164+
await this.helper.AddMerchant("Test Estate", $"Test Merchant 4",400, now, now.AddDays(-2),
165165
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
166166
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
167-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 5",500, now, now.AddDays(-2),
167+
await this.helper.AddMerchant("Test Estate", $"Test Merchant 5",500, now, now.AddDays(-3),
168168
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
169169
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
170-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 6",600, now, now.AddDays(-1),
171-
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
172-
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
173-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 7",700, now, now.AddDays(-3),
174-
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
175-
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
176-
await this.helper.AddMerchant("Test Estate", $"Test Merchant 8",800, now, now.AddDays(-10),
170+
await this.helper.AddMerchant("Test Estate", $"Test Merchant 6",600, now, now.AddDays(-10),
177171
("Address Line 1", $"Test Town", $"TE57 1NG", $"Region"),
178172
("Contact 1", "1@2.com", "123456"), devices: ["123456"]);
179173

‎EstateReportingAPI.IntegrationTests/TransactionsEndpointTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public async Task TransactionsEndpoint_TodaysFailedSales_SalesReturned() {
280280
var comparisonDateTransactions = new List<Transaction>();
281281
//DatabaseHelper helper1 = new DatabaseHelper(context);
282282
// TODO: make counts dynamic
283-
DateTime todaysDateTime = DateTime.Now;
283+
DateTime todaysDateTime = DateTime.Now.Date;
284284
//todaysDateTime = todaysDateTime.AddHours(12).AddMinutes(30);
285285

286286
Dictionary<string, int> transactionCounts = new() { { "Test Merchant 1", 3 }, { "Test Merchant 2", 6 }, { "Test Merchant 3", 2 }, { "Test Merchant 4", 0 } };
@@ -293,7 +293,7 @@ public async Task TransactionsEndpoint_TodaysFailedSales_SalesReturned() {
293293
foreach ((Guid productId, String productName, Decimal? productValue, Int32 contractProductReportingId) product in productList) {
294294
var transactionCount = transactionCounts.Single(m => m.Key == merchant.Name).Value;
295295
for (int i = 0; i < transactionCount; i++) {
296-
Transaction transaction = await this.helper.BuildTransactionX(todaysDateTime.AddHours(-1), merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
296+
Transaction transaction = await this.helper.BuildTransactionX(todaysDateTime, merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
297297
todaysTransactions.Add(transaction);
298298
}
299299
}
@@ -309,7 +309,7 @@ public async Task TransactionsEndpoint_TodaysFailedSales_SalesReturned() {
309309
foreach ((Guid productId, String productName, Decimal? productValue, Int32 contractProductReportingId) product in productList) {
310310
var transactionCount = transactionCounts.Single(m => m.Key == merchant.Name).Value;
311311
for (int i = 0; i < transactionCount; i++) {
312-
Transaction transaction = await this.helper.BuildTransactionX(comparisonDate.AddHours(-1), merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
312+
Transaction transaction = await this.helper.BuildTransactionX(comparisonDate, merchant.MerchantId, contract.operatorId, contract.contractId, product.productId, "1009", product.productValue);
313313
comparisonDateTransactions.Add(transaction);
314314
}
315315
}

0 commit comments

Comments
 (0)