Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs =================================================================== diff -u -r803c689399dacba19bb6679031b14485487f1b69 -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs (.../DistributionPropertiesTestHelperTest.cs) (revision 803c689399dacba19bb6679031b14485487f1b69) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs (.../DistributionPropertiesTestHelperTest.cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -78,37 +78,37 @@ true, true, true) - .SetName("Distribution, All read-only, correct assertions."), + .SetName("VariationDistribution, All read-only, correct assertions."), new TestCaseData( new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All), false, true, false) - .SetName("Distribution, All read-only, incorrect assertions."), + .SetName("VariationDistribution, All read-only, incorrect assertions."), new TestCaseData( new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All), true, false, false) - .SetName("Distribution, All read-only, incorrect assertions."), + .SetName("VariationDistribution, All read-only, incorrect assertions."), new TestCaseData( new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.Mean), true, false, true) - .SetName("Distribution, Mean read-only, correct assertions."), + .SetName("VariationDistribution, Mean read-only, correct assertions."), new TestCaseData( new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation), false, true, true) - .SetName("Distribution, CoefficientOfVariation read-only, correct assertions."), + .SetName("VariationDistribution, CoefficientOfVariation read-only, correct assertions."), new TestCaseData( new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None), false, false, true) - .SetName("Distribution, None read-only, correct assertions."), + .SetName("VariationDistribution, None read-only, correct assertions."), }; #endregion Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs =================================================================== diff -u -rd2d96421974b56eb204dd8f756748aa582da0874 -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision d2d96421974b56eb204dd8f756748aa582da0874) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -38,43 +38,6 @@ [TestFixture] public class MapDataTestHelperTest { - private static IEnumerable NotEqualToDefaultPdokMapData() - { - var defaultMapData = WmtsMapData.CreateDefaultPdokMapData(); - - var otherName = new WmtsMapData("otherName", - defaultMapData.SourceCapabilitiesUrl, - defaultMapData.SelectedCapabilityIdentifier, - defaultMapData.PreferredFormat); - yield return new TestCaseData(otherName); - - var otherPreferredFormat = new WmtsMapData(defaultMapData.Name, - defaultMapData.SourceCapabilitiesUrl, - defaultMapData.SelectedCapabilityIdentifier, - "image/otherPreferredFormat"); - yield return new TestCaseData(otherPreferredFormat); - - var otherSelectedCapabilityIdentifier = new WmtsMapData(defaultMapData.Name, - defaultMapData.SourceCapabilitiesUrl, - "otherSelectedCapabilityIdentifier", - defaultMapData.PreferredFormat); - yield return new TestCaseData(otherSelectedCapabilityIdentifier); - - var otherSourceCapabilitiesUrl = new WmtsMapData(defaultMapData.Name, - "otherSourceCapabilitiesUrl", - defaultMapData.SelectedCapabilityIdentifier, - defaultMapData.PreferredFormat); - yield return new TestCaseData(otherSourceCapabilitiesUrl); - - WmtsMapData otherVisibility = defaultMapData; - otherVisibility.IsVisible = !otherVisibility.IsVisible; - yield return new TestCaseData(otherVisibility); - - WmtsMapData otherTransparency = defaultMapData; - otherTransparency.Transparency = (RoundedDouble) ((otherVisibility.Transparency + 0.5) % 1); - yield return new TestCaseData(otherTransparency); - } - #region AssertFailureMechanismSectionsMapData [Test] @@ -1255,6 +1218,43 @@ public SimpleImageBasedMapData() : base("name") {} } + private static IEnumerable NotEqualToDefaultPdokMapData() + { + var defaultMapData = WmtsMapData.CreateDefaultPdokMapData(); + + var otherName = new WmtsMapData("otherName", + defaultMapData.SourceCapabilitiesUrl, + defaultMapData.SelectedCapabilityIdentifier, + defaultMapData.PreferredFormat); + yield return new TestCaseData(otherName).SetName("WmtsMapDataOtherName"); + + var otherPreferredFormat = new WmtsMapData(defaultMapData.Name, + defaultMapData.SourceCapabilitiesUrl, + defaultMapData.SelectedCapabilityIdentifier, + "image/otherPreferredFormat"); + yield return new TestCaseData(otherPreferredFormat).SetName("WmtsMapDataOtherPreferredFormat"); + + var otherSelectedCapabilityIdentifier = new WmtsMapData(defaultMapData.Name, + defaultMapData.SourceCapabilitiesUrl, + "otherSelectedCapabilityIdentifier", + defaultMapData.PreferredFormat); + yield return new TestCaseData(otherSelectedCapabilityIdentifier).SetName("WmtsMapDataOtherSelectedCapabilityIdentifier"); + + var otherSourceCapabilitiesUrl = new WmtsMapData(defaultMapData.Name, + "otherSourceCapabilitiesUrl", + defaultMapData.SelectedCapabilityIdentifier, + defaultMapData.PreferredFormat); + yield return new TestCaseData(otherSourceCapabilitiesUrl).SetName("WmtsMapDataSourceCapabilitiesUrl"); + + WmtsMapData otherVisibility = defaultMapData; + otherVisibility.IsVisible = !otherVisibility.IsVisible; + yield return new TestCaseData(otherVisibility); + + WmtsMapData otherTransparency = defaultMapData; + otherTransparency.Transparency = (RoundedDouble) ((otherVisibility.Transparency + 0.5) % 1); + yield return new TestCaseData(otherTransparency); + } + private static IEnumerable NotEqualToBingAerial() { var defaultMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingAerial); @@ -1263,21 +1263,21 @@ { Name = "otherName" }; - yield return new TestCaseData(otherName); + yield return new TestCaseData(otherName).SetName("WellKnownTileSourceOtherName"); var otherPreferredFormat = new WellKnownTileSourceMapData(WellKnownTileSource.EsriWorldShadedRelief) { Name = "Bing Maps - Satelliet" }; - yield return new TestCaseData(otherPreferredFormat); + yield return new TestCaseData(otherPreferredFormat).SetName("WellKnownTileSourceOtherPreferredFormat"); WellKnownTileSourceMapData otherVisibility = defaultMapData; otherVisibility.IsVisible = !otherVisibility.IsVisible; - yield return new TestCaseData(otherVisibility); + yield return new TestCaseData(otherVisibility).SetName("WellKnownTileSourceOtherVisibility"); WellKnownTileSourceMapData otherTransparency = defaultMapData; otherTransparency.Transparency = (RoundedDouble) ((otherVisibility.Transparency + 0.5) % 1); - yield return new TestCaseData(otherTransparency); + yield return new TestCaseData(otherTransparency).SetName("WellKnownTileSourceOtherTransparency"); } #endregion Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r92056906158ddd85bd0b82da96167997e08c289a -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 92056906158ddd85bd0b82da96167997e08c289a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -117,8 +117,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, TestName = "IsEnabled_WithOutput_ReturnExpectedEnabledState")] + [TestCase(false, TestName = "IsEnabled_WithoutOutput_ReturnExpectedEnabledState")] public void IsEnabled_CalculationWithOrWithoutOutput_ReturnExpectedEnabledState(bool hasOutput) { // Setup @@ -153,8 +153,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, TestName = "IsEnabled_WithOutputInSubFolder_ReturnExpectedEnabledState")] + [TestCase(false, TestName = "IsEnabled_WithoutOutputInSubFolder_ReturnExpectedEnabledState")] public void IsEnabled_CalculationWithOrWithoutOutputInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs =================================================================== diff -u -r9c23520df7a2adf82996d79bf59b83fc1adc1f26 -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs (.../BackgroundDataPropertyInfoTest .cs) (revision 9c23520df7a2adf82996d79bf59b83fc1adc1f26) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/BackgroundDataPropertyInfoTest .cs (.../BackgroundDataPropertyInfoTest .cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -41,19 +41,22 @@ WellKnownTileSourceMapData wellKnownMapData = new WellKnownTileSourceMapData(WellKnownTileSource.BingRoads); WmtsMapData wmtsMapData = WmtsMapData.CreateDefaultPdokMapData(); - yield return new TestCaseData(new BackgroundData()); - yield return new TestCaseData(new BackgroundData + yield return new TestCaseData( + new BackgroundData()) + .SetName("Default BackgroundData"); + yield return new TestCaseData( + new BackgroundData { Name = wellKnownMapData.Name, BackgroundMapDataType = BackgroundMapDataType.WellKnown, IsConfigured = wellKnownMapData.IsConfigured - }); + }).SetName("WellKnown BingRoads BackgroundData"); yield return new TestCaseData(new BackgroundData { Name = wmtsMapData.Name, BackgroundMapDataType = BackgroundMapDataType.Wmts, IsConfigured = wmtsMapData.IsConfigured - }); + }).SetName("Wmts DefaultPdok BackgroundData"); } [SetUp] Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r92056906158ddd85bd0b82da96167997e08c289a -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 92056906158ddd85bd0b82da96167997e08c289a) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -176,8 +176,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, TestName = "IsEnabled_WithOutputInSubFolder_ReturnExpectedEnabledState")] + [TestCase(false, TestName = "IsEnabled_WithoutOutputInSubFolder_ReturnExpectedEnabledState")] public void IsEnabled_CalculationWithOrWithoutOutputInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs =================================================================== diff -u -r92056906158ddd85bd0b82da96167997e08c289a -rde55528705df446cc78761cd04d8ba8149e6540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision 92056906158ddd85bd0b82da96167997e08c289a) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs) (revision de55528705df446cc78761cd04d8ba8149e6540c) @@ -117,8 +117,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, TestName = "IsEnabled_WithOutput_ReturnExpectedEnabledState")] + [TestCase(false, TestName = "IsEnabled_WithoutOutput_ReturnExpectedEnabledState")] public void IsEnabled_CalculationWithOrWithoutOutput_ReturnExpectedEnabledState(bool hasOutput) { // Setup @@ -153,8 +153,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, TestName = "IsEnabled_WithOutputInSubFolder_ReturnExpectedEnabledState")] + [TestCase(false, TestName = "IsEnabled_WithoutOutputInSubFolder_ReturnExpectedEnabledState")] public void IsEnabled_CalculationInSubFolder_ReturnExpectedEnabledState(bool hasOutput) { // Setup