Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensions.cs =================================================================== diff -u -re73044fe9a7ef3d834a019841d04307fa7d2ec22 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCollectionCreateExtensions.cs) (revision e73044fe9a7ef3d834a019841d04307fa7d2ec22) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCollectionCreateExtensions.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -36,7 +36,7 @@ /// Creates a based on the information /// of the . /// - /// The of + /// The collection of /// to create a database entity for. /// The object keeping track of create operations. /// A new . Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs =================================================================== diff -u -r7e027e29474068f4fc2f74f97793773fe5ec57a3 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCreateExtensions.cs) (revision 7e027e29474068f4fc2f74f97793773fe5ec57a3) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCreateExtensions.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -26,7 +26,7 @@ namespace Application.Ringtoets.Storage.Create { /// - /// Extension methods for related + /// Extension methods for related /// to creating a . /// internal static class HydraulicBoundaryLocationCalculationCreateExtensions @@ -39,8 +39,8 @@ /// The object keeping track of create operations. /// A new . /// Thrown when any parameter is null. - public static HydraulicLocationCalculationEntity Create(this HydraulicBoundaryLocationCalculation calculation, - PersistenceRegistry registry) + internal static HydraulicLocationCalculationEntity Create(this HydraulicBoundaryLocationCalculation calculation, + PersistenceRegistry registry) { if (calculation == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationCalculationCollectionReadExtensions.cs =================================================================== diff -u -r1fa9ae637530f3c6914b83a1afa751a422ebda98 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationCalculationCollectionReadExtensions.cs (.../HydraulicLocationCalculationCollectionReadExtensions.cs) (revision 1fa9ae637530f3c6914b83a1afa751a422ebda98) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationCalculationCollectionReadExtensions.cs (.../HydraulicLocationCalculationCollectionReadExtensions.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -28,7 +28,7 @@ namespace Application.Ringtoets.Storage.Read { /// - /// This class defines extension methods for read operations for an of + /// This class defines extension methods for read operations for a collection of /// based on the . /// internal static class HydraulicLocationCalculationCollectionReadExtensions @@ -61,13 +61,13 @@ throw new ArgumentNullException(nameof(collector)); } - Dictionary dictionary = + Dictionary calculationsLookup = calculations.ToDictionary(calc => calc.HydraulicBoundaryLocation, calc => calc); foreach (HydraulicLocationCalculationEntity calculationEntity in entity.HydraulicLocationCalculationEntities) { HydraulicBoundaryLocation hydraulicBoundaryLocation = collector.Get(calculationEntity.HydraulicLocationEntity); - HydraulicBoundaryLocationCalculation calculation = dictionary[hydraulicBoundaryLocation]; + HydraulicBoundaryLocationCalculation calculation = calculationsLookup[hydraulicBoundaryLocation]; calculationEntity.Read(calculation); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -198,23 +198,7 @@ CollectionAssert.IsEmpty(entity.HydraulicLocationEntities); CollectionAssert.IsEmpty(entity.HydraRingPreprocessorEntities); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity1); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity2); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity3); - - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity4); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity5); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity6); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity7); + AssertHydraulicLocationCalculationCollectionEntities(assessmentSection, entity); } [Test] @@ -251,23 +235,7 @@ int expectedNrOfHydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations.Count; Assert.AreEqual(expectedNrOfHydraulicBoundaryLocations, entity.HydraulicLocationEntities.Count); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity1); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity2); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity3); - - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity4); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, - entity.HydraulicLocationCalculationCollectionEntity5); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity6); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, - entity.HydraulicLocationCalculationCollectionEntity7); + AssertHydraulicLocationCalculationCollectionEntities(assessmentSection, entity); } [Test] @@ -363,6 +331,27 @@ Assert.AreEqual(expectedXml, entity.ReferenceLinePointXml); } + private static void AssertHydraulicLocationCalculationCollectionEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity) + { + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity1); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity2); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity3); + + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity4); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity5); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity6); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity7); + } + private static void SetHydraulicBoundaryLocationCalculationInputsOfAssessmentSection(AssessmentSection assessmentSection) { SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, 1); @@ -391,14 +380,13 @@ { Assert.IsNotNull(actualCollectionEntity); - HydraulicBoundaryLocationCalculation[] expectedCalculationsArray = expectedCalculations.ToArray(); ICollection hydraulicLocationCalculationEntities = actualCollectionEntity.HydraulicLocationCalculationEntities; - Assert.AreEqual(expectedCalculationsArray.Length, hydraulicLocationCalculationEntities.Count); + Assert.AreEqual(expectedCalculations.Count(), hydraulicLocationCalculationEntities.Count); var i = 0; foreach (HydraulicLocationCalculationEntity actualCalculationEntity in hydraulicLocationCalculationEntities) { - HydraulicBoundaryLocationCalculation expectedCalculation = expectedCalculationsArray[i]; + HydraulicBoundaryLocationCalculation expectedCalculation = expectedCalculations.ElementAt(i); Assert.AreEqual(Convert.ToByte(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated), actualCalculationEntity.ShouldIllustrationPointsBeCalculated); i++; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs =================================================================== diff -u -ra17197220f9fe2b039dc7ccdea1a63ed37384018 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs (.../MigrationTo171IntegrationTest.cs) (revision a17197220f9fe2b039dc7ccdea1a63ed37384018) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs (.../MigrationTo171IntegrationTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -193,7 +193,7 @@ { string validateSoilLayers = $"ATTACH DATABASE[{sourceFilePath}] AS SOURCEPROJECT; " + - "SELECT COUNT() = (SELECT COUNT() FROM[SOURCEPROJECT].SoilLayerEntity) " + + "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].SoilLayerEntity) " + "FROM SoilLayerEntity AS NEW " + "LEFT JOIN [SOURCEPROJECT].SoilLayerEntity AS OLD ON NEW.[SoilLayerEntityId] = OLD.[SoilLayerEntityId] " + "WHERE ((NEW.[DiameterD70CoefficientOfVariation] IS NULL AND OLD.[DiameterD70Deviation] IS NULL) " + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs =================================================================== diff -u -r74f0d4595e72d2c3d7128ac3d64ecf91b4c048ab -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 74f0d4595e72d2c3d7128ac3d64ecf91b4c048ab) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -653,7 +653,7 @@ "[ClosingStructureCollectionSourcePath] IS NOT NULL AND NOT COUNT([ClosingStructureEntityId]) " + "THEN 1 ELSE 0 END AS [IsInvalid] " + "FROM [ClosingStructuresFailureMechanismMetaEntity] " + - "LEFT JOIN [ClosingStructureEntity] USING ([FailureMechanismEntityId]) " + + "LEFT JOIN [ClosingStructureEntity] USING([FailureMechanismEntityId]) " + "GROUP BY [FailureMechanismEntityId]);"; reader.AssertReturnedDataIsValid(validateStructuresCollectionSourcePath); @@ -768,7 +768,7 @@ "[HeightStructureCollectionSourcePath] IS NOT NULL AND NOT COUNT([HeightStructureEntityId]) " + "THEN 1 ELSE 0 END AS [IsInvalid] " + "FROM [HeightStructuresFailureMechanismMetaEntity] " + - "LEFT JOIN [HeightStructureEntity] USING ([FailureMechanismEntityId]) " + + "LEFT JOIN [HeightStructureEntity] USING([FailureMechanismEntityId]) " + "GROUP BY [FailureMechanismEntityId]);"; reader.AssertReturnedDataIsValid(validateStructuresCollectionSourcePath); @@ -936,7 +936,7 @@ "[StabilityPointStructureCollectionSourcePath] IS NOT NULL AND NOT COUNT([StabilityPointStructureEntityId]) " + "THEN 1 ELSE 0 END AS [IsInvalid] " + "FROM [StabilityPointStructuresFailureMechanismMetaEntity] " + - "LEFT JOIN [StabilityPointStructureEntity] USING ([FailureMechanismEntityId]) " + + "LEFT JOIN [StabilityPointStructureEntity] USING([FailureMechanismEntityId]) " + "GROUP BY [FailureMechanismEntityId]);"; reader.AssertReturnedDataIsValid(validateStructuresCollectionSourcePath); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r2253448c8658a3ceff6778cb992d1c271c6538ad -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 2253448c8658a3ceff6778cb992d1c271c6538ad) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -411,7 +411,7 @@ "SELECT " + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].AssessmentSectionEntity) " + "FROM AssessmentSectionEntity NEW " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity AS OLD USING (AssessmentSectionEntityId) " + + "JOIN [SOURCEPROJECT].AssessmentSectionEntity AS OLD USING(AssessmentSectionEntityId) " + "WHERE NEW.ProjectEntityId = OLD.ProjectEntityId " + "AND NEW.Id = OLD.Id " + "AND NEW.Name IS OLD.Name " + @@ -433,9 +433,9 @@ { string validateMigratedHyraulicBoundaryLocations = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT " + - "COUNT() = (SELECT COUNT() FROM[SOURCEPROJECT].HydraulicLocationEntity) " + + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].HydraulicLocationEntity) " + "FROM HydraulicLocationEntity NEW " + - "JOIN[SourceProject].HydraulicLocationEntity AS OLD USING(HydraulicLocationEntityId) " + + "JOIN [SourceProject].HydraulicLocationEntity AS OLD USING(HydraulicLocationEntityId) " + "WHERE NEW.AssessmentSectionEntityId = OLD.AssessmentSectionEntityId " + "AND NEW.LocationId = OLD.LocationId " + "AND NEW.Name = OLD.Name " + @@ -445,7 +445,7 @@ "DETACH DATABASE SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateMigratedHyraulicBoundaryLocations); - string validateNrOfHydraulicLocationCalculations = + string validateHydraulicLocationCalculationCount = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT " + "COUNT() = 0 " + @@ -454,20 +454,20 @@ "SELECT " + "COUNT(distinct HydraulicLocationCalculationEntityId) AS NrOfCalculationsPerLocation " + "FROM [SOURCEPROJECT].HydraulicLocationEntity " + - "LEFT JOIN HydraulicLocationCalculationEntity USING (HydraulicLocationEntityId) " + + "LEFT JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationEntityId) " + "GROUP BY HydraulicLocationEntityId " + ") " + "WHERE NrOfCalculationsPerLocation IS NOT 14; " + "DETACH DATABASE SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateNrOfHydraulicLocationCalculations); + reader.AssertReturnedDataIsValid(validateHydraulicLocationCalculationCount); const string validateHydraulicBoundaryCalculationInputValues = "SELECT " + "COUNT() = 0 " + "FROM HydraulicLocationCalculationEntity " + "WHERE ShouldIllustrationPointsBeCalculated != 0 AND ShouldIllustrationPointsBeCalculated != 1"; reader.AssertReturnedDataIsValid(validateHydraulicBoundaryCalculationInputValues); - string validateNrOfHydraulicLocationCalculationOutputs = + string validateHydraulicLocationCalculationOutputCount = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT COUNT() = " + "( " + @@ -480,7 +480,7 @@ ") " + "FROM HydraulicLocationOutputEntity; " + "DETACH DATABASE SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateNrOfHydraulicLocationCalculationOutputs); + reader.AssertReturnedDataIsValid(validateHydraulicLocationCalculationOutputCount); } private static void AssertHydraulicBoundaryLocationsOnAssessmentSection(MigratedDatabaseReader reader, string sourceFilePath) @@ -504,11 +504,11 @@ $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT " + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity) " + - "FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity new " + - "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity source USING (GrassCoverErosionOutwardsFailureMechanismMetaEntityId) " + - "WHERE new.FailureMechanismEntityId = source.FailureMechanismEntityId " + - "AND new.N = source.N " + - "AND new.ForeshoreProfileCollectionSourcePath IS source.ForeshoreProfileCollectionSourcePath; " + + "FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity NEW " + + "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity OLD USING(GrassCoverErosionOutwardsFailureMechanismMetaEntityId) " + + "WHERE new.FailureMechanismEntityId = OLD.FailureMechanismEntityId " + + "AND NEW.N = OLD.N " + + "AND NEW.ForeshoreProfileCollectionSourcePath IS OLD.ForeshoreProfileCollectionSourcePath; " + "DETACH DATABASE SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateMetaEntity); @@ -523,7 +523,7 @@ "SELECT " + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity) " + "FROM HeightStructuresSectionResultEntity NEW " + - "JOIN [SOURCEPROJECT].HeightStructuresSectionResultEntity OLD USING (HeightStructuresSectionResultEntityId) " + + "JOIN [SOURCEPROJECT].HeightStructuresSectionResultEntity OLD USING(HeightStructuresSectionResultEntityId) " + "WHERE NEW.FailureMechanismSectionEntityId = OLD.FailureMechanismSectionEntityId " + "AND NEW.HeightStructuresCalculationEntityId IS OLD.HeightStructuresCalculationEntityId " + "AND NEW.SimpleAssessmentResult = 1 " + @@ -543,7 +543,7 @@ "SELECT " + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].ClosingStructuresSectionResultEntity) " + "FROM ClosingStructuresSectionResultEntity NEW " + - "JOIN [SOURCEPROJECT].ClosingStructuresSectionResultEntity OLD USING (ClosingStructuresSectionResultEntityId) " + + "JOIN [SOURCEPROJECT].ClosingStructuresSectionResultEntity OLD USING(ClosingStructuresSectionResultEntityId) " + "WHERE NEW.FailureMechanismSectionEntityId = OLD.FailureMechanismSectionEntityId " + "AND NEW.ClosingStructuresCalculationEntityId IS OLD.ClosingStructuresCalculationEntityId " + "AND NEW.SimpleAssessmentResult = 1 " + @@ -563,7 +563,7 @@ "SELECT " + "COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity) " + "FROM StabilityPointStructuresSectionResultEntity NEW " + - "JOIN [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity OLD USING (StabilityPointStructuresSectionResultEntityId) " + + "JOIN [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity OLD USING(StabilityPointStructuresSectionResultEntityId) " + "WHERE NEW.FailureMechanismSectionEntityId = OLD.FailureMechanismSectionEntityId " + "AND NEW.StabilityPointStructuresCalculationEntityId IS OLD.StabilityPointStructuresCalculationEntityId " + "AND NEW.SimpleAssessmentResult = 1 " + @@ -603,13 +603,13 @@ private static void AssertWaveHeightCalculationEntitiesOnAssessmentSection(MigratedDatabaseReader reader, HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator queryGenerator) { - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForLowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForFactorizedLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); @@ -630,13 +630,13 @@ private static void AssertDesignWaterLevelCalculationEntitiesOnAssessmentSection(MigratedDatabaseReader reader, HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator queryGenerator) { - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForLowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); @@ -730,7 +730,7 @@ /// /// The type of calculation that should be validated. /// The query to validate the number of hydraulic boundary location calculations per assessment section. - public string GetNrOfHydraulicBoundaryLocationCalculationsPerAssessmentSectionValidationQuery(CalculationType calculationType) + public string GetHydraulicBoundaryLocationCalculationsPerAssessmentSectionCountValidationQuery(CalculationType calculationType) { return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT " + @@ -980,11 +980,11 @@ private static void AssertDesignWaterLevelCalculationEntitiesOnGrassCoverErosionOutwardsFailureMechanism(MigratedDatabaseReader reader, HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator queryGenerator) { - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.SignalingNorm)); @@ -1001,11 +1001,11 @@ private static void AssertWaveHeightCalculationEntitiesOnGrassCoverErosionOutwardsFailureMechanism(MigratedDatabaseReader reader, HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator queryGenerator) { - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificSignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism( + reader.AssertReturnedDataIsValid(queryGenerator.GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.SignalingNorm)); @@ -1075,7 +1075,7 @@ /// /// The type of calculation that should be validated. /// The query to validate the number of hydraulic boundary location calculations per assessment section. - public string GetNrOfHydraulicBoundaryLocationCalculationsPerFailureMechanism(CalculationType calculationType) + public string GetHydraulicBoundaryLocationCalculationsPerFailureMechanismCountValidationQuery(CalculationType calculationType) { return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT COUNT() = 0 " + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rff0be868cbb3788e9d144f8dd1a7fd6bc326c418 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ff0be868cbb3788e9d144f8dd1a7fd6bc326c418) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -28,7 +28,6 @@ using Application.Ringtoets.Storage.TestUtil; using Application.Ringtoets.Storage.TestUtil.Hydraulics; using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r790cfed116a6bd0d34eae8b66dae8dfc66774c86 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs (.../HydraulicLocationCalculationEntityReadExtensionsTest.cs) (revision 790cfed116a6bd0d34eae8b66dae8dfc66774c86) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs (.../HydraulicLocationCalculationEntityReadExtensionsTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -22,13 +22,13 @@ using System; using System.Linq; using Application.Ringtoets.Storage.DbContext; +using Application.Ringtoets.Storage.Read; using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.IllustrationPoints; using Ringtoets.Common.Data.TestUtil; -using Application.Ringtoets.Storage.Read; namespace Application.Ringtoets.Storage.Test.Read { @@ -42,7 +42,7 @@ var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Call - TestDelegate call = () => ((HydraulicLocationCalculationEntity)null).Read(calculation); + TestDelegate call = () => ((HydraulicLocationCalculationEntity) null).Read(calculation); // Assert var exception = Assert.Throws(call); @@ -68,9 +68,9 @@ { // Setup HydraulicLocationCalculationEntity entity = CreateCalculationEntity(21); - + var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); - + // Call entity.Read(calculation); @@ -108,7 +108,6 @@ AssertHydraulicBoundaryLocationCalculation(entity, calculation); } - private static HydraulicLocationCalculationEntity CreateCalculationEntity(int seed) { var random = new Random(seed); @@ -129,7 +128,7 @@ TargetReliability = random.NextDouble(), CalculatedProbability = random.NextDouble(), CalculatedReliability = random.NextDouble(), - CalculationConvergence = (byte)CalculationConvergence.NotCalculated + CalculationConvergence = (byte) CalculationConvergence.NotCalculated }; return hydraulicLocationOutputEntity; } @@ -179,16 +178,16 @@ } Assert.IsNotNull(expected.Result); - Assert.AreEqual((RoundedDouble)expected.Result, actual.Result, actual.Result.GetAccuracy()); + Assert.AreEqual((RoundedDouble) expected.Result, actual.Result, actual.Result.GetAccuracy()); Assert.IsNotNull(expected.TargetReliability); - Assert.AreEqual((RoundedDouble)expected.TargetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy()); + Assert.AreEqual((RoundedDouble) expected.TargetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy()); Assert.IsNotNull(expected.TargetProbability); Assert.AreEqual(expected.TargetProbability, actual.TargetProbability); Assert.IsNotNull(expected.CalculatedReliability); - Assert.AreEqual((RoundedDouble)expected.CalculatedReliability, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy()); + Assert.AreEqual((RoundedDouble) expected.CalculatedReliability, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy()); Assert.IsNotNull(expected.CalculatedProbability); Assert.AreEqual(expected.CalculatedProbability, actual.CalculatedProbability); - Assert.AreEqual((CalculationConvergence)expected.CalculationConvergence, actual.CalculationConvergence); + Assert.AreEqual((CalculationConvergence) expected.CalculationConvergence, actual.CalculationConvergence); AssertGeneralResult(expected.GeneralResultSubMechanismIllustrationPointEntity, actual.GeneralResult); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs =================================================================== diff -u -r7ce4c7b033f8983567620f4d1526b7247cf57682 -r41c99cb11975b9b16074ee02e189fb071692ccfd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs (.../HydraulicLocationEntityTestFactory.cs) (revision 7ce4c7b033f8983567620f4d1526b7247cf57682) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs (.../HydraulicLocationEntityTestFactory.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) @@ -30,8 +30,7 @@ public static class HydraulicLocationEntityTestFactory { /// - /// Creates a minimal with a configured - /// name and its hydraulic calculation entities set. + /// Creates a minimal with a configured name. /// /// A valid . public static HydraulicLocationEntity CreateHydraulicLocationEntity()