Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs =================================================================== diff -u -r3882746b496b55f9c4ff66628a7e3f1f0fc22f81 -r68f02442e2e790aaa0bde531c328662819908f10 --- Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 3882746b496b55f9c4ff66628a7e3f1f0fc22f81) +++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -155,7 +155,7 @@ }; var mainWindow = new MainWindow(); var projectMigrator = new ProjectMigrator(new DialogBasedInquiryHelper(mainWindow)); - gui = new GuiCore(mainWindow, new StorageSqLite(), projectMigrator, new RingtoetsProjectFactory(), settings) + gui = new GuiCore(mainWindow, new StorageSqLite(), projectMigrator, new RiskeerProjectFactory(), settings) { Plugins = { Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs =================================================================== diff -u -re7e71c79d26107c1f810fc3768c2652d4fbba562 -r68f02442e2e790aaa0bde531c328662819908f10 --- Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision e7e71c79d26107c1f810fc3768c2652d4fbba562) +++ Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -60,7 +60,7 @@ var projectMigrator = new ProjectMigrator(inquiryHelper); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { // When gui.Run(targetFilePath); @@ -71,7 +71,7 @@ string expectedProjectName = Path.GetFileNameWithoutExtension(targetFilePath); Assert.AreEqual(expectedProjectName, gui.Project.Name); Assert.AreEqual("description", gui.Project.Description); - Assert.IsInstanceOf(gui.Project); + Assert.IsInstanceOf(gui.Project); } mocks.VerifyAll(); @@ -99,7 +99,7 @@ var projectMigrator = new ProjectMigrator(inquiryHelper); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { // When gui.Run(sourceFilePath); @@ -109,7 +109,7 @@ string expectedProjectName = Path.GetFileNameWithoutExtension(targetFilePath); Assert.AreEqual(expectedProjectName, gui.Project.Name); Assert.AreEqual("description", gui.Project.Description); - Assert.IsInstanceOf(gui.Project); + Assert.IsInstanceOf(gui.Project); } mocks.VerifyAll(); @@ -132,7 +132,7 @@ var projectMigrator = new ProjectMigrator(inquiryHelper); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { // When gui.Run(sourceFilePath); Index: Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r68f02442e2e790aaa0bde531c328662819908f10 --- Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b) +++ Demo/Riskeer/src/Demo.Riskeer/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -79,7 +79,7 @@ public void Execute() { - var project = (RingtoetsProject) projectOwner.Project; + var project = (RiskeerProject) projectOwner.Project; project.AssessmentSections.Add(CreateNewDemoAssessmentSection()); project.NotifyObservers(); } Index: Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -ra850be6391b6b7d0ce9a6da4fd61652ab0fe464b -r68f02442e2e790aaa0bde531c328662819908f10 --- Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision a850be6391b6b7d0ce9a6da4fd61652ab0fe464b) +++ Demo/Riskeer/test/Demo.Riskeer.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -79,7 +79,7 @@ public void Execute_GuiIsProperlyInitialized_AddNewAssessmentSectionWithDemoDataToRootProject() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var mocks = new MockRepository(); var projectOwner = mocks.Stub(); Fisheye: Tag 68f02442e2e790aaa0bde531c328662819908f10 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/RingtoetsProject.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 68f02442e2e790aaa0bde531c328662819908f10 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Data/RingtoetsProjectFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Data/Riskeer.Integration.Data.csproj =================================================================== diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/src/Riskeer.Integration.Data/Riskeer.Integration.Data.csproj (.../Riskeer.Integration.Data.csproj) (revision 9bba38e3ebe3fe261e7c97c338b016681e07c140) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Riskeer.Integration.Data.csproj (.../Riskeer.Integration.Data.csproj) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -19,8 +19,8 @@ - - + + Index: Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProject.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProject.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProject.cs (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -0,0 +1,102 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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.Collections.Generic; +using System.Linq; +using Core.Common.Base; +using Core.Common.Base.Data; +using Core.Common.Base.Properties; + +namespace Riskeer.Integration.Data +{ + public class RiskeerProject : Observable, IProject + { + /// + /// Constructs a new . + /// + public RiskeerProject() : this(Resources.Project_Constructor_Default_name) {} + + /// + /// Constructs a new . + /// + /// The name of the . + public RiskeerProject(string name) + { + Name = name; + Description = ""; + + AssessmentSections = new List(); + } + + /// + /// Gets or sets the assessmentSections of the . + /// + public List AssessmentSections { get; } + + /// + /// Gets or sets the name of the . + /// + public string Name { get; set; } + + /// + /// Gets or sets the description of the . + /// + public string Description { get; set; } + + public override bool Equals(object obj) + { + if (ReferenceEquals(null, obj)) + { + return false; + } + + if (ReferenceEquals(this, obj)) + { + return true; + } + + if (obj.GetType() != GetType()) + { + return false; + } + + return Equals((RiskeerProject) obj); + } + + public override int GetHashCode() + { + return 0; + } + + private bool Equals(IProject other) + { + var otherProject = other as RiskeerProject; + if (otherProject == null) + { + return false; + } + + return string.Equals(Name, otherProject.Name) && + string.Equals(Description, otherProject.Description) && + AssessmentSections.SequenceEqual(otherProject.AssessmentSections); + } + } +} \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/RiskeerProjectFactory.cs (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -0,0 +1,33 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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 Core.Common.Base.Data; + +namespace Riskeer.Integration.Data +{ + public class RiskeerProjectFactory : IProjectFactory + { + public IProject CreateNewProject() + { + return new RiskeerProject(); + } + } +} \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -95,7 +95,7 @@ } AssessmentSection assessmentSection = GetAssessmentSectionFromDialog(); - var ringtoetsProject = projectOwner.Project as RingtoetsProject; + var ringtoetsProject = projectOwner.Project as RiskeerProject; if (assessmentSection == null || ringtoetsProject == null) { return; @@ -143,11 +143,11 @@ assessmentSection.HeightStructures.GeneralInput.N = roundedN; } - private void SetAssessmentSectionToProject(RingtoetsProject ringtoetsProject, AssessmentSection assessmentSection) + private void SetAssessmentSectionToProject(RiskeerProject riskeerProject, AssessmentSection assessmentSection) { - assessmentSection.Name = GetUniqueForAssessmentSectionName(ringtoetsProject.AssessmentSections, assessmentSection.Name); - ringtoetsProject.AssessmentSections.Add(assessmentSection); - ringtoetsProject.NotifyObservers(); + assessmentSection.Name = GetUniqueForAssessmentSectionName(riskeerProject.AssessmentSections, assessmentSection.Name); + riskeerProject.AssessmentSections.Add(assessmentSection); + riskeerProject.NotifyObservers(); viewController.OpenViewForData(assessmentSection); } Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r37a7645190a83a1379d87308842c19e6e48bd5ef -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 37a7645190a83a1379d87308842c19e6e48bd5ef) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -878,7 +878,7 @@ /// Sequence of child data. public override IEnumerable GetChildDataWithViewDefinitions(object viewData) { - var project = viewData as RingtoetsProject; + var project = viewData as RiskeerProject; if (project != null) { foreach (AssessmentSection item in project.AssessmentSections) @@ -1130,7 +1130,7 @@ .Build() }; - yield return new TreeNodeInfo + yield return new TreeNodeInfo { Text = project => project.Name, Image = project => GuiResources.ProjectIcon, @@ -1295,7 +1295,7 @@ private static void VerifyHydraulicBoundaryDatabasePath(IProject project) { - var ringtoetsProject = project as RingtoetsProject; + var ringtoetsProject = project as RiskeerProject; if (ringtoetsProject == null) { return; @@ -1734,7 +1734,7 @@ private static void AssessmentSectionOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData) { - var parentProject = (RingtoetsProject) parentNodeData; + var parentProject = (RiskeerProject) parentNodeData; var assessmentSection = (AssessmentSection) nodeData; parentProject.AssessmentSections.Remove(assessmentSection); parentProject.NotifyObservers(); Index: Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/src/Riskeer.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -29,7 +29,7 @@ namespace Riskeer.Integration.Service.Merge { /// - /// Service to load a from a file. + /// Service to load a from a file. /// public class LoadAssessmentSectionService : ILoadAssessmentSectionService { @@ -53,10 +53,10 @@ public IEnumerable LoadAssessmentSections(string filePath) { - RingtoetsProject openedProject; + RiskeerProject openedProject; try { - openedProject = (RingtoetsProject) storage.LoadProject(filePath); + openedProject = (RiskeerProject) storage.LoadProject(filePath); } catch (StorageException e) { Fisheye: Tag 68f02442e2e790aaa0bde531c328662819908f10 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/RingtoetsProjectFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 68f02442e2e790aaa0bde531c328662819908f10 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Data.Test/RingtoetsProjectTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Riskeer.Integration.Data.Test.csproj =================================================================== diff -u -r9bba38e3ebe3fe261e7c97c338b016681e07c140 -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Riskeer.Integration.Data.Test.csproj (.../Riskeer.Integration.Data.Test.csproj) (revision 9bba38e3ebe3fe261e7c97c338b016681e07c140) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Riskeer.Integration.Data.Test.csproj (.../Riskeer.Integration.Data.Test.csproj) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -26,8 +26,8 @@ - - + + Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectFactoryTest.cs =================================================================== diff -u --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectFactoryTest.cs (revision 0) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectFactoryTest.cs (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -0,0 +1,43 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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 Core.Common.Base.Data; +using NUnit.Framework; + +namespace Riskeer.Integration.Data.Test +{ + [TestFixture] + public class RiskeerProjectFactoryTest + { + [Test] + public void CreateNewProject_ReturnsNewRiskeerProject() + { + // Setup + var projectFactory = new RiskeerProjectFactory(); + + // Call + IProject result = projectFactory.CreateNewProject(); + + // Assert + Assert.IsInstanceOf(result); + } + } +} \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectTest.cs =================================================================== diff -u --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectTest.cs (revision 0) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/RiskeerProjectTest.cs (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -0,0 +1,174 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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.Collections.Generic; +using Core.Common.Base; +using Core.Common.Base.Data; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Riskeer.Common.Data.AssessmentSection; + +namespace Riskeer.Integration.Data.Test +{ + [TestFixture] + public class RiskeerProjectTest + { + [Test] + public void DefaultConstructor_ExpectedValue() + { + // Call + var project = new RiskeerProject(); + + // Assert + Assert.IsInstanceOf(project); + Assert.AreEqual("Project", project.Name); + Assert.AreEqual("", project.Description); + CollectionAssert.IsEmpty(project.AssessmentSections); + } + + [Test] + public void NameConstructor_SetNameAndInitializeOtherProperties() + { + // Setup + const string someName = ""; + + // Call + var project = new RiskeerProject(someName); + + // Assert + Assert.IsInstanceOf(project); + Assert.AreEqual(someName, project.Name); + Assert.AreEqual("", project.Description); + CollectionAssert.IsEmpty(project.AssessmentSections); + } + + [Test] + public void AutomaticProperties_SetAndGettingValue_ShouldReturnSetValue() + { + // Setup + const string niceProjectName = "Nice project name"; + const string nicerDescription = "Nicer description"; + + // Call + var project = new RiskeerProject + { + Name = niceProjectName, + Description = nicerDescription + }; + + // Assert + Assert.AreEqual(niceProjectName, project.Name); + Assert.AreEqual(nicerDescription, project.Description); + } + + [Test] + public void NotifyObservers_WithObserverAttached_ObserverIsNotified() + { + // Setup + var mockRepository = new MockRepository(); + var observer = mockRepository.StrictMock(); + observer.Expect(o => o.UpdateObserver()); + mockRepository.ReplayAll(); + + var project = new RiskeerProject(); + project.Attach(observer); + + // Call + project.NotifyObservers(); + + // Assert + mockRepository.VerifyAll(); + } + + [Test] + public void NotifyObservers_AttachedObserverHasBeenDetached_ObserverShouldNoLongerBeNotified() + { + // Setup + var mockRepository = new MockRepository(); + var observer = mockRepository.StrictMock(); + observer.Expect(o => o.UpdateObserver()); + mockRepository.ReplayAll(); + + var project = new RiskeerProject(); + project.Attach(observer); + project.NotifyObservers(); + + // Call + project.Detach(observer); + project.NotifyObservers(); + + // Assert + mockRepository.VerifyAll(); + } + + [TestFixture] + private class RiskeerProjectEqualsTest : EqualsTestFixture + { + protected override RiskeerProject CreateObject() + { + return CreateProject(); + } + + protected override DerivedRiskeerProject CreateDerivedObject() + { + return new DerivedRiskeerProject(CreateProject()); + } + + private static IEnumerable GetUnequalTestCases() + { + RiskeerProject baseProject = CreateProject(); + + yield return new TestCaseData(new RiskeerProject("Different name") + { + Description = baseProject.Description + }).SetName("Name"); + + yield return new TestCaseData(new RiskeerProject(baseProject.Name)) + .SetName("Description"); + + var random = new Random(21); + RiskeerProject differentAssessmentSections = CreateProject(); + differentAssessmentSections.AssessmentSections.Add(new AssessmentSection(random.NextEnumValue())); + yield return new TestCaseData(differentAssessmentSections) + .SetName("AssessmentSections"); + } + + private static RiskeerProject CreateProject() + { + return new RiskeerProject("Some name") + { + Description = "Some desctiption" + }; + } + } + + private class DerivedRiskeerProject : RiskeerProject + { + public DerivedRiskeerProject(RiskeerProject project) + { + Name = project.Name; + Description = project.Description; + } + } + } +} \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -188,7 +188,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -219,7 +219,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -257,7 +257,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -302,7 +302,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -337,7 +337,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -377,7 +377,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -417,7 +417,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); @@ -462,7 +462,7 @@ // Setup var mockRepository = new MockRepository(); var parentDialog = mockRepository.Stub(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var projectOwner = mockRepository.Stub(); projectOwner.Stub(po => po.Project).Return(project); var viewController = mockRepository.StrictMock(); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (.../RingtoetsProjectPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (.../RingtoetsProjectPropertiesTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -34,7 +34,7 @@ public void Name_WithData_ReturnsName() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var properties = new RingtoetsProjectProperties { Data = project @@ -54,7 +54,7 @@ public void Description_WithData_ReturnsDescription() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var properties = new RingtoetsProjectProperties { Data = project @@ -84,7 +84,7 @@ // Setup var properties = new RingtoetsProjectProperties { - Data = new RingtoetsProject() + Data = new RiskeerProject() }; // Call Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -91,14 +91,14 @@ var projectMigrator = mocks.Stub(); mocks.ReplayAll(); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { using (var plugin = new RingtoetsPlugin()) { plugin.Gui = gui; gui.Run(); - var project = new RingtoetsProject + var project = new RiskeerProject { AssessmentSections = { @@ -131,14 +131,14 @@ string testDataDir = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)); string testFilePath = Path.Combine(testDataDir, "complete.sqlite"); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { using (var plugin = new RingtoetsPlugin()) { plugin.Gui = gui; gui.Run(); - var project = new RingtoetsProject + var project = new RiskeerProject { AssessmentSections = { @@ -174,7 +174,7 @@ var projectMigrator = mocks.Stub(); mocks.ReplayAll(); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { using (var plugin = new RingtoetsPlugin()) { @@ -183,7 +183,7 @@ const string nonExistingFile = "not_existing_file"; - var project = new RingtoetsProject + var project = new RiskeerProject { AssessmentSections = { @@ -619,7 +619,7 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(Comment))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RingtoetsProject))); + Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RiskeerProject))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultTotalContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionContext))); @@ -658,7 +658,7 @@ public void GetChildDataWithViewDefinitions_RingtoetsProjectWithChildren_ReturnChildren() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); project.AssessmentSections.Add(new AssessmentSection(AssessmentSectionComposition.Dike)); project.AssessmentSections.Add(new AssessmentSection(AssessmentSectionComposition.Dike)); project.AssessmentSections.Add(new AssessmentSection(AssessmentSectionComposition.Dike)); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -481,7 +481,7 @@ mocks.ReplayAll(); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); project.AssessmentSections.Add(assessmentSection); project.Attach(observer); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -82,7 +82,7 @@ { // Setup const string testName = "ttt"; - var project = new RingtoetsProject(testName); + var project = new RiskeerProject(testName); using (var plugin = new RingtoetsPlugin()) { @@ -100,7 +100,7 @@ public void Image_Always_ReturnsSetImage() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); using (var plugin = new RingtoetsPlugin()) { @@ -119,7 +119,7 @@ { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); project.AssessmentSections.Add(assessmentSection); using (var plugin = new RingtoetsPlugin()) @@ -178,7 +178,7 @@ public void ContextMenuStrip_Always_ContextMenuItemAddAssessmentSectionEnabled() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); using (var treeViewControl = new TreeViewControl()) { @@ -210,7 +210,7 @@ private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin) { - return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(RingtoetsProject)); + return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(RiskeerProject)); } } } \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -69,7 +69,7 @@ var mocks = new MockRepository(); var storeProject = mocks.StrictMock(); - storeProject.Expect(sp => sp.LoadProject(filePath)).Return(new RingtoetsProject()); + storeProject.Expect(sp => sp.LoadProject(filePath)).Return(new RiskeerProject()); mocks.ReplayAll(); var service = new LoadAssessmentSectionService(storeProject); @@ -85,7 +85,7 @@ public void LoadAssessmentSections_LoadingProjectSuccessful_ReturnsRingtoetsProject() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var mocks = new MockRepository(); var storeProject = mocks.StrictMock(); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/RiskeerProjectCreateExtensions.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/RiskeerProjectCreateExtensions.cs (.../RiskeerProjectCreateExtensions.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/RiskeerProjectCreateExtensions.cs (.../RiskeerProjectCreateExtensions.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -27,18 +27,18 @@ namespace Riskeer.Storage.Core.Create { /// - /// Extension methods for related to creating database entities. + /// Extension methods for related to creating database entities. /// internal static class RiskeerProjectCreateExtensions { /// - /// Creates a based on the information of the . + /// Creates a based on the information of the . /// /// The project to create a database entity for. /// The object keeping track of create operations. /// A new . /// Thrown when is null. - internal static ProjectEntity Create(this RingtoetsProject project, PersistenceRegistry registry) + internal static ProjectEntity Create(this RiskeerProject project, PersistenceRegistry registry) { if (registry == null) { @@ -55,7 +55,7 @@ return entity; } - private static void AddEntitiesForAssessmentSections(RingtoetsProject project, ProjectEntity entity, PersistenceRegistry registry) + private static void AddEntitiesForAssessmentSections(RiskeerProject project, ProjectEntity entity, PersistenceRegistry registry) { for (var index = 0; index < project.AssessmentSections.Count; index++) { Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/ProjectEntityReadExtensions.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -27,26 +27,26 @@ namespace Riskeer.Storage.Core.Read { /// - /// This class defines extension methods for read operations for an based on the + /// This class defines extension methods for read operations for an based on the /// . /// internal static class ProjectEntityReadExtensions { /// - /// Reads the and use the information to construct a . + /// Reads the and use the information to construct a . /// - /// The to create for. + /// The to create for. /// The object keeping track of read operations. - /// A new . + /// A new . /// Thrown when is null. - internal static RingtoetsProject Read(this ProjectEntity entity, ReadConversionCollector collector) + internal static RiskeerProject Read(this ProjectEntity entity, ReadConversionCollector collector) { if (collector == null) { throw new ArgumentNullException(nameof(collector)); } - var project = new RingtoetsProject + var project = new RiskeerProject { Description = entity.Description }; Index: Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs =================================================================== diff -u -re7e71c79d26107c1f810fc3768c2652d4fbba562 -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision e7e71c79d26107c1f810fc3768c2652d4fbba562) +++ Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -68,7 +68,7 @@ public void StageProject(IProject project) { - var ringtoetsProject = project as RingtoetsProject; + var ringtoetsProject = project as RiskeerProject; if (ringtoetsProject == null) { throw new ArgumentNullException(nameof(project)); @@ -115,7 +115,7 @@ string connectionString = GetConnectionToExistingFile(databaseFilePath); try { - RingtoetsProject project; + RiskeerProject project; using (var dbContext = new RiskeerEntities(connectionString)) { ValidateDatabaseVersion(dbContext, databaseFilePath); @@ -353,13 +353,13 @@ private class StagedProject { - public StagedProject(RingtoetsProject projectModel, ProjectEntity projectEntity) + public StagedProject(RiskeerProject projectModel, ProjectEntity projectEntity) { Model = projectModel; Entity = projectEntity; } - public RingtoetsProject Model { get; } + public RiskeerProject Model { get; } public ProjectEntity Entity { get; } } } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs (.../RiskeerProjectCreateExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/RiskeerProjectCreateExtensionsTest.cs (.../RiskeerProjectCreateExtensionsTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -35,7 +35,7 @@ public void Create_PersistenceRegistryNull_ThrowsArgumentNullException() { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); // Call TestDelegate test = () => project.Create(null); @@ -50,7 +50,7 @@ { // Setup const string testdescription = "testDescription"; - var project = new RingtoetsProject + var project = new RiskeerProject { Description = testdescription }; @@ -69,7 +69,7 @@ { // Setup const string testdescription = "original description"; - var project = new RingtoetsProject + var project = new RiskeerProject { Description = testdescription }; @@ -87,7 +87,7 @@ public void Create_WithAssessmentSections_AddsSectionsToEntity() { // Setup - var project = new RingtoetsProject + var project = new RiskeerProject { AssessmentSections = { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/FingerprintHelperTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/FingerprintHelperTest.cs (.../FingerprintHelperTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/FingerprintHelperTest.cs (.../FingerprintHelperTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -48,7 +48,7 @@ public void GivenProjectEntity_WhenGeneratingFingerprintMultipleTime_ThenHashRemainsEqual() { // Given - RingtoetsProject project = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject project = RiskeerProjectTestHelper.GetFullTestProject(); ProjectEntity entity = project.Create(new PersistenceRegistry()); // When @@ -65,7 +65,7 @@ public void GivenProjectEntity_WhenComparingFingerprintsBeforeAndAfterChange_ThenHashDifferent() { // Given - RingtoetsProject project = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject project = RiskeerProjectTestHelper.GetFullTestProject(); ProjectEntity entity = project.Create(new PersistenceRegistry()); // When @@ -83,8 +83,8 @@ public void GivenProjectEntity_WhenGeneratingFingerprintEqualData_ThenHashRemainsEqual() { // Setup - RingtoetsProject project1 = RiskeerProjectTestHelper.GetFullTestProject(); - RingtoetsProject project2 = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject project1 = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject project2 = RiskeerProjectTestHelper.GetFullTestProject(); ProjectEntity entity1 = project1.Create(new PersistenceRegistry()); ProjectEntity entity2 = project2.Create(new PersistenceRegistry()); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -76,8 +76,8 @@ public void SaveProjectAs_DuplicateItemsInProjectSaveAsNewFile_ProjectAsEntitiesInFile() { // Setup - RingtoetsProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); - RingtoetsProject duplicateProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject duplicateProject = RiskeerProjectTestHelper.GetFullTestProject(); AssessmentSection duplicateAssessmentSection = duplicateProject.AssessmentSections.First(); fullProject.AssessmentSections.Add(duplicateAssessmentSection); @@ -89,7 +89,7 @@ // Call storage.SaveProjectAs(ringtoetsFile); - var firstProject = (RingtoetsProject) storage.LoadProject(ringtoetsFile); + var firstProject = (RiskeerProject) storage.LoadProject(ringtoetsFile); // Assert AssertProjectsAreEqual(fullProject, firstProject); @@ -99,7 +99,7 @@ public void SaveProjectAs_SaveAsNewFile_ProjectAsEntitiesInBothFiles() { // Setup - RingtoetsProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); string firstRingtoetsFile = GetRandomRingtoetsFile(); string secondRingtoetsFile = GetRandomRingtoetsFile(); @@ -110,8 +110,8 @@ // Call storage.StageProject(fullProject); storage.SaveProjectAs(secondRingtoetsFile); - var firstProject = (RingtoetsProject) storage.LoadProject(firstRingtoetsFile); - var secondProject = (RingtoetsProject) storage.LoadProject(secondRingtoetsFile); + var firstProject = (RiskeerProject) storage.LoadProject(firstRingtoetsFile); + var secondProject = (RiskeerProject) storage.LoadProject(secondRingtoetsFile); // Assert AssertProjectsAreEqual(firstProject, secondProject); @@ -121,7 +121,7 @@ public void GivenRingtoetsProject_WhenComparingFingerPrintsVariousScenariosUnchangedData_ThenFingerprintUnchanged() { // Given - RingtoetsProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); string tempRingtoetsFile = GetRandomRingtoetsFile(); // When @@ -136,7 +136,7 @@ ProjectEntity entityAfterSave = fullProject.Create(new PersistenceRegistry()); byte[] hash2 = FingerprintHelper.Get(entityAfterSave); - var openedProject = (RingtoetsProject) storage.LoadProject(tempRingtoetsFile); + var openedProject = (RiskeerProject) storage.LoadProject(tempRingtoetsFile); ProjectEntity entityAfterOpening = openedProject.Create(new PersistenceRegistry()); byte[] hash3 = FingerprintHelper.Get(entityAfterOpening); @@ -151,13 +151,13 @@ { // Setup var storage = new StorageSqLite(); - RingtoetsProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); storage.StageProject(fullProject); string tempRingtoetsFile = GetRandomRingtoetsFile(); storage.SaveProjectAs(tempRingtoetsFile); // Call - var loadedProject = (RingtoetsProject) storage.LoadProject(tempRingtoetsFile); + var loadedProject = (RiskeerProject) storage.LoadProject(tempRingtoetsFile); // Assert AssertProjectsAreEqual(fullProject, loadedProject); @@ -177,7 +177,7 @@ var projectStore = new StorageSqLite(); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { // When gui.Run(testFile); @@ -187,8 +187,8 @@ Assert.NotNull(gui.Project); Assert.AreEqual("Project", gui.Project.Name); Assert.IsEmpty(gui.Project.Description); - Assert.IsInstanceOf(gui.Project); - CollectionAssert.IsEmpty(((RingtoetsProject) gui.Project).AssessmentSections); + Assert.IsInstanceOf(gui.Project); + CollectionAssert.IsEmpty(((RiskeerProject) gui.Project).AssessmentSections); } mocks.VerifyAll(); @@ -209,12 +209,12 @@ var projectStore = new StorageSqLite(); - RingtoetsProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject fullProject = RiskeerProjectTestHelper.GetFullTestProject(); string expectedProjectDescription = fullProject.Description; SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(tempRingtoetsFile, fullProject); - using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RingtoetsProjectFactory(), new GuiCoreSettings())) + using (var gui = new GuiCore(new MainWindow(), projectStore, projectMigrator, new RiskeerProjectFactory(), new GuiCoreSettings())) { // When Action action = () => gui.Run(tempRingtoetsFile); @@ -231,8 +231,8 @@ Assert.AreEqual(expectedProjectName, gui.Project.Name); Assert.AreEqual(expectedProjectDescription, gui.Project.Description); - Assert.IsInstanceOf(gui.Project); - AssertProjectsAreEqual(fullProject, (RingtoetsProject) gui.Project); + Assert.IsInstanceOf(gui.Project); + AssertProjectsAreEqual(fullProject, (RiskeerProject) gui.Project); } mocks.VerifyAll(); @@ -258,7 +258,7 @@ string.Concat(Path.GetRandomFileName(), tempExtension)); } - private static void AssertProjectsAreEqual(RingtoetsProject expectedProject, RingtoetsProject actualProject) + private static void AssertProjectsAreEqual(RiskeerProject expectedProject, RiskeerProject actualProject) { Assert.NotNull(expectedProject); Assert.NotNull(actualProject); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -58,7 +58,7 @@ }; // Call - RingtoetsProject project = entity.Read(new ReadConversionCollector()); + RiskeerProject project = entity.Read(new ReadConversionCollector()); // Assert Assert.IsNotNull(project); @@ -135,7 +135,7 @@ }; // Call - RingtoetsProject project = entity.Read(new ReadConversionCollector()); + RiskeerProject project = entity.Read(new ReadConversionCollector()); // Assert Assert.AreEqual(2, project.AssessmentSections.Count); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs =================================================================== diff -u -re7e71c79d26107c1f810fc3768c2652d4fbba562 -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision e7e71c79d26107c1f810fc3768c2652d4fbba562) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -255,7 +255,7 @@ string projectName = Path.GetFileNameWithoutExtension(tempRingtoetsFile); var storage = new StorageSqLite(); var mockRepository = new MockRepository(); - var project = mockRepository.StrictMock(); + var project = mockRepository.StrictMock(); project.Description = ""; // Precondition @@ -265,7 +265,7 @@ IProject loadedProject = storage.LoadProject(tempRingtoetsFile); // Assert - Assert.IsInstanceOf(loadedProject); + Assert.IsInstanceOf(loadedProject); Assert.AreEqual(projectName, loadedProject.Name); Assert.AreEqual(project.Description, loadedProject.Description); } @@ -290,7 +290,7 @@ public void SaveProjectAs_InvalidPath_ThrowsArgumentException(string invalidPath) { // Setup - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var storage = new StorageSqLite(); storage.StageProject(project); @@ -309,7 +309,7 @@ { // Setup string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(SaveProjectAs_ValidPathToNonExistingFile_DoesNotThrowException)); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var storage = new StorageSqLite(); storage.StageProject(project); @@ -328,7 +328,7 @@ { // Setup string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(SaveProjectAs_ValidPathToExistingFile_DoesNotThrowException)); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var storage = new StorageSqLite(); storage.StageProject(project); @@ -346,7 +346,7 @@ { // Setup string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(SaveProjectAs_ValidPathToLockedFile_ThrowsUpdateStorageException)); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var storage = new StorageSqLite(); storage.StageProject(project); @@ -398,7 +398,7 @@ { // Setup var storage = new StorageSqLite(); - storage.StageProject(new RingtoetsProject()); + storage.StageProject(new RiskeerProject()); string path = Path.Combine(testPath, "ValidCharacteristics.csv"); char[] invalidCharacters = Path.GetInvalidPathChars(); @@ -433,7 +433,7 @@ { // Setup var storageSqLite = new StorageSqLite(); - storageSqLite.StageProject(new RingtoetsProject()); + storageSqLite.StageProject(new RiskeerProject()); // Call bool hasChanges = storageSqLite.HasStagedProjectChanges(null); @@ -447,7 +447,7 @@ { // Setup var storageSqLite = new StorageSqLite(); - var storedProject = new RingtoetsProject(); + var storedProject = new RiskeerProject(); string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_ValidProjectLoaded_ReturnsFalse)); SqLiteDatabaseHelper.CreateValidRingtoetsDatabase(tempRingtoetsFile, storedProject); @@ -466,7 +466,7 @@ { // Setup var storageSqLite = new StorageSqLite(); - var storedProject = new RingtoetsProject(); + var storedProject = new RiskeerProject(); const string changedName = "some name"; string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_ValidProjectLoadedWithUnaffectedChange_ReturnsFalse)); @@ -487,7 +487,7 @@ { // Setup var storageSqLite = new StorageSqLite(); - RingtoetsProject storedProject = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject storedProject = RiskeerProjectTestHelper.GetFullTestProject(); const string changedDescription = "some description"; string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_ValidProjectLoadedWithAffectedChange_ReturnsTrue)); @@ -509,7 +509,7 @@ { // Setup var mockRepository = new MockRepository(); - var project = mockRepository.StrictMock(); + var project = mockRepository.StrictMock(); mockRepository.ReplayAll(); var storage = new StorageSqLite(); string tempRingtoetsFile = Path.Combine(workingDirectory, nameof(HasStagedProjectChanges_SavedToEmptyDatabaseFile_ReturnsFalse)); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs (.../RiskeerProjectTestHelperTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs (.../RiskeerProjectTestHelperTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -61,7 +61,7 @@ const string expectedAssessmentSectionName = "assessmentSection"; // Call - RingtoetsProject project = RiskeerProjectTestHelper.GetFullTestProject(); + RiskeerProject project = RiskeerProjectTestHelper.GetFullTestProject(); // Assert Assert.AreEqual(expectedProjectName, project.Name); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/SqLiteDatabaseHelperTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/SqLiteDatabaseHelperTest.cs (.../SqLiteDatabaseHelperTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/SqLiteDatabaseHelperTest.cs (.../SqLiteDatabaseHelperTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -248,7 +248,7 @@ { // Setup string validPath = TestHelper.GetScratchPadPath(nameof(CreateValidRingtoetsDatabase_ValidArguments_SavesProjectToFile)); - var project = new RingtoetsProject(); + var project = new RiskeerProject(); var fileDisposeHelper = new FileDisposeHelper(validPath); try Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -66,15 +66,15 @@ namespace Riskeer.Storage.Core.TestUtil { /// - /// This class can be used to create instances which have their properties set and can be used in tests. + /// This class can be used to create instances which have their properties set and can be used in tests. /// public static class RiskeerProjectTestHelper { /// - /// Returns a new complete instance of . + /// Returns a new complete instance of . /// - /// A new complete instance of . - public static RingtoetsProject GetFullTestProject() + /// A new complete instance of . + public static RiskeerProject GetFullTestProject() { var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { @@ -194,7 +194,7 @@ SetSections(assessmentSection.TechnicalInnovation); SetSectionResults(assessmentSection.TechnicalInnovation.SectionResults); - var fullTestProject = new RingtoetsProject + var fullTestProject = new RiskeerProject { Name = "tempProjectFile", Description = "description", Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs =================================================================== diff -u -re7e71c79d26107c1f810fc3768c2652d4fbba562 -r68f02442e2e790aaa0bde531c328662819908f10 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs (.../SqLiteDatabaseHelper.cs) (revision e7e71c79d26107c1f810fc3768c2652d4fbba562) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs (.../SqLiteDatabaseHelper.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) @@ -108,8 +108,8 @@ /// Converts the into a new Ringtoets database file. /// /// Path to database file. - /// to save. - public static void CreateValidRingtoetsDatabase(string databaseFilePath, RingtoetsProject project) + /// to save. + public static void CreateValidRingtoetsDatabase(string databaseFilePath, RiskeerProject project) { try {