Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.Designer.cs =================================================================== diff -u -r2daae64ca8481053f77ba2b8142ed6cf5d78bea3 -r1c8c4b362a5a8f830f9d5ffd9d05a6739d692e13 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.Designer.cs (.../AssessmentSectionMergeDataProviderDialog.Designer.cs) (revision 2daae64ca8481053f77ba2b8142ed6cf5d78bea3) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.Designer.cs (.../AssessmentSectionMergeDataProviderDialog.Designer.cs) (revision 1c8c4b362a5a8f830f9d5ffd9d05a6739d692e13) @@ -120,12 +120,14 @@ // cancelButton // resources.ApplyResources(this.cancelButton, "cancelButton"); + this.cancelButton.DialogResult = DialogResult.Cancel; this.cancelButton.Name = "cancelButton"; this.cancelButton.UseVisualStyleBackColor = true; // // importButton // resources.ApplyResources(this.importButton, "importButton"); + this.importButton.DialogResult = DialogResult.OK; this.importButton.Name = "importButton"; this.importButton.UseVisualStyleBackColor = true; this.importButton.Click += new System.EventHandler(this.OnImportButtonClick); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs =================================================================== diff -u -r469c1810a2cc836791b78d185c7c1b0d414ec472 -r1c8c4b362a5a8f830f9d5ffd9d05a6739d692e13 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 469c1810a2cc836791b78d185c7c1b0d414ec472) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 1c8c4b362a5a8f830f9d5ffd9d05a6739d692e13) @@ -155,10 +155,12 @@ var buttonSelect = (Button) new ButtonTester("importButton", dialog).TheObject; Assert.AreEqual("Importeren", buttonSelect.Text); Assert.IsTrue(buttonSelect.Enabled); + Assert.AreEqual(DialogResult.OK, buttonSelect.DialogResult); var buttonCancel = (Button) new ButtonTester("cancelButton", dialog).TheObject; Assert.AreEqual("Annuleren", buttonCancel.Text); Assert.AreEqual(dialog.CancelButton, buttonCancel); + Assert.AreEqual(DialogResult.Cancel, buttonCancel.DialogResult); Assert.AreEqual(720, dialog.MinimumSize.Width); Assert.AreEqual(590, dialog.MinimumSize.Height);