Skip to content

Commit e0a519a

Browse files
author
Jani Giannoudis
committed
payrun test runner: tweaked timer output
updated version to 0.9.0-beta.17
1 parent dc42541 commit e0a519a

6 files changed

Lines changed: 72 additions & 37 deletions

Client.Test/PayrollEngine.CaseTest.schema.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -428,31 +428,6 @@
428428
"caseFieldName"
429429
],
430430
"properties": {
431-
"divisionId": {
432-
"type": [
433-
"integer",
434-
"null"
435-
],
436-
"description": "The division id (immutable), Mandatory for case values with local value scope ValueScope",
437-
"format": "int32"
438-
},
439-
"employeeId": {
440-
"type": [
441-
"integer",
442-
"null"
443-
],
444-
"description": "The employee id, mandatory for employee case changes (immutable)",
445-
"format": "int32"
446-
},
447-
"divisionName": {
448-
"type": [
449-
"null",
450-
"string"
451-
],
452-
"description": "The associated case field name",
453-
"maxLength": 128,
454-
"minLength": 0
455-
},
456431
"caseName": {
457432
"type": [
458433
"null",
@@ -597,6 +572,31 @@
597572
"object"
598573
],
599574
"additionalProperties": {}
575+
},
576+
"divisionName": {
577+
"type": [
578+
"null",
579+
"string"
580+
],
581+
"description": "The associated case field name",
582+
"maxLength": 128,
583+
"minLength": 0
584+
},
585+
"divisionId": {
586+
"type": [
587+
"integer",
588+
"null"
589+
],
590+
"description": "The division id (immutable), Mandatory for case values with local value scope ValueScope",
591+
"format": "int32"
592+
},
593+
"employeeId": {
594+
"type": [
595+
"integer",
596+
"null"
597+
],
598+
"description": "The employee id, mandatory for employee case changes (immutable)",
599+
"format": "int32"
600600
}
601601
}
602602
}
@@ -1649,10 +1649,16 @@
16491649
"type": "object",
16501650
"description": "The payroll case client object",
16511651
"required": [
1652-
"caseType",
1653-
"name"
1652+
"name",
1653+
"caseType"
16541654
],
16551655
"properties": {
1656+
"name": {
1657+
"type": "string",
1658+
"description": "The case name",
1659+
"maxLength": 128,
1660+
"minLength": 0
1661+
},
16561662
"caseType": {
16571663
"description": "The type of he case (immutable)",
16581664
"oneOf": [
@@ -1661,12 +1667,6 @@
16611667
}
16621668
]
16631669
},
1664-
"name": {
1665-
"type": "string",
1666-
"description": "The case name",
1667-
"maxLength": 128,
1668-
"minLength": 0
1669-
},
16701670
"nameLocalizations": {
16711671
"type": [
16721672
"null",

Client.Test/PayrollEngine.Client.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="5.0.0" />
20-
<PackageReference Include="PayrollEngine.Client.Core" Version="0.9.0-beta.16" />
20+
<PackageReference Include="PayrollEngine.Client.Core" Version="0.9.0-beta.17" />
2121
</ItemGroup>
2222

2323
<!-- include xml documention files and json schemas to the nuget package -->

Client.Test/PayrollEngine.Client.Test.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Client.Test/Payrun/PayrunTestRunnerBase.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,15 @@ protected virtual async Task<IList<PayrollTestResult>> TestPayrunJobAsync(Exchan
7171
var count = 0;
7272
while (payrunJob?.JobEnd == null)
7373
{
74-
count++;
75-
Log.Debug($"Waiting to complete job {payrollResult.PayrunJobName} ({count})");
74+
if (count > 0)
75+
{
76+
Log.Debug($"Waiting to complete job {payrollResult.PayrunJobName} ({count})");
77+
}
7678
Task.Delay(Settings.ResultRetryDelay).Wait();
7779
payrunJob = await FindPayrunJobAsync(tenant, jobResultMode, payrollResult, employee);
7880

7981
// retry count
82+
count++;
8083
if (count >= Settings.ResultRetryCount)
8184
{
8285
break;

Client.Test/TestFileExtensions.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace PayrollEngine.Client.Test;
2+
3+
/// <summary>Test file extensions</summary>
4+
public static class TestFileExtensions
5+
{
6+
/// <summary>Payrun test file extension</summary>
7+
public static readonly string PayrunTest = ".pt";
8+
9+
/// <summary>Employee test file extension</summary>
10+
public static readonly string EmployeeTest = ".et";
11+
12+
/// <summary>Case test file extension</summary>
13+
public static readonly string CaseTest = ".ct";
14+
15+
/// <summary>Report test file extension</summary>
16+
public static readonly string ReportTest = ".rt";
17+
}

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net10.0</TargetFramework>
5-
<Version>0.9.0-beta.16</Version>
5+
<Version>0.9.0-beta.17</Version>
66
<FileVersion>0.9.0</FileVersion>
77
<InformationalVersion></InformationalVersion>
88
<Authors>Jani Giannoudis</Authors>

0 commit comments

Comments
 (0)