Skip to content

Commit 90e9c7b

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into dependabot/nuget/eFormAPI/Plugins/OuterInnerResource.Pn/NUnit3TestAdapter-4.6.0
2 parents 8425a63 + 489a3ef commit 90e9c7b

22 files changed

+1479
-1632
lines changed

‎.github/workflows/dotnet-core-master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Build the tagged Docker image
4848
run: docker build . -t microtingas/outer-inner-resource-container:latest -t microtingas/outer-inner-resource-container:1.0.0 --build-arg GITVERSION=1.00 --build-arg PLUGINVERSION=1.0.0
4949
- run: docker save microtingas/outer-inner-resource-container:latest -o outer-inner-resource-container.tar
50-
- uses: actions/upload-artifact@v2
50+
- uses: actions/upload-artifact@v4
5151
with:
5252
name: outer-inner-resource-container
5353
path: outer-inner-resource-container.tar
@@ -71,7 +71,7 @@ jobs:
7171
run: |
7272
docker pull rabbitmq:latest
7373
docker run -d --hostname my-rabbit --name some-rabbit --network data -e RABBITMQ_DEFAULT_USER=admin -e RABBITMQ_DEFAULT_PASS=password rabbitmq:latest
74-
- uses: actions/download-artifact@v3
74+
- uses: actions/download-artifact@v4
7575
with:
7676
name: outer-inner-resource-container
7777
- run: docker load -i outer-inner-resource-container.tar
@@ -162,7 +162,7 @@ jobs:
162162
- name: Setup .NET Core
163163
uses: actions/setup-dotnet@v3
164164
with:
165-
dotnet-version: 8.0.x
165+
dotnet-version: 9.0.x
166166
- name: Build
167167
run: dotnet build eform-angular-outer-inner-resource-plugin/eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.sln
168168
- name: Unit Tests

‎.github/workflows/dotnet-core-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Build the tagged Docker image
4545
run: docker build . -t microtingas/outer-inner-resource-container:latest -t microtingas/outer-inner-resource-container:1.0.0 --build-arg GITVERSION=1.00 --build-arg PLUGINVERSION=1.0.0
4646
- run: docker save microtingas/outer-inner-resource-container:latest -o outer-inner-resource-container.tar
47-
- uses: actions/upload-artifact@v2
47+
- uses: actions/upload-artifact@v4
4848
with:
4949
name: outer-inner-resource-container
5050
path: outer-inner-resource-container.tar
@@ -61,7 +61,7 @@ jobs:
6161
run: |
6262
docker pull mariadb:10.8
6363
docker run --name mariadbtest --network data -e MYSQL_ROOT_PASSWORD=secretpassword -p 3306:3306 -d mariadb:10.8
64-
- uses: actions/download-artifact@v3
64+
- uses: actions/download-artifact@v4
6565
with:
6666
name: outer-inner-resource-container
6767
- run: docker load -i outer-inner-resource-container.tar
@@ -152,7 +152,7 @@ jobs:
152152
- name: Setup .NET Core
153153
uses: actions/setup-dotnet@v3
154154
with:
155-
dotnet-version: 8.0.x
155+
dotnet-version: 9.0.x
156156
- name: Build
157157
run: dotnet build eform-angular-outer-inner-resource-plugin/eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.sln
158158
- name: Unit Tests

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY eform-angular-frontend/eform-client ./
55
RUN yarn install
66
RUN npm run build
77

8-
FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
8+
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
99
WORKDIR /app
1010
ARG GITVERSION
1111
ARG PLUGINVERSION
@@ -17,7 +17,7 @@ RUN dotnet publish eFormAPI.Web -o eFormAPI.Web/out /p:Version=$GITVERSION --run
1717
RUN dotnet publish OuterInnerResource.Pn -o OuterInnerResource.Pn/out /p:Version=$PLUGINVERSION --runtime linux-x64 --configuration Release
1818

1919
# Build runtime image
20-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
20+
FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
2121
WORKDIR /app
2222
COPY --from=build-env /app/eFormAPI.Web/out .
2323
RUN mkdir -p ./Plugins/OuterInnerResource.Pn

‎eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.Test/CanaryInAColeMine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CanaryInAColeMine
3232
[Test]
3333
public void CanPeep()
3434
{
35-
Assert.True(true);
35+
Assert.That(true);
3636
}
3737
}
38-
}
38+
}

‎eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.Test/EmployeeInnerResourcesReportsUTest.cs‎

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

‎eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.Test/EmployeeOuterResourcesReportsUTest.cs‎

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

‎eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.Test/EmployeesReportsUTest.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationDay,
119119

120120
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
121121

122-
Assert.AreEqual(reportModel.SubReports.Count, 1);
123-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 4200);
124-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, sitesList.Count);
125-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, sitesList[0].Name);
126-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, sitesList[1].Name);
127-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 1800);
128-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 2400);
129-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 600);
130-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 600);
122+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
123+
Assert.That(4200, Is.EqualTo(reportModel.SubReports[0].TotalTime));
124+
Assert.That(sitesList.Count, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
125+
Assert.That(sitesList[0].Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
126+
Assert.That(sitesList[1].Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
127+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
128+
Assert.That(2400, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
129+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
130+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
131131
}
132132

133133
[Test]
@@ -211,17 +211,17 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationWeek,
211211

212212
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
213213

214-
Assert.AreEqual(reportModel.SubReports.Count, 1);
215-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 3600);
216-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, sitesList.Count);
217-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, sitesList[0].Name);
218-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, sitesList[1].Name);
219-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 1800);
220-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 1800);
221-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 0);
222-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 1200);
223-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2], 600);
224-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3], 0);
214+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
215+
Assert.That(3600, Is.EqualTo(reportModel.SubReports[0].TotalTime));
216+
Assert.That(sitesList.Count, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
217+
Assert.That(sitesList[0].Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
218+
Assert.That(sitesList[1].Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
219+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
220+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
221+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
222+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
223+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2]));
224+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3]));
225225
}
226226

227227
[Test]
@@ -304,18 +304,18 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationMonth
304304

305305
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
306306

307-
Assert.AreEqual(reportModel.SubReports.Count, 1);
308-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 3000);
309-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, sitesList.Count);
310-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, sitesList[0].Name);
311-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, sitesList[1].Name);
312-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 1800);
313-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 1200);
314-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 0);
315-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 600);
316-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2], 1200);
317-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3], 0);
318-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[4], 0);
307+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
308+
Assert.That(3000, Is.EqualTo(reportModel.SubReports[0].TotalTime));
309+
Assert.That(sitesList.Count, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
310+
Assert.That(sitesList[0].Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
311+
Assert.That(sitesList[1].Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
312+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
313+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
314+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
315+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
316+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2]));
317+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3]));
318+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[4]));
319319
}
320320
}
321321
}

‎eFormAPI/Plugins/OuterInnerResource.Pn/OuterInnerResource.Pn.Test/InnerResourcesReportUTest.cs‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -117,25 +117,25 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationDay,
117117

118118
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
119119

120-
Assert.AreEqual(reportModel.SubReports.Count, 1);
121-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 4200);
122-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, 3);
123-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, newMachine.Name);
124-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, newMachine1.Name);
125-
Assert.AreEqual(reportModel.SubReports[0].Entities[2].EntityName, newMachine2.Name);
126-
127-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 1200);
128-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 1800);
129-
130-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 1200);
131-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 0);
132-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2], 0);
133-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3], 0);
134-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0], 0);
135-
136-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1], 1200);
137-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2], 600);
138-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3], 0);
120+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
121+
Assert.That(4200, Is.EqualTo(reportModel.SubReports[0].TotalTime));
122+
Assert.That(3, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
123+
Assert.That(newMachine.Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
124+
Assert.That(newMachine1.Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
125+
Assert.That(newMachine2.Name, Is.EqualTo(reportModel.SubReports[0].Entities[2].EntityName));
126+
127+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
128+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
129+
130+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
131+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
132+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2]));
133+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3]));
134+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0]));
135+
136+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1]));
137+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2]));
138+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3]));
139139
}
140140

141141
[Test]
@@ -216,25 +216,25 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationWeek,
216216

217217
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
218218

219-
Assert.AreEqual(reportModel.SubReports.Count, 1);
220-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 3600);
221-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, 3);
222-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, newMachine.Name);
223-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, newMachine1.Name);
224-
Assert.AreEqual(reportModel.SubReports[0].Entities[2].EntityName, newMachine2.Name);
225-
226-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 600);
227-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 1800);
228-
229-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 0);
230-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 600);
231-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2], 0);
232-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3], 0);
233-
234-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0], 0);
235-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1], 600);
236-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2], 0);
237-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3], 1200);
219+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
220+
Assert.That(3600, Is.EqualTo(reportModel.SubReports[0].TotalTime));
221+
Assert.That(3, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
222+
Assert.That(newMachine.Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
223+
Assert.That(newMachine1.Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
224+
Assert.That(newMachine2.Name, Is.EqualTo(reportModel.SubReports[0].Entities[2].EntityName));
225+
226+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
227+
Assert.That(1800, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
228+
229+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
230+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
231+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2]));
232+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3]));
233+
234+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0]));
235+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1]));
236+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2]));
237+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3]));
238238
}
239239

240240
[Test]
@@ -315,27 +315,27 @@ await DbContext.ResourceTimeRegistrations.AddRangeAsync(newTimeRegistrationMonth
315315

316316
ReportModel reportModel = ReportsHelper.GetReportData(model, jobsList, sitesList, (int)ReportTimeType.Minutes);
317317

318-
Assert.AreEqual(reportModel.SubReports.Count, 1);
319-
Assert.AreEqual(reportModel.SubReports[0].TotalTime, 3000);
320-
Assert.AreEqual(reportModel.SubReports[0].Entities.Count, 3);
321-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].EntityName, newMachine.Name);
322-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].EntityName, newMachine1.Name);
323-
Assert.AreEqual(reportModel.SubReports[0].Entities[2].EntityName, newMachine2.Name);
324-
325-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TotalTime, 1200);
326-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TotalTime, 1200);
327-
328-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0], 0);
329-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1], 600);
330-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2], 0);
331-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3], 600);
332-
Assert.AreEqual(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[4], 0);
333-
334-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0], 0);
335-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1], 0);
336-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2], 600);
337-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3], 600);
338-
Assert.AreEqual(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[4], 0);
318+
Assert.That(1, Is.EqualTo(reportModel.SubReports.Count));
319+
Assert.That(3000, Is.EqualTo(reportModel.SubReports[0].TotalTime));
320+
Assert.That(3, Is.EqualTo(reportModel.SubReports[0].Entities.Count));
321+
Assert.That(newMachine.Name, Is.EqualTo(reportModel.SubReports[0].Entities[0].EntityName));
322+
Assert.That(newMachine1.Name, Is.EqualTo(reportModel.SubReports[0].Entities[1].EntityName));
323+
Assert.That(newMachine2.Name, Is.EqualTo(reportModel.SubReports[0].Entities[2].EntityName));
324+
325+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[0].TotalTime));
326+
Assert.That(1200, Is.EqualTo(reportModel.SubReports[0].Entities[1].TotalTime));
327+
328+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[0]));
329+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[1]));
330+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[2]));
331+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[3]));
332+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[0].TimePerTimeUnit[4]));
333+
334+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[0]));
335+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[1]));
336+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[2]));
337+
Assert.That(600, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[3]));
338+
Assert.That(0, Is.EqualTo(reportModel.SubReports[0].Entities[1].TimePerTimeUnit[4]));
339339
}
340340
}
341341
}

0 commit comments

Comments
 (0)