Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs =================================================================== diff -u -rc37e7aa9fdd38a0476335e056b33c583486ed1af -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs (.../SerializableAssessmentProcess.cs) (revision c37e7aa9fdd38a0476335e056b33c583486ed1af) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentProcess.cs (.../SerializableAssessmentProcess.cs) (revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df) @@ -33,21 +33,21 @@ /// /// Creates a new instance of . /// - public SerializableAssessmentProcess() {} + public SerializableAssessmentProcess() + { + StartYear = 2017; + EndYear = 2023; + } /// /// Creates a new instance of . /// /// The unique ID of the assessment process. /// The assessment section this process belongs to. - /// The starting year of the assessment process. - /// The end year of the assessment process. /// Thrown when /// or is null. public SerializableAssessmentProcess(string id, - SerializableAssessmentSection assessmentSection, - int startYear, - int endYear) + SerializableAssessmentSection assessmentSection) : this() { if (id == null) { @@ -61,8 +61,6 @@ Id = id; AssessmentSectionId = assessmentSection.Id; - StartYear = startYear; - EndYear = endYear; } /// Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs =================================================================== diff -u -re17ab48b3abda85cd6d9cb33e6a9f507e70fdff3 -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision e17ab48b3abda85cd6d9cb33e6a9f507e70fdff3) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df) @@ -40,8 +40,8 @@ Assert.IsInstanceOf(assessmentProcess); Assert.IsNull(assessmentProcess.Id); Assert.IsNull(assessmentProcess.AssessmentSectionId); - Assert.Zero(assessmentProcess.StartYear); - Assert.Zero(assessmentProcess.EndYear); + Assert.AreEqual(2017, assessmentProcess.StartYear); + Assert.AreEqual(2023, assessmentProcess.EndYear); SerializableAttributeTestHelper.AssertXmlTypeAttribute(typeof(SerializableAssessmentProcess), "Beoordelingsproces"); @@ -59,14 +59,9 @@ [Test] public void Constructor_IdNull_ThrowsArgumentNullException() { - // Setup - var random = new Random(39); - // Call TestDelegate call = () => new SerializableAssessmentProcess(null, - new SerializableAssessmentSection(), - random.Next(), - random.Next()); + new SerializableAssessmentSection()); // Assert var exception = Assert.Throws(call); @@ -76,14 +71,9 @@ [Test] public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { - // Setup - var random = new Random(39); - // Call TestDelegate call = () => new SerializableAssessmentProcess("id", - null, - random.Next(), - random.Next()); + null); // Assert var exception = Assert.Throws(call); @@ -105,20 +95,16 @@ new Point2D(random.NextDouble(), random.NextDouble()), new Point2D(random.NextDouble(), random.NextDouble()) }); - int startYear = random.Next(); - int endYear = random.Next(); // Call var assessmentProcess = new SerializableAssessmentProcess(id, - assessmentSection, - startYear, - endYear); + assessmentSection); // Assert Assert.AreEqual(id, assessmentProcess.Id); Assert.AreEqual(assessmentSection.Id, assessmentProcess.AssessmentSectionId); - Assert.AreEqual(startYear, assessmentProcess.StartYear); - Assert.AreEqual(endYear, assessmentProcess.EndYear); + Assert.AreEqual(2017, assessmentProcess.StartYear); + Assert.AreEqual(2023, assessmentProcess.EndYear); } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs =================================================================== diff -u -r1f88ea122db66685810334df995c5ce69f164752 -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision 1f88ea122db66685810334df995c5ce69f164752) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs (.../SerializableTotalAssemblyResultTest.cs) (revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df) @@ -140,11 +140,8 @@ // Setup const string id = "id"; - var random = new Random(39); var assessmentProcess = new SerializableAssessmentProcess("process id", - new SerializableAssessmentSection(), - random.Next(), - random.Next()); + new SerializableAssessmentSection()); var resultWithoutProbability = new SerializableFailureMechanismAssemblyResult(); var resultWithProbability = new SerializableFailureMechanismAssemblyResult(); var assessmentSectionResult = new SerializableAssessmentSectionAssemblyResult(); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs =================================================================== diff -u -r6c5a00d08468cac0c3fe887e249541ef110e680c -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 6c5a00d08468cac0c3fe887e249541ef110e680c) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs (.../SerializableAssemblyWriterTest.cs) (revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df) @@ -280,9 +280,7 @@ }; var assessmentProcess = new SerializableAssessmentProcess("beoordelingsproces1", - assessmentSection, - 2018, - 2020); + assessmentSection); var totalAssemblyResult = new SerializableTotalAssemblyResult( "veiligheidsoordeel_1", Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml =================================================================== diff -u -r73d88f2715565f646c8f1d6d8f4f828f808a8751 -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision 73d88f2715565f646c8f1d6d8f4f828f808a8751) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/test-data/SerializableAssemblyWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df) @@ -18,8 +18,8 @@ Dijktraject - 2018 - 2020 + 2017 + 2023