Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r0cd7e5d27a72723cc3d32304b96cc0ab58494753 -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0cd7e5d27a72723cc3d32304b96cc0ab58494753) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -655,180 +655,180 @@ /// /// Looks up a localized string similar to Overige informatie.. /// - public static string HydraulicLocationConfigurationSettings_Comment_Description { + public static string HydraulicLocationConfigurationDatabase_Comment_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Comment_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Comment_Description", resourceCulture); } } /// /// Looks up a localized string similar to Overig. /// - public static string HydraulicLocationConfigurationSettings_Comment_DisplayName { + public static string HydraulicLocationConfigurationDatabase_Comment_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Comment_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Comment_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Locatie van het HLCD bestand.. /// - public static string HydraulicLocationConfigurationSettings_FilePath_Description { + public static string HydraulicLocationConfigurationDatabase_FilePath_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_FilePath_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_FilePath_Description", resourceCulture); } } /// /// Looks up a localized string similar to HLCD bestandslocatie. /// - public static string HydraulicLocationConfigurationSettings_FilePath_DisplayName { + public static string HydraulicLocationConfigurationDatabase_FilePath_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_FilePath_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_FilePath_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen.. /// - public static string HydraulicLocationConfigurationSettings_LakeLevel_Description { + public static string HydraulicLocationConfigurationDatabase_LakeLevel_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_LakeLevel_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_LakeLevel_Description", resourceCulture); } } /// /// Looks up a localized string similar to Meerpeil. /// - public static string HydraulicLocationConfigurationSettings_LakeLevel_DisplayName { + public static string HydraulicLocationConfigurationDatabase_LakeLevel_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_LakeLevel_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_LakeLevel_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de rivierafvoer.. /// - public static string HydraulicLocationConfigurationSettings_RiverDischarge_Description { + public static string HydraulicLocationConfigurationDatabase_RiverDischarge_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_RiverDischarge_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_RiverDischarge_Description", resourceCulture); } } /// /// Looks up a localized string similar to Rivierafvoer. /// - public static string HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName { + public static string HydraulicLocationConfigurationDatabase_RiverDischarge_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_RiverDischarge_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Algemene naam van het klimaatscenario.. /// - public static string HydraulicLocationConfigurationSettings_ScenarioName_Description { + public static string HydraulicLocationConfigurationDatabase_ScenarioName_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_ScenarioName_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_ScenarioName_Description", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatscenario. /// - public static string HydraulicLocationConfigurationSettings_ScenarioName_DisplayName { + public static string HydraulicLocationConfigurationDatabase_ScenarioName_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_ScenarioName_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_ScenarioName_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Projectkader waarin de statistiek bedoeld is te gebruiken.. /// - public static string HydraulicLocationConfigurationSettings_Scope_Description { + public static string HydraulicLocationConfigurationDatabase_Scope_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Scope_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Scope_Description", resourceCulture); } } /// /// Looks up a localized string similar to Toepassingskader. /// - public static string HydraulicLocationConfigurationSettings_Scope_DisplayName { + public static string HydraulicLocationConfigurationDatabase_Scope_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Scope_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Scope_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de zeewaterstand.. /// - public static string HydraulicLocationConfigurationSettings_SeaLevel_Description { + public static string HydraulicLocationConfigurationDatabase_SeaLevel_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_SeaLevel_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_SeaLevel_Description", resourceCulture); } } /// /// Looks up a localized string similar to Zeewaterstand. /// - public static string HydraulicLocationConfigurationSettings_SeaLevel_DisplayName { + public static string HydraulicLocationConfigurationDatabase_SeaLevel_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_SeaLevel_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_SeaLevel_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de windrichting.. /// - public static string HydraulicLocationConfigurationSettings_WindDirection_Description { + public static string HydraulicLocationConfigurationDatabase_WindDirection_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindDirection_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_WindDirection_Description", resourceCulture); } } /// /// Looks up a localized string similar to Windrichting. /// - public static string HydraulicLocationConfigurationSettings_WindDirection_DisplayName { + public static string HydraulicLocationConfigurationDatabase_WindDirection_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindDirection_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_WindDirection_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Klimaatinformatie met betrekking tot de windsnelheid.. /// - public static string HydraulicLocationConfigurationSettings_WindSpeed_Description { + public static string HydraulicLocationConfigurationDatabase_WindSpeed_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindSpeed_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_WindSpeed_Description", resourceCulture); } } /// /// Looks up a localized string similar to Windsnelheid. /// - public static string HydraulicLocationConfigurationSettings_WindSpeed_DisplayName { + public static string HydraulicLocationConfigurationDatabase_WindSpeed_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_WindSpeed_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_WindSpeed_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Jaartal van het jaar waarop de statistiek van toepassing is.. /// - public static string HydraulicLocationConfigurationSettings_Year_Description { + public static string HydraulicLocationConfigurationDatabase_Year_Description { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Year_Description", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Year_Description", resourceCulture); } } /// /// Looks up a localized string similar to Zichtjaar. /// - public static string HydraulicLocationConfigurationSettings_Year_DisplayName { + public static string HydraulicLocationConfigurationDatabase_Year_DisplayName { get { - return ResourceManager.GetString("HydraulicLocationConfigurationSettings_Year_DisplayName", resourceCulture); + return ResourceManager.GetString("HydraulicLocationConfigurationDatabase_Year_DisplayName", resourceCulture); } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r0cd7e5d27a72723cc3d32304b96cc0ab58494753 -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0cd7e5d27a72723cc3d32304b96cc0ab58494753) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -288,64 +288,64 @@ Assemblagekaart - + Overige informatie. - + Overig - + Locatie van het HLCD bestand. - + HLCD bestandslocatie - + Klimaatinformatie met betrekking tot het meerpeil/de meerpeilen. - + Meerpeil - + Klimaatinformatie met betrekking tot de rivierafvoer. - + Rivierafvoer - + Algemene naam van het klimaatscenario. - + Klimaatscenario - + Projectkader waarin de statistiek bedoeld is te gebruiken. - + Toepassingskader - + Klimaatinformatie met betrekking tot de zeewaterstand. - + Zeewaterstand - + Klimaatinformatie met betrekking tot de windrichting. - + Windrichting - + Klimaatinformatie met betrekking tot de windsnelheid. - + Windsnelheid - + Jaartal van het jaar waarop de statistiek van toepassing is. - + Zichtjaar Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDataProperties.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDataProperties.cs (.../HydraulicBoundaryDataProperties.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDataProperties.cs (.../HydraulicBoundaryDataProperties.cs) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -62,8 +62,8 @@ [PropertyOrder(hlcdFilePathPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_FilePath_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_FilePath_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_FilePath_Description))] public string HlcdFilePath { get @@ -74,8 +74,8 @@ [PropertyOrder(scenarioNamePropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_ScenarioName_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_ScenarioName_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_ScenarioName_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_ScenarioName_Description))] public string ScenarioName { get @@ -86,8 +86,8 @@ [PropertyOrder(yearPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Year_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Year_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Year_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Year_Description))] public string Year { get @@ -98,8 +98,8 @@ [PropertyOrder(scopePropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Scope_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Scope_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Scope_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Scope_Description))] public string Scope { get @@ -110,8 +110,8 @@ [PropertyOrder(seaLevelPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_SeaLevel_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_SeaLevel_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_SeaLevel_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_SeaLevel_Description))] public string SeaLevel { get @@ -123,8 +123,8 @@ [PropertyOrder(riverDischargePropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_RiverDischarge_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_RiverDischarge_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_RiverDischarge_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_RiverDischarge_Description))] public string RiverDischarge { get @@ -136,8 +136,8 @@ [PropertyOrder(lakeLevelPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_LakeLevel_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_LakeLevel_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_LakeLevel_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_LakeLevel_Description))] public string LakeLevel { get @@ -149,8 +149,8 @@ [PropertyOrder(windDirectionPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindDirection_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindDirection_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_WindDirection_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_WindDirection_Description))] public string WindDirection { get @@ -162,8 +162,8 @@ [PropertyOrder(windSpeedPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindSpeed_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_WindSpeed_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_WindSpeed_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_WindSpeed_Description))] public string WindSpeed { get @@ -175,8 +175,8 @@ [PropertyOrder(commentPropertyIndex)] [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Comment_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationSettings_Comment_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Comment_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicLocationConfigurationDatabase_Comment_Description))] public string Comment { get Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs =================================================================== diff -u -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs (.../HydraulicBoundaryDataUpdateHandlerTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs (.../HydraulicBoundaryDataUpdateHandlerTest.cs) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -1038,14 +1038,14 @@ { yield return new TestCaseData(ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithConfigurationSettings( Enumerable.Empty(), 1)) - .SetName("ReadHydraulicLocationConfigurationDatabaseSettingsEmpty"); + .SetName("ReadHydraulicLocationConfigurationSettingsEmpty"); yield return new TestCaseData(ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithConfigurationSettings( new[] { ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), ReadHydraulicLocationConfigurationSettingsTestFactory.Create() }, 1)) - .SetName("ReadHydraulicLocationConfigurationDatabaseSettingsMultipleItems"); + .SetName("ReadHydraulicLocationConfigurationSettingsMultipleItems"); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -147,7 +147,7 @@ } [Test] - public void Update_ReadHydraulicLocationConfigurationDatabaseSettingsNull_SetsDefaultValuesAndLogsWarning() + public void Update_ReadHydraulicLocationConfigurationSettingsNull_SetsDefaultValuesAndLogsWarning() { // Setup const string hlcdFilePath = "some/file/path"; @@ -178,7 +178,7 @@ } [Test] - public void Update_WithReadHydraulicLocationConfigurationDatabaseSettings_SetsExpectedValuesAndDoesNotLog() + public void Update_WithReadHydraulicLocationConfigurationSettings_SetsExpectedValuesAndDoesNotLog() { // Setup const string hlcdFilePath = "some/file/path"; Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r0ba409a3723946a63032778295c2f8feaecc7f51 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 0ba409a3723946a63032778295c2f8feaecc7f51) @@ -99,8 +99,8 @@ } [Test] - [TestCaseSource(nameof(GetUnequivalentAssessmentSectionWithoutHydraulicLocationConfigurationSettingsTestCases))] - public void Compare_AssessmentSectionsNotEquivalentAndWithoutHydraulicLocationConfigurationSettings_ReturnsFalse(AssessmentSection otherAssessmentSection) + [TestCaseSource(nameof(GetUnequivalentAssessmentSectionWithoutHydraulicLocationConfigurationDatabaseTestCases))] + public void Compare_AssessmentSectionsNotEquivalentAndWithoutHydraulicLocationConfigurationDatabase_ReturnsFalse(AssessmentSection otherAssessmentSection) { // Setup var comparer = new AssessmentSectionMergeComparer(); @@ -113,7 +113,7 @@ } [Test] - public void Compare_AssessmentSectionWithEquivalentHydraulicLocationConfigurationSettings_ReturnsTrue() + public void Compare_AssessmentSectionWithEquivalentHydraulicLocationConfigurationDatabase_ReturnsTrue() { // Setup AssessmentSection assessmentSection = CreateAssessmentSection(); @@ -134,8 +134,8 @@ } [Test] - [TestCaseSource(nameof(GetAssessmentSectionWithNotEquivalentHydraulicLocationConfigurationSettingsTestCases))] - public void Compare_AssessmentSectionWithNotEquivalentHydraulicLocationConfigurationSettings_ReturnsFalse(AssessmentSection otherAssessmentSection) + [TestCaseSource(nameof(GetAssessmentSectionWithNotEquivalentHydraulicLocationConfigurationDatabaseTestCases))] + public void Compare_AssessmentSectionWithNotEquivalentHydraulicLocationConfigurationDatabase_ReturnsFalse(AssessmentSection otherAssessmentSection) { // Setup AssessmentSection assessmentSection = CreateAssessmentSection(); @@ -178,7 +178,7 @@ hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = false; } - private static IEnumerable GetUnequivalentAssessmentSectionWithoutHydraulicLocationConfigurationSettingsTestCases() + private static IEnumerable GetUnequivalentAssessmentSectionWithoutHydraulicLocationConfigurationDatabaseTestCases() { foreach (ChangePropertyData changeSingleDataProperty in ChangeSingleDataPropertiesOfAssessmentSection()) { @@ -219,17 +219,17 @@ "Composition"); } - private static IEnumerable GetAssessmentSectionWithNotEquivalentHydraulicLocationConfigurationSettingsTestCases() + private static IEnumerable GetAssessmentSectionWithNotEquivalentHydraulicLocationConfigurationDatabaseTestCases() { - foreach (ChangePropertyData changeSingleDataProperty in ChangeSingleDataOfHydraulicLocationConfigurationSettings()) + foreach (ChangePropertyData changeSingleDataProperty in ChangeSingleDataOfHydraulicLocationConfigurationDatabase()) { AssessmentSection assessmentSection = CreateAssessmentSection(); changeSingleDataProperty.ActionToChangeProperty(assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase); yield return new TestCaseData(assessmentSection).SetName(changeSingleDataProperty.PropertyName); } } - private static IEnumerable> ChangeSingleDataOfHydraulicLocationConfigurationSettings() + private static IEnumerable> ChangeSingleDataOfHydraulicLocationConfigurationDatabase() { yield return new ChangePropertyData(hydraulicLocationConfigurationDatabase => {