Skip to content

Commit 9edc00d

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into dependabot/nuget/eFormAPI/Plugins/BackendConfiguration.Pn/McMaster.NETCore.Plugins-2.0.0
2 parents a225ca8 + e303281 commit 9edc00d

File tree

50 files changed

+4472
-2164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4472
-2164
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfiguration.Pn.Integration.Test.csproj‎

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

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
14-
<PackageReference Include="NSubstitute" Version="5.1.0" />
15-
<PackageReference Include="NUnit" Version="3.14.0" />
14+
<PackageReference Include="NSubstitute" Version="5.3.0" />
15+
<PackageReference Include="NUnit" Version="4.3.2" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
17+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestAcidification.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@
146146
// var cases = await MicrotingDbContext!.Cases.ToListAsync();
147147
//
148148
// // Assert result
149-
// Assert.NotNull(result);
149+
// Assert.That(result, Is.Not.Null);
150150
// Assert.That(result.Success, Is.EqualTo(true));
151151
//
152152
// // Assert areaRules
153-
// Assert.NotNull(areaRules);
153+
// Assert.That(areaRules, Is.Not.Null);
154154
// Assert.That(areaRules.Count, Is.EqualTo(3));
155155
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
156156
// Assert.That(areaRules[1].PropertyId, Is.EqualTo(properties[0].Id));
@@ -163,7 +163,7 @@
163163
// Assert.That(areaRules[2].EformName, Is.EqualTo("09. Forsuring driftsstop"));
164164
//
165165
// // Assert areaRuleTranslations
166-
// Assert.NotNull(areaRuleTranslations);
166+
// Assert.That(areaRuleTranslations, Is.Not.Null);
167167
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(9));
168168
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("09. Forsuring pH værdi"));
169169
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
@@ -185,7 +185,7 @@
185185
// Assert.That(areaRuleTranslations[8].atr.LanguageId, Is.EqualTo(3));
186186
//
187187
// // Assert areaProperties
188-
// Assert.NotNull(areaProperties);
188+
// Assert.That(areaProperties, Is.Not.Null);
189189
// Assert.That(areaProperties.Count, Is.EqualTo(1));
190190
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
191191
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestLogBooks.cs‎

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

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestLogBooksCustomStartDate.cs‎

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

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestLogBooksMonths.cs‎

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

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestLogBooksMonthsCustomDate.cs‎

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

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationAreaRulePlanningsServiceHelperTestSlurryTanks.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -181,25 +181,25 @@
181181
// var floatingLayerEformId = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
182182
//
183183
// // Assert result
184-
// Assert.NotNull(result);
184+
// Assert.That(result, Is.Not.Null);
185185
// Assert.That(result.Success, Is.EqualTo(true));
186186
//
187187
// // Assert areaRules
188-
// Assert.NotNull(areaRules);
188+
// Assert.That(areaRules, Is.Not.Null);
189189
// Assert.That(areaRules.Count, Is.EqualTo(1));
190190
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
191191
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
192192
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
193193
//
194194
// // Assert areaRuleTranslations
195-
// Assert.NotNull(areaRuleTranslations);
195+
// Assert.That(areaRuleTranslations, Is.Not.Null);
196196
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
197197
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
198198
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
199199
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
200200
//
201201
// // Assert areaProperties
202-
// Assert.NotNull(areaProperties);
202+
// Assert.That(areaProperties, Is.Not.Null);
203203
// Assert.That(areaProperties.Count, Is.EqualTo(1));
204204
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
205205
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
@@ -526,25 +526,25 @@
526526
// var alarmeFormid = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
527527
//
528528
// // Assert result
529-
// Assert.NotNull(result);
529+
// Assert.That(result, Is.Not.Null);
530530
// Assert.That(result.Success, Is.EqualTo(true));
531531
//
532532
// // Assert areaRules
533-
// Assert.NotNull(areaRules);
533+
// Assert.That(areaRules, Is.Not.Null);
534534
// Assert.That(areaRules.Count, Is.EqualTo(1));
535535
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
536536
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
537537
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
538538
//
539539
// // Assert areaRuleTranslations
540-
// Assert.NotNull(areaRuleTranslations);
540+
// Assert.That(areaRuleTranslations, Is.Not.Null);
541541
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
542542
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
543543
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
544544
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
545545
//
546546
// // Assert areaProperties
547-
// Assert.NotNull(areaProperties);
547+
// Assert.That(areaProperties, Is.Not.Null);
548548
// Assert.That(areaProperties.Count, Is.EqualTo(1));
549549
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
550550
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
@@ -922,25 +922,25 @@
922922
// /*var alarmeFormid = */await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol alarmanlæg gyllebeholder").Select(x => x.CheckListId).FirstAsync();
923923
// var floatingLayerEformId = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
924924
//
925-
// Assert.NotNull(result);
925+
// Assert.That(result, Is.Not.Null);
926926
// Assert.That(result.Success, Is.EqualTo(true));
927927
//
928928
// // Assert areaRules
929-
// Assert.NotNull(areaRules);
929+
// Assert.That(areaRules, Is.Not.Null);
930930
// Assert.That(areaRules.Count, Is.EqualTo(1));
931931
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
932932
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
933933
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
934934
//
935935
// // Assert areaRuleTranslations
936-
// Assert.NotNull(areaRuleTranslations);
936+
// Assert.That(areaRuleTranslations, Is.Not.Null);
937937
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
938938
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
939939
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
940940
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
941941
//
942942
// // Assert areaProperties
943-
// Assert.NotNull(areaProperties);
943+
// Assert.That(areaProperties, Is.Not.Null);
944944
// Assert.That(areaProperties.Count, Is.EqualTo(1));
945945
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
946946
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
@@ -1421,25 +1421,25 @@
14211421
// /*var alarmeFormid = */await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol alarmanlæg gyllebeholder").Select(x => x.CheckListId).FirstAsync();
14221422
// var floatingLayerEformId = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
14231423
//
1424-
// Assert.NotNull(result);
1424+
// Assert.That(result, Is.Not.Null);
14251425
// Assert.That(result.Success, Is.EqualTo(true));
14261426
//
14271427
// // Assert areaRules
1428-
// Assert.NotNull(areaRules);
1428+
// Assert.That(areaRules, Is.Not.Null);
14291429
// Assert.That(areaRules.Count, Is.EqualTo(1));
14301430
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
14311431
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
14321432
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
14331433
//
14341434
// // Assert areaRuleTranslations
1435-
// Assert.NotNull(areaRuleTranslations);
1435+
// Assert.That(areaRuleTranslations, Is.Not.Null);
14361436
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
14371437
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
14381438
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
14391439
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
14401440
//
14411441
// // Assert areaProperties
1442-
// Assert.NotNull(areaProperties);
1442+
// Assert.That(areaProperties, Is.Not.Null);
14431443
// Assert.That(areaProperties.Count, Is.EqualTo(1));
14441444
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
14451445
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
@@ -2024,25 +2024,25 @@
20242024
// /*var alarmeFormid = */await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol alarmanlæg gyllebeholder").Select(x => x.CheckListId).FirstAsync();
20252025
// var floatingLayerEformId = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
20262026
//
2027-
// Assert.NotNull(result);
2027+
// Assert.That(result, Is.Not.Null);
20282028
// Assert.That(result.Success, Is.EqualTo(true));
20292029
//
20302030
// // Assert areaRules
2031-
// Assert.NotNull(areaRules);
2031+
// Assert.That(areaRules, Is.Not.Null);
20322032
// Assert.That(areaRules.Count, Is.EqualTo(1));
20332033
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
20342034
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
20352035
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
20362036
//
20372037
// // Assert areaRuleTranslations
2038-
// Assert.NotNull(areaRuleTranslations);
2038+
// Assert.That(areaRuleTranslations, Is.Not.Null);
20392039
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
20402040
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
20412041
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
20422042
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
20432043
//
20442044
// // Assert areaProperties
2045-
// Assert.NotNull(areaProperties);
2045+
// Assert.That(areaProperties, Is.Not.Null);
20462046
// Assert.That(areaProperties.Count, Is.EqualTo(1));
20472047
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
20482048
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
@@ -2626,26 +2626,26 @@
26262626
// /*var alarmeFormid = */await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol alarmanlæg gyllebeholder").Select(x => x.CheckListId).FirstAsync();
26272627
// var floatingLayerEformId = await MicrotingDbContext.CheckListTranslations.Where(x => x.Text == "03. Kontrol flydelag").Select(x => x.CheckListId).FirstAsync();
26282628
//
2629-
// Assert.NotNull(result);
2629+
// Assert.That(result, Is.Not.Null);
26302630
// Assert.That(result.Success, Is.EqualTo(true));
26312631
//
26322632
// // Assert areaRules
2633-
// Assert.NotNull(areaRules);
2633+
// Assert.That(areaRules, Is.Not.Null);
26342634
// Assert.That(areaRules.Count, Is.EqualTo(1));
26352635
// Assert.That(areaRules[0].PropertyId, Is.EqualTo(properties[0].Id));
26362636
// Assert.That(areaRules[0].AreaId, Is.EqualTo(areaTranslation.AreaId));
26372637
// Assert.That(areaRules[0].EformName, Is.EqualTo("03. Kontrol konstruktion"));
26382638
//
26392639
// // Assert areaRuleTranslations
2640-
// Assert.NotNull(areaRuleTranslations);
2640+
// Assert.That(areaRuleTranslations, Is.Not.Null);
26412641
// Assert.That(areaRuleTranslations.Count, Is.EqualTo(1));
26422642
// Assert.That(areaRuleTranslations[0].atr.AreaRuleId, Is.EqualTo(areaRules[0].Id));
26432643
// Assert.That(areaRuleTranslations[0].atr.LanguageId, Is.EqualTo(1));
26442644
// Assert.That(areaRuleTranslations[0].atr.Name, Is.EqualTo("Beholeder 1"));
26452645
//
26462646
//
26472647
// // Assert areaProperties
2648-
// Assert.NotNull(areaProperties);
2648+
// Assert.That(areaProperties, Is.Not.Null);
26492649
// Assert.That(areaProperties.Count, Is.EqualTo(1));
26502650
// Assert.That(areaProperties[0].PropertyId, Is.EqualTo(properties[0].Id));
26512651
// Assert.That(areaProperties[0].AreaId, Is.EqualTo(areaTranslation.AreaId));

0 commit comments

Comments
 (0)