Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r3401d9bb860058fd63172e26815bff00ee84f704 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 3401d9bb860058fd63172e26815bff00ee84f704) @@ -1605,7 +1605,14 @@ private static bool HasHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput; + return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput + || hydraulicBoundaryLocation.DesignWaterLevelCalculation2.HasOutput + || hydraulicBoundaryLocation.DesignWaterLevelCalculation3.HasOutput + || hydraulicBoundaryLocation.DesignWaterLevelCalculation4.HasOutput + || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput + || hydraulicBoundaryLocation.WaveHeightCalculation2.HasOutput + || hydraulicBoundaryLocation.WaveHeightCalculation3.HasOutput + || hydraulicBoundaryLocation.WaveHeightCalculation4.HasOutput; } #region TestData @@ -1647,7 +1654,7 @@ get { yield return new TestCaseData( - TestHydraulicBoundaryLocation.CreateFullyCalculated(), + CreateFullyCalculatedHydraulicBoundaryLocation(), new TestHydraulicBoundaryLocation(), new TestDuneLocation { @@ -1658,13 +1665,13 @@ } ).SetName("HydraulicBoundaryAndDuneLocationWithOutput"); yield return new TestCaseData( - TestHydraulicBoundaryLocation.CreateFullyCalculated(), + CreateFullyCalculatedHydraulicBoundaryLocation(), new TestHydraulicBoundaryLocation(), new TestDuneLocation() ).SetName("HydraulicBoundaryLocationWithOutput"); yield return new TestCaseData( + CreateFullyCalculatedHydraulicBoundaryLocation(), TestHydraulicBoundaryLocation.CreateFullyCalculated(), - TestHydraulicBoundaryLocation.CreateFullyCalculated(), new TestDuneLocation { Calculation = @@ -1674,8 +1681,8 @@ } ).SetName("AllTypesWithOutput"); yield return new TestCaseData( + CreateFullyCalculatedHydraulicBoundaryLocation(), TestHydraulicBoundaryLocation.CreateFullyCalculated(), - TestHydraulicBoundaryLocation.CreateFullyCalculated(), new TestDuneLocation() ).SetName("HydraulicBoundaryAndGrassLocationWithOutput"); yield return new TestCaseData( @@ -1713,6 +1720,45 @@ } } + private static HydraulicBoundaryLocation CreateFullyCalculatedHydraulicBoundaryLocation() + { + return new TestHydraulicBoundaryLocation + { + DesignWaterLevelCalculation1 = + { + Output = new TestHydraulicBoundaryLocationOutput(1.1) + }, + DesignWaterLevelCalculation2 = + { + Output = new TestHydraulicBoundaryLocationOutput(2.2) + }, + DesignWaterLevelCalculation3 = + { + Output = new TestHydraulicBoundaryLocationOutput(3.3) + }, + DesignWaterLevelCalculation4 = + { + Output = new TestHydraulicBoundaryLocationOutput(4.4) + }, + WaveHeightCalculation1 = + { + Output = new TestHydraulicBoundaryLocationOutput(5.5) + }, + WaveHeightCalculation2 = + { + Output = new TestHydraulicBoundaryLocationOutput(6.6) + }, + WaveHeightCalculation3 = + { + Output = new TestHydraulicBoundaryLocationOutput(7.7) + }, + WaveHeightCalculation4 = + { + Output = new TestHydraulicBoundaryLocationOutput(8.8) + } + }; + } + #endregion } } \ No newline at end of file