Fisheye on Riskeer/Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge

Riskeer (2199): Renamed Ringtoets folder. WTI-1931

Mon, 28 Jan 2019 15:11:54 +0100

Robert Tangerman committed 2e55afd on branch master, 2199 and 53 more in Riskeer

Renamed Ringtoets folder. WTI-1931

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyCategoriesInput.cs

(-67, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyCategory.cs

(-50, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategory.cs

(-46, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategoryGroup.cs

(-80, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedAssemblyFailureMechanismSection.cs

(-59, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssembly.cs

(-65, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssembly.cs

(-50, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssemblyCategory.cs

(-46, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssemblyCategoryGroup.cs

(-86, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssembly.cs

(-50, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyCategory.cs

(-46, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyCategoryGroup.cs

(-74, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/AssemblyInfo.cs

(-25, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs

(-237, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx

(-171, +0)

| History

| Source

| Diff

… 15700 more files in changeset.

Riskeer (2199): Renamed src/Integration.Service: WTI-1931...

Mon, 28 Jan 2019 12:50:55 +0100

Dennis Tang committed 251015c on branch master, 2199 and 53 more in Riskeer

Renamed src/Integration.Service: WTI-1931

- Fixed namespace

· /Ringtoets/Integration/src/.../FileImporters/ForeshoreProfileReplaceDataStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/AssessmentSectionCompositionChangeHandler.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/FailureMechanismContributionNormChangeHandler.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs

(-3, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs

(-2, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineUpdateHandler.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionProvider.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/.../Ringtoets.Integration.Service/AssessmentSectionCalculationActivityFactory.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/IAssessmentSectionMergeComparer.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Service/Exceptions/LoadAssessmentSectionException.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/ILoadAssessmentSectionService.cs

(-2, +2)

| History

| Source

| Diff

… 14 more files in changeset.

Riskeer (2199): Renamed src/Integration.Plugin: WTI-1931...

Mon, 28 Jan 2019 11:58:55 +0100

Dennis Tang committed 1cc4182 on branch master, 2199 and 53 more in Riskeer

Renamed src/Integration.Plugin: WTI-1931

- Fixed namespace

· /Application/Riskeer/src/Application.Riskeer/App.xaml.cs

(-1, +1)

| History

| Source

| Diff

· /Core/Common/test/.../Ringtoets/Application.Ringtoets/GuiCoreIntegrationTest.cs

(-1, +1)

| History

| Source

| Diff

· /Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../FileImporters/ForeshoreProfileReplaceDataStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../FileImporters/ForeshoreProfileUpdateDataStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../FileImporters/MicrostabilityFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../TechnicalInnovationFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/AssessmentSectionCompositionChangeHandler.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Handlers/FailureMechanismContributionNormChangeHandler.cs

(-2, +2)

| History

| Source

| Diff

… 154 more files in changeset.

Riskeer (2199): Renamed src/Integration.Forms: WTI-1931...

Mon, 28 Jan 2019 11:03:23 +0100

Dennis Tang committed 2e2f4cc on branch master, 2199 and 53 more in Riskeer

Renamed src/Integration.Forms: WTI-1931

- Fixed namespace of files

· /Application/Riskeer/src/Application.Riskeer/App.xaml.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Riskeer/test/Application.Riskeer.Test/AppTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AddAssessmentSectionCommand.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Commands/AssessmentSectionFromFileCommandHandler.cs

(-3, +3)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Commands/IAssessmentSectionFromFileCommandHandler.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Controls/AssessmentSectionAssemblyCategoryGroupControl.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Dialogs/BackgroundMapDataSelectionDialog.Designer.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Dialogs/BackgroundMapDataSelectionDialog.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Dialogs/ReferenceLineMetaSelectionDialog.Designer.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Editors/HlcdFileNameEditor.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Factories/AssessmentSectionAssemblyMapDataFeaturesFactory.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Factories/CombinedSectionAssemblyMapDataFactory.cs

(-2, +2)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Factories/GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Factories/GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.cs

(-1, +1)

| History

| Source

| Diff

… 273 more files in changeset.

Riskeer (2199): Renamed src/Integration.Data: WTI-1931...

Mon, 28 Jan 2019 10:04:47 +0100

Dennis Tang committed 47237ae on branch master, 2199 and 53 more in Riskeer

Renamed src/Integration.Data: WTI-1931

- Fixed namespace in project

· /Application/Riskeer/src/Application.Riskeer/App.xaml.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs

(-1, +1)

| History

| Source

| Diff

· /Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs

(-1, +1)

| History

| Source

| Diff

· /Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/ClosingStructures/.../ClosingStructuresCalculationActivityIntegrationTest.cs

(-0, +5)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs

(-0, +8)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/HeightStructures/.../HeightStructuresCalculationActivityIntegrationTest.cs

(-0, +5)

| History

| Source

| Diff

· /Ringtoets/HeightStructures/.../HeightStructuresScenariosViewIntegrationTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs

(-3, +3)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/AssessmentSectionHelper.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs

(-4, +4)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Assembly/CombinedFailureMechanismSectionAssemblyResult.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs

(-3, +3)

| History

| Source

| Diff

… 409 more files in changeset.

Riskeer (Release18_1_Development): Changed copyright year. Paired with lubbers. WTI-1828

Thu, 27 Sep 2018 13:54:54 +0200

Robert Tangerman committed 2a81f01 on branch master, 1912 and 63 more in Riskeer

Changed copyright year. Paired with lubbers. WTI-1828

· /Application/Ringtoets/src/Application.Ringtoets.Migration.Console/Properties/AssemblyInfo.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Migration.Console/Properties/Resources.Designer.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Migration.Console/RingtoetsMigrationConsole.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Migration.Console/RingtoetsMigrationTool.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf

(-28, +28)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets/App.xaml

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets/Properties/AssemblyInfo.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets/app.config

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets/packages.config

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/test/Application.Ringtoets.Integration.Test/App.config

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/test/Application.Ringtoets.Integration.Test/Properties/AssemblyInfo.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/test/Application.Ringtoets.Integration.Test/StorageMigrationIntegrationTest.cs

(-1, +1)

| History

| Source

| Diff

· /Application/Ringtoets/test/Application.Ringtoets.Integration.Test/packages.config

(-1, +1)

| History

| Source

| Diff

… 6081 more files in changeset.

Riskeer (Release18_1_Development): Ran Deltares Cleanup:...

Wed, 26 Sep 2018 14:11:14 +0200

Dennis Tang committed 0f5c5c3 on branch master, 1912 and 63 more in Riskeer

Ran Deltares Cleanup:

- Performed for Ringtoets.Integration and its tests

WTI-1767

· /Ringtoets/Integration/src/.../StandAlone/MacroStabilityOutwardsFailureMechanism.cs

(-6, +6)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs

(-8, +8)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AddAssessmentSectionCommand.cs

(-0, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Dialogs/BackgroundMapDataSelectionDialog.cs

(-0, +3)

| History

| Source

| Diff

· /Ringtoets/Integration/src/Ringtoets.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs

(-0, +4)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../Merge/AssessmentSectionMergeFilePathProvider.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../StandAlone/GrassCoverSlipOffInwardsFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../StandAlone/GrassCoverSlipOffOutwardsFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../StandAlone/MacroStabilityOutwardsFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../PresentationObjects/StandAlone/MicrostabilityFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../PresentationObjects/StandAlone/PipingStructureFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionsContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../StandAlone/TechnicalInnovationFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../StandAlone/WaterPressureAsphaltCoverFailureMechanismContext.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/Integration/src/.../PropertyClasses/FailureMechanismSectionAssemblyCategoriesProperties.cs

(-1, +1)

| History

| Source

| Diff

… 43 more files in changeset.

Riskeer (Release18_1_Development): Cleanup: Removed unused usings. WTI-1767

Mon, 24 Sep 2018 14:15:42 +0200

Robert Tangerman committed 2cf9db3 on branch master, 1840 and 64 more in Riskeer

Cleanup: Removed unused usings. WTI-1767

· /Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs

(-1, +0)

| History

| Source

| Diff

· /Core/Common/test/Core.Common.Controls.Test/PresentationObjects/WrappedObjectContextBaseTest.cs

(-1, +0)

| History

| Source

| Diff

· /Core/Common/test/Core.Common.Gui.Test/Commands/StorageCommandHandlerTest.cs

(-1, +0)

| History

| Source

| Diff

· /Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/AssemblyTool/test/.../Model/SerializableFailureMechanismSectionCollectionTest.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/IAssessmentSection.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/RoughnessPointTest.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/.../Ringtoets.Common.Data.TestUtil.Test/FailureMechanismSectionResultTestFactoryTest.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionStub.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/Common/.../DataGridViewControlColumnStateDefinitionTestHelper.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsTestDataGenerator.cs

(-1, +0)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../TestOvertoppingOutput.cs

(-2, +0)

| History

| Source

| Diff

… 16 more files in changeset.

Riskeer (Release18_1_Development): Review related changes. WTI-1791

Elmar Kleijn — Mon, 06 Aug 2018 11:16:10 +0200

Elmar Kleijn committed ee730ce on branch master, 1691 and 70 more in Riskeer

Review related changes. WTI-1791

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-4, +3)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(-0, +10)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(-0, +3)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-21, +21)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Review related changes. WTI-1750

Elmar Kleijn — Thu, 26 Jul 2018 16:11:57 +0200

Elmar Kleijn committed 13e5418 on branch master, 1691 and 72 more in Riskeer

Review related changes. WTI-1750

· /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionProviderTest.cs

(-34, +0)

| History

| Source

| Diff

Riskeer (Release18_1_Development): Close views of failure mechanisms that are being merged. WTI-1747

Thu, 26 Jul 2018 13:53:42 +0200

Robert Tangerman committed 0252ee3 on branch master, 1691 and 72 more in Riskeer

Close views of failure mechanisms that are being merged. WTI-1747

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-3, +28)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-2, +61)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Only log HR merge message when there is something merged. WTI-1747

Thu, 26 Jul 2018 13:19:14 +0200

Robert Tangerman committed e8bd0a8 on branch master, 1691 and 72 more in Riskeer

Only log HR merge message when there is something merged. WTI-1747

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-1, +4)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-49, +66)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Incorporated comments review:...

Thu, 26 Jul 2018 10:44:28 +0200

Dennis Tang committed eb8bee1 on branch master, 1691 and 72 more in Riskeer

Incorporated comments review:

- Ran cleanup

- Updated XMLDocs

- Updated test names

Paired with ~tangerma

WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs	(-1, +1)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-5, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs	(-4, +1)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeDataProviderDialogTest.cs	(-1, +1)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-1, +1)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Fixed error that assessment sections are only read once. WTI-1750

Thu, 26 Jul 2018 09:49:21 +0200

Robert Tangerman committed 7e75faf on branch master, 1691 and 72 more in Riskeer

Fixed error that assessment sections are only read once. WTI-1750

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs	(-1, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionProvider.cs	(-2, +2)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionProviderTest.cs	(-0, +34)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Improvements after review. WTI-1770

Wed, 25 Jul 2018 16:30:36 +0200

Robert Tangerman committed 6f85854 on branch master, 1691 and 72 more in Riskeer

Improvements after review. WTI-1770

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-7, +8)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-30, +38)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Removed unused property. WTI-1731

Wed, 25 Jul 2018 15:26:11 +0200

Robert Tangerman committed e5dda40 on branch master, 1691 and 72 more in Riskeer

Removed unused property. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs	(-17, +3)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/.../Merge/AssessmentSectionMergeDataProviderDialog.cs	(-10, +8)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs	(-24, +4)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeDataProviderDialogTest.cs	(-7, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-26, +1)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs	(-10, +2)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Used merge data bool properties for merging failure mechanisms. WTI-1731

Wed, 25 Jul 2018 15:21:15 +0200

Robert Tangerman committed c08ebb6 on branch master, 1691 and 72 more in Riskeer

Used merge data bool properties for merging failure mechanisms. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-149, +114)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-3, +54)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Removed old method. WTI-1731

Wed, 25 Jul 2018 14:32:53 +0200

Robert Tangerman committed e35ffc4 on branch master, 1691 and 72 more in Riskeer

Removed old method. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-22, +6)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/IAssessmentSectionMergeHandler.cs	(-10, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-65, +1)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Connected tests to new method. WTI-1731

Wed, 25 Jul 2018 14:30:35 +0200

Robert Tangerman committed 5c56ca5 on branch master, 1691 and 72 more in Riskeer

Connected tests to new method. WTI-1731

· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs

(-35, +82)

| History

| Source

| Diff

Riskeer (Release18_1_Development): Use new handler method in merger. WTI-1731

Wed, 25 Jul 2018 14:17:41 +0200

Robert Tangerman committed aa69c30 on branch master, 1691 and 72 more in Riskeer

Use new handler method in merger. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs	(-3, +3)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs	(-6, +6)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added method in handler with MergeData. WTI-1731

Wed, 25 Jul 2018 14:13:15 +0200

Robert Tangerman committed 7c6b0a8 on branch master, 1691 and 72 more in Riskeer

Added method in handler with MergeData. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-0, +11)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/IAssessmentSectionMergeHandler.cs	(-0, +9)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-0, +19)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added construction properties to constructor. WTI-1731

Wed, 25 Jul 2018 13:26:51 +0200

Robert Tangerman committed ab34672 on branch master, 1691 and 72 more in Riskeer

Added construction properties to constructor. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs	(-1, +9)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/.../Merge/AssessmentSectionMergeDataProviderDialog.cs	(-1, +2)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs	(-3, +18)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs	(-2, +2)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added merge exception. WTI-1731

Wed, 25 Jul 2018 11:52:11 +0200

Robert Tangerman committed ee64f88 on branch master, 1691 and 72 more in Riskeer

Added merge exception. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeException.cs	(-0, +68)	\| History	\| Source
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(-0, +1)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeExceptionTest.cs	(-0, +32)	\| History	\| Source
· /Ringtoets/Integration/.../Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(-0, +1)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Revert "Added merge exception. WTI-1731"...

Wed, 25 Jul 2018 11:52:11 +0200

Robert Tangerman committed 00635c3 on branch master, 1691 and 72 more in Riskeer

Revert "Added merge exception. WTI-1731"

This reverts commit 6e5c5f73497dbbb49815645a08eea8ec24140f7e.

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeException.cs	(-68, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj	(-1, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeExceptionTest.cs	(-32, +0)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/.../Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(-1, +0)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added throwing NotSupportedException when failure mechanism can't be merged. WTI-1731

Wed, 25 Jul 2018 11:49:28 +0200

Robert Tangerman committed 4c958ce on branch master, 1691 and 72 more in Riskeer

Added throwing NotSupportedException when failure mechanism can't be merged. WTI-1731

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-2, +14)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-0, +23)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added missing assert. WTI-1770

Wed, 25 Jul 2018 11:27:20 +0200

Robert Tangerman committed c005c0b on branch master, 1691 and 73 more in Riskeer

Added missing assert. WTI-1770

· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs

(-0, +2)

| History

| Source

| Diff

Riskeer (Release18_1_Development): Incorporated comments review 3096:...

Wed, 25 Jul 2018 11:26:20 +0200

Dennis Tang committed 8baeb7b on branch master, 1691 and 73 more in Riskeer

Incorporated comments review 3096:

- Added missing asserts

Paired with ~tangerma.

WTI-1777

· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs

(-0, +2)

| History

| Source

| Diff

Riskeer (Release18_1_Development): Improved checking whether to merge location calculations. WTI-1746

Wed, 25 Jul 2018 11:25:35 +0200

Robert Tangerman committed be728a0 on branch master, 1691 and 73 more in Riskeer

Improved checking whether to merge location calculations. WTI-1746

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-0, +2)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-0, +86)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Added notifying location calculations when merged. WTI-1747

Wed, 25 Jul 2018 11:00:18 +0200

Robert Tangerman committed 8536b5b on branch master, 1691 and 73 more in Riskeer

Added notifying location calculations when merged. WTI-1747

· /Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs	(-23, +36)	\| History	\| Source	\| Diff
· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs	(-0, +38)	\| History	\| Source	\| Diff

Riskeer (Release18_1_Development): Cleanup. WTI-1747

Wed, 25 Jul 2018 10:36:40 +0200

Robert Tangerman committed b259192 on branch master, 1691 and 73 more in Riskeer

Cleanup. WTI-1747

· /Ringtoets/Integration/test/.../Merge/AssessmentSectionMergeHandlerTest.cs

(-4, +4)

| History

| Source

| Diff