Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj =================================================================== diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 213b20e92891887167ab4b031ca4a4b6250a4c2a) +++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -94,6 +94,7 @@ ..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll True + @@ -106,7 +107,18 @@ App.xaml + + Form + + + ExceptionDialog.cs + + + True + True + Resources.resx + @@ -228,8 +240,19 @@ + + + + ExceptionDialog.cs + Designer + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Bottom, Right + + + + 449, 242 + + + 75, 23 + + + + 2 + + + Herstarten + + + buttonRestart + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom, Left + + + 12, 242 + + + 127, 23 + + + 4 + + + Kopieer naar klembord + + + buttonCopyTextToClipboard + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Top, Bottom, Left, Right + + + 12, 27 + + + 512, 209 + + + 3 + + + + + + exceptionTextBox + + + System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Top, Left, Right + + + 12, 8 + + + 483, 20 + + + 3 + + + Een onafgehandelde fout is opgetreden. Het programma moet gesloten worden. + + + richTextBox1 + + + System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Bottom, Right + + + 368, 242 + + + 75, 23 + + + 1 + + + Afsluiten + + + buttonExit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Bottom, Left + + + 145, 242 + + + 104, 23 + + + 6 + + + Open logbestand + + + buttonOpenLog + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 536, 273 + + + NoControl + + + CenterParent + + + Kritieke fout + + + ExceptionDialog + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.Designer.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.Designer.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.Designer.cs (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,94 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.17929 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Application.Ringtoets.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon bug__exclamation { + get { + object obj = ResourceManager.GetObject("bug__exclamation", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + } +} Index: Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.resx =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.resx (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets/Properties/Resources.resx (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\bug--exclamation.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets/Resources.Designer.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets/Resources.Designer.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets/Resources.Designer.cs (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Resources\bug--exclamation.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets/Resources/bug--exclamation.ico =================================================================== diff -u Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Test/Application.Ringtoets.Test.csproj (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,86 @@ + + + + + Debug + x86 + {A2451981-99DA-4605-8396-F2222D25EBB7} + Library + Properties + Application.Ringtoets.Test + Application.Ringtoets.Test + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + x86 + 4 + + + true + bin\Release\ + TRACE + prompt + 4 + x86 + + + bin\ReleaseForCodeCoverage\ + TRACE + true + x86 + MinimumRecommendedRules.ruleset + pdbonly + + + + ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True + + + ..\..\..\..\lib\NUnitForms.dll + + + ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll + True + + + + + + + + + + + + + Copying.licenseheader + + + + + + {9a2d67e6-26ac-4d17-b11a-2b4372f2f572} + Core.Common.Controls + + + {4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7} + Application.Ringtoets + + + + + \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Test/ExceptionDialogTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Test/ExceptionDialogTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Test/ExceptionDialogTest.cs (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,323 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Windows.Forms; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Rhino.Mocks; + +namespace Application.Ringtoets.Test +{ + [TestFixture] + public class ExceptionDialogTest : NUnitFormTest + { + [Test] + public void DefaultConstructor_ExpectedValue() + { + // Setup + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + // Call + using (var dialog = new ExceptionDialog(window, null)) + { + // Assert + Assert.IsNotNull(dialog.Icon); + Assert.IsTrue(dialog.ShowIcon); + Assert.AreEqual(0, dialog.MinimumSize.Width); // Set during load + Assert.AreEqual(0, dialog.MinimumSize.Height); // Set during load + Assert.AreEqual(FormBorderStyle.Sizable, dialog.FormBorderStyle); + Assert.AreEqual(FormStartPosition.CenterParent, dialog.StartPosition); + Assert.IsFalse(dialog.ShowInTaskbar); + Assert.IsTrue(dialog.ControlBox); + Assert.IsFalse(dialog.MaximizeBox); + Assert.IsFalse(dialog.MinimizeBox); + Assert.IsNull(dialog.CancelButton); + } + } + + [Test] + public void ShowDialog_ExceptionDialog_MinimumSizeSet() + { + // Setup + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + + openedDialog.Close(); + }; + + using (var dialog = new ExceptionDialog(window, null)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(470, dialog.MinimumSize.Width); + Assert.AreEqual(200, dialog.MinimumSize.Height); + } + } + + [Test] + public void ShowDialog_ExceptionDialogWithException_ExceptionMessageSetToTextBox() + { + // Setup + var exceptionText = ""; + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var textBox = new RichTextBoxTester("exceptionTextBox"); + + exceptionText = textBox.Text; + + openedDialog.Close(); + }; + + var exception = new Exception("Test", new Exception("Test inner")); + + using (var dialog = new ExceptionDialog(window, exception)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(exception.ToString().Replace(Environment.NewLine, "\n"), exceptionText); + } + } + + [Test] + public void ShowDialog_ExceptionDialogWithoutException_NoExceptionMessageSetToTextBox() + { + // Setup + var exceptionText = ""; + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var textBox = new RichTextBoxTester("exceptionTextBox"); + + exceptionText = textBox.Text; + + openedDialog.Close(); + }; + + using (var dialog = new ExceptionDialog(window, null)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual("", exceptionText); + } + } + + [Test] + public void ShowDialog_ExceptionDialogWithoutOpenLogAction_OpenLogButtonNotEnabled() + { + // Setup + Button buttonOpenLog = null; + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var button = new ButtonTester("buttonOpenLog"); + + buttonOpenLog = (Button) button.TheObject; + + openedDialog.Close(); + }; + + using (var dialog = new ExceptionDialog(window, null)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.IsFalse(buttonOpenLog.Enabled); + } + } + + [Test] + public void ShowDialog_ExceptionDialogWithOpenLogAction_OpenLogButtonEnabled() + { + // Setup + Button buttonOpenLog = null; + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var button = new ButtonTester("buttonOpenLog"); + + buttonOpenLog = (Button) button.TheObject; + + openedDialog.Close(); + }; + + using (var dialog = new ExceptionDialog(window, null) + { + OpenLogClicked = () => { } + }) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.IsTrue(buttonOpenLog.Enabled); + } + } + + [Test] + public void ShowDialog_ExceptionDialog_RestartButtonClickResultsInDialogResultOk() + { + // Setup + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var button = new ButtonTester("buttonRestart"); + + button.Click(); + }; + + using (var dialog = new ExceptionDialog(window, null)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(DialogResult.OK, dialog.DialogResult); + } + } + + [Test] + public void ShowDialog_ExceptionDialog_ExitButtonClickResultsInDialogResultCancel() + { + // Setup + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var button = new ButtonTester("buttonExit"); + + button.Click(); + }; + + using (var dialog = new ExceptionDialog(window, null)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(DialogResult.Cancel, dialog.DialogResult); + } + } + + [Test] + public void ShowDialog_ExceptionDialog_OpenLogButtonClickPerformsOpenLogClickedAction() + { + // Setup + var counter = 0; + var mocks = new MockRepository(); + var window = mocks.Stub(); + + mocks.ReplayAll(); + + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var button = new ButtonTester("buttonOpenLog"); + + button.Click(); + + openedDialog.Close(); + }; + + using (var dialog = new ExceptionDialog(window, null) + { + OpenLogClicked = () => counter++ + }) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(1, counter); + } + } + + [Test] + [RequiresSTA] // Don't remove: test will hang otherwise due to copy to clipboard + public void ShowDialog_ExceptionDialog_CopyToClipboardClickCopiesExceptionTextToClipboard() + { + // Setup + DialogBoxHandler = (name, wnd) => + { + var openedDialog = new FormTester(name); + var button = new ButtonTester("buttonCopyTextToClipboard"); + + button.Click(); + + openedDialog.Close(); + }; + + var exception = new Exception("Test"); + using (var dialog = new ExceptionDialog(new UserControl(), exception)) + { + // Call + dialog.ShowDialog(); + + // Assert + Assert.AreEqual(exception.ToString(), Clipboard.GetText()); + } + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Test/Properties/AssemblyInfo.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Test/Properties/AssemblyInfo.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Test/Properties/AssemblyInfo.cs (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,51 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Application.Ringtoets.Test")] +[assembly: AssemblyProduct("Application.Ringtoets.Test")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4bdbd87e-7830-4c7b-9811-419150b96c97")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] + Index: Application/Ringtoets/test/Application.Ringtoets.Test/packages.config =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Test/packages.config (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Test/packages.config (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj =================================================================== diff -u -r38278c797e4fe1fafdb2fdd32547c417670687a6 -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6) +++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -98,12 +98,6 @@ DialogBase.cs - - Form - - - ExceptionDialog.cs - Component @@ -163,10 +157,6 @@ DialogBase.cs - - ExceptionDialog.cs - Designer - DoubleBufferedTreeView.cs Fisheye: Tag 34af24d6bf23796e627fd03b7532d4abe6fc715c refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 34af24d6bf23796e627fd03b7532d4abe6fc715c refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 34af24d6bf23796e627fd03b7532d4abe6fc715c refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs =================================================================== diff -u -r1119ad16afc56bb523cac630e15fb98b1fcf8d25 -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1119ad16afc56bb523cac630e15fb98b1fcf8d25) +++ Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -61,16 +61,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - public static System.Drawing.Icon bug__exclamation { - get { - object obj = ResourceManager.GetObject("bug__exclamation", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// /// Looks up a localized string similar to <geen>. /// public static string DataGridViewComboBoxItemWrapper_DisplayName_None { Index: Core/Common/src/Core.Common.Controls/Properties/Resources.resx =================================================================== diff -u -r1119ad16afc56bb523cac630e15fb98b1fcf8d25 -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Core/Common/src/Core.Common.Controls/Properties/Resources.resx (.../Resources.resx) (revision 1119ad16afc56bb523cac630e15fb98b1fcf8d25) +++ Core/Common/src/Core.Common.Controls/Properties/Resources.resx (.../Resources.resx) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -117,10 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\bug--exclamation.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - <geen> Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj =================================================================== diff -u -r38278c797e4fe1fafdb2fdd32547c417670687a6 -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj (.../Core.Common.Controls.Test.csproj) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6) +++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj (.../Core.Common.Controls.Test.csproj) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -58,7 +58,6 @@ - Fisheye: Tag 34af24d6bf23796e627fd03b7532d4abe6fc715c refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/Dialogs/ExceptionDialogTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r80c86231452b9beb7e8b8eba3698ceb9c0551de3 -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 80c86231452b9beb7e8b8eba3698ceb9c0551de3) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -1,4 +1,6 @@ -using System.Collections.Generic; +using System; +using System.CodeDom; +using System.Collections.Generic; using System.IO; using System.Linq; using Core.Common.Base.Data; @@ -50,6 +52,8 @@ public void Execute(params object[] arguments) { + throw new Exception(); + var project = projectOwner.Project; project.Items.Add(CreateNewDemoAssessmentSection()); project.NotifyObservers(); Index: Ringtoets.sln =================================================================== diff -u -rd207738be4ce6f50f4e3e00839ea433acea10bbd -r34af24d6bf23796e627fd03b7532d4abe6fc715c --- Ringtoets.sln (.../Ringtoets.sln) (revision d207738be4ce6f50f4e3e00839ea433acea10bbd) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 34af24d6bf23796e627fd03b7532d4abe6fc715c) @@ -372,6 +372,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.GrassCoverErosionInwards.Utils.Test", "Ringtoets\GrassCoverErosionInwards\test\Ringtoets.GrassCoverErosionInwards.Utils.Test\Ringtoets.GrassCoverErosionInwards.Utils.Test.csproj", "{5C19638A-3CC5-496F-8552-385785E728E3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Ringtoets.Test", "Application\Ringtoets\test\Application.Ringtoets.Test\Application.Ringtoets.Test.csproj", "{A2451981-99DA-4605-8396-F2222D25EBB7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CreateInstaller|x86 = CreateInstaller|x86 @@ -1064,7 +1066,6 @@ {2A542599-87A4-4BDE-8BE1-8C77D178E5E4}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {2A542599-87A4-4BDE-8BE1-8C77D178E5E4}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {52BA7627-CBAB-4209-BE77-3B5F31378277}.CreateInstaller|x86.ActiveCfg = Release|x86 - {52BA7627-CBAB-4209-BE77-3B5F31378277}.CreateInstaller|x86.Build.0 = Release|x86 {52BA7627-CBAB-4209-BE77-3B5F31378277}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {52BA7627-CBAB-4209-BE77-3B5F31378277}.CreateInstallerWithDemoProject|x86.Build.0 = Release|x86 {52BA7627-CBAB-4209-BE77-3B5F31378277}.Debug|x86.ActiveCfg = Debug|x86 @@ -1074,6 +1075,7 @@ {52BA7627-CBAB-4209-BE77-3B5F31378277}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {52BA7627-CBAB-4209-BE77-3B5F31378277}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {7537DE22-3330-4F21-ABA2-FCEF117B4223}.CreateInstaller|x86.ActiveCfg = Release|x86 + {7537DE22-3330-4F21-ABA2-FCEF117B4223}.CreateInstaller|x86.Build.0 = Release|x86 {7537DE22-3330-4F21-ABA2-FCEF117B4223}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {7537DE22-3330-4F21-ABA2-FCEF117B4223}.Debug|x86.ActiveCfg = Debug|x86 {7537DE22-3330-4F21-ABA2-FCEF117B4223}.Debug|x86.Build.0 = Debug|x86 @@ -1479,6 +1481,14 @@ {5C19638A-3CC5-496F-8552-385785E728E3}.Release|x86.Build.0 = Release|x86 {5C19638A-3CC5-496F-8552-385785E728E3}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {5C19638A-3CC5-496F-8552-385785E728E3}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.CreateInstaller|x86.ActiveCfg = Release|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.Debug|x86.ActiveCfg = Debug|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.Debug|x86.Build.0 = Debug|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.Release|x86.ActiveCfg = Release|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.Release|x86.Build.0 = Release|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {A2451981-99DA-4605-8396-F2222D25EBB7}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1598,6 +1608,7 @@ {594C5C6D-5833-4E1C-9F30-13A202628EEF} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} {03DBE353-99F7-47D6-B826-60D694FFB9AC} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} {3EDE00E5-C462-43EF-B8BC-E65D14D7FCF2} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} + {A2451981-99DA-4605-8396-F2222D25EBB7} = {EE8D5A6C-4871-452A-A69B-F04E374D715E} {555F3460-DD3D-4B1D-8319-0AA454050FF7} = {EC6E52A5-2BB1-4080-9784-5DC8D0B08ED3} {F2C4C4F7-4058-4E71-859B-D704F15D2745} = {555F3460-DD3D-4B1D-8319-0AA454050FF7} {7E26AAA5-22ED-43CC-9B21-23EEA60A5A87} = {555F3460-DD3D-4B1D-8319-0AA454050FF7}