Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs =================================================================== diff -u -ra30b67748bed77736f62b6b3c30c82649bb9cf4e -r1815be6776a818b0d390819ca63f89d3c5b78063 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision a30b67748bed77736f62b6b3c30c82649bb9cf4e) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision 1815be6776a818b0d390819ca63f89d3c5b78063) @@ -58,16 +58,29 @@ } [Test] - [TestCase(null)] + public void Constructor_IdNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new SerializableAssessmentProcess(null, + new SerializableAssessmentSection()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("id", exception.ParamName); + } + + [Test] + [TestCase(" ")] [TestCase("")] - public void Constructor_IdInvalid_ThrowsArgumentException(string id) + [TestCase(" InvalidId")] + public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId) { // Call - TestDelegate call = () => new SerializableAssessmentProcess(id, + TestDelegate call = () => new SerializableAssessmentProcess(invalidId, new SerializableAssessmentSection()); // Assert - const string expectedMessage = "'id' must have a value."; + const string expectedMessage = "'id' must have a value and consist only of alphanumerical characters, '-', '_' or '.'."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } @@ -87,11 +100,11 @@ public void Constructor_WithValidData_ReturnsExpectedValues() { // Setup - const string id = "section id"; + const string id = "processId"; var random = new Random(39); var assessmentSection = new SerializableAssessmentSection( - "assessment section id", + "assessmentSectionId", "name", new[] {