Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext.cs
===================================================================
diff -u -ra87681a8625134e43c91ef41e7b90d7c412db325 -r364ee92c804029b22cafd4a21ec3503801409eb8
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext.cs (.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext.cs) (revision a87681a8625134e43c91ef41e7b90d7c412db325)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext.cs (.../HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext.cs) (revision 364ee92c804029b22cafd4a21ec3503801409eb8)
@@ -21,7 +21,7 @@
/// belongs to.
/// Thrown when any parameter is null.
protected HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext(ObservableList wrappedData,
- IAssessmentSection assessmentSection)
+ IAssessmentSection assessmentSection)
: base(wrappedData)
{
if (assessmentSection == null)
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rf6640bf5857d4318252c06c2ed62c66e4ce4e552 -r364ee92c804029b22cafd4a21ec3503801409eb8
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision f6640bf5857d4318252c06c2ed62c66e4ce4e552)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 364ee92c804029b22cafd4a21ec3503801409eb8)
@@ -792,15 +792,19 @@
(
RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
HydraulicBoundaryLocationCalculationsType.WaterLevel,
- context => context.WrappedData.Select(tp => new Tuple, double>(
- tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability)));
+ context => context.WrappedData
+ .Select(tp => new Tuple, double>(
+ tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability))
+ .ToArray());
yield return CreateHydraulicBoundaryLocationCalculationsForTargetProbabilityGroupExportInfo
(
RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
HydraulicBoundaryLocationCalculationsType.WaveHeight,
- context => context.WrappedData.Select(tp => new Tuple, double>(
- tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability)));
+ context => context.WrappedData
+ .Select(tp => new Tuple, double>(
+ tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability))
+ .ToArray());
}
public override IEnumerable GetUpdateInfos()
@@ -1233,16 +1237,16 @@
private ExportInfo CreateHydraulicBoundaryLocationCalculationsForTargetProbabilityGroupExportInfo(
string displayName, HydraulicBoundaryLocationCalculationsType calculationsType,
- Func, double>>> locationCalculationsForTargetProbabilities)
+ Func, double>>> locationCalculationsForTargetProbabilitiesFunc)
where T : HydraulicBoundaryLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext
{
return new ExportInfo
{
Name = context => displayName,
Extension = Resources.Zip_file_filter_Extension,
CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationCalculationsForTargetProbabilitiesExporter(
- locationCalculationsForTargetProbabilities(context), calculationsType, filePath),
- IsEnabled = context => locationCalculationsForTargetProbabilities(context).Any(),
+ locationCalculationsForTargetProbabilitiesFunc(context), calculationsType, filePath),
+ IsEnabled = context => locationCalculationsForTargetProbabilitiesFunc(context).Any(),
GetExportPath = () => ExportHelper.GetFilePath(GetInquiryHelper(), new FileFilterGenerator(Resources.Zip_file_filter_Extension,
Resources.Zip_file_filter_Description))
};
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsForTargetProbabilityExporterTest.cs
===================================================================
diff -u -rfd40e419b411422c5cdf99a35a00b09b856268d1 -r364ee92c804029b22cafd4a21ec3503801409eb8
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsForTargetProbabilityExporterTest.cs (.../HydraulicBoundaryLocationCalculationsForTargetProbabilityExporterTest.cs) (revision fd40e419b411422c5cdf99a35a00b09b856268d1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsForTargetProbabilityExporterTest.cs (.../HydraulicBoundaryLocationCalculationsForTargetProbabilityExporterTest.cs) (revision 364ee92c804029b22cafd4a21ec3503801409eb8)
@@ -132,12 +132,12 @@
}
[Test]
- public void Export_InvalidDirectoryRights_LogErrorAndReturnFalse()
+ public void Export_WriterThrowsCriticalFileWriteException_LogErrorAndReturnFalse()
{
// Setup
const string fileName = "test";
- string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_InvalidDirectoryRights_LogErrorAndReturnFalse));
+ string directoryPath = TestHelper.GetScratchPadPath(nameof(Export_WriterThrowsCriticalFileWriteException_LogErrorAndReturnFalse));
Directory.CreateDirectory(directoryPath);
string filePath = Path.Combine(directoryPath, $"{fileName}.shp");