Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst =================================================================== diff -u -r47f697258fd9f407ebba58057e69e47ecb47b705 -r42b1f79a4e6035f98df351234a048fdc748987d9 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst (.../Script15.rxtst) (revision 47f697258fd9f407ebba58057e69e47ecb47b705) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script15.rxtst (.../Script15.rxtst) (revision 42b1f79a4e6035f98df351234a048fdc748987d9) @@ -596,12 +596,6 @@ type="UserCode"> - - + + + + + + + + + + + + + + + + @@ -809,8 +843,8 @@ variablename="pathToItemToOpenView"> @@ -952,18 +986,26 @@ type="Recording"> - - + + + + + + - - + + + + + + - - + + + + - - + + + + + + - - + + + + + + - - + + + + + + - - + + @@ -3733,7 +3813,7 @@ @@ -3745,6 +3825,12 @@ variableid="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8" variablename="pathToItemToOpenView"> + + @@ -3803,6 +3889,12 @@ variableid="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8" variablename="pathToItemToOpenView"> + + + + - - + + + + + + + + + + + + - - + + + + + + - - + + + + + id="c684f32e-fde2-46e2-9e26-db517dc090b3" + name="SetRangeLoopForHrds"> + + + + + id="91e04eeb-cc8b-4ac3-8cc9-37bf29718a9a" + name="CalculateRequiredHBC"> + id="19d56aff-3e6d-4b7a-9a77-ed2fa3be50d1" + name="OpenDocumentViewForHydraulicBCItem"> + + + + + + + + + + + id="527ae9ca-57c0-4d4a-941e-0ba62549d694" + name="OpenViewForCurrentlySelectedItemInProjectExplorer"> + + + id="a3feda9e-d763-4c1b-80ee-28ff8e148634" + name="SelectCheckboxesForListRowsInHBCView"> + + + + + + + + + + + + + id="267ed6f2-6dbe-405d-ae57-1838e95bcd25" + name="CloseViewCentralPanelWithFocus"> + + + + + id="e0241af8-9a94-4e8c-94df-9ccdcb71bb6e" + name="ConcatenateStrings"> + + + + + + + + + + + id="0caaacfb-8725-483f-8225-5222d1723fdf" + name="StartCalculationsForFM"> + id="b024efd0-99d5-4678-bbf5-3d5f58759f1a" + name="SelectGenericItemInProjectExplorer"> + + + id="65d35fbd-a017-4be6-93af-4ce3ba52e314" + name="CancelCalculations"> + + + + + id="79152a3b-29b1-4f88-9fd3-8d577eb67d3b" + name="ValidateTextMessage"> + id="d7cf34ee-33c9-4cc8-b23e-ed4c30b40656" + name="ValidateTextMesage"> + id="1b807291-6298-4090-b767-122535e24b0e" + name="SetRangeForInputInspection"> + id="1d3b14dd-623d-4da6-98f2-689ae3cdb150" + name="SetRangeInSmartFolder"> + + + + + + + + + + + + + + + + + id="1e2e252e-f985-4501-b5ab-b479b7c1b6c8" + name="StartCalculationsForFM"> + id="b1f0d474-133a-4be7-b04b-68d1c5b92e26" + name="SelectGenericItemInProjectExplorer"> - - - - + id="4a39f470-098f-4720-8145-4ec4b189eae9" + name="StartAllCalculationsInSelectedFolderInProjectExplorer"> - - - - - - - - - - - - - - - - - - - - - - - - + id="d1ac0764-0f41-40c7-bb02-ac97d6ea4c7c" + name="MakeScreenshotOfProgressDialog"> + id="fa52b544-cdf8-4b35-b8ca-4a11b2021e91" + name="CreateScreenShotProgressDialog"> + id="62cc4aba-157c-484c-9867-2b73599e391c" + name="WaitForCalculationsToFinish"> + id="dce30319-abdd-47dc-b3ae-aabe90110dd6" + name="WaitUntilAllCalculationsHaveBeenCarriedOut"> + id="ab3b3ff4-f40b-4a05-83f5-d4d6437bbbed" + name="ValidateDetailedResultsInSingleCalculation"> + + + + + + + + + + + + + + + id="dca088ce-ce35-41a2-a66b-d53bec05c9e9" + name="CreateCSVFileNameToExportReults"> + id="5ad930db-88e8-4725-adf5-67e4701866e8" + name="ConcatenateStrings"> - - - - - - - - - - - - - - - - - - - - - - + id="6b684f52-726b-435f-97b0-837ecdc0a641" + name="ExportCurrentItemToCSVFile"> - - - - - - - - - - - - - - - - - - + id="599f8f71-b9b7-4a75-8c36-411c10502a9b" + name="ValidatePlainTextFilesAreEqual"> - - - - - indexLocationHBC + rangeLoopInputViews - pathToAllCalculationsItem + relativePathToSingleCalculationToFullyValidate - rangeLoopInputViews + rangeLoopCalculationsHrds + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ fmLabel + + fileToSave + + fileToOpen + + pathToHBCItem + + rangeLoopInputViews + + relativePathToSingleCalculationToFullyValidate + + rangeLoopCalculationsHrds +
+ ZST + + output_Project_15b_ZST.risk + + X:\script15\currentRelease\input_Project_15b_ZST.risk + + Traject>Waterstanden bij vaste doelkans>1/1000 + + 1-4 + + >zuilen>dam1voorland1 + + 1-2 +
+ AGK + + output_Project_15b_AGK.risk + + X:\script15\currentRelease\input_Project_15b_AGK.risk + + Traject>Waterstanden bij vaste doelkans>1/30000 + + 5-8 + + >dam1voorland1 + + 3-4 +
+ GEBU + + output_Project_15ab_GEBU.risk + + X:\script15\currentRelease\input_Project_15ab_GEBU.risk + + Traject>Waterstanden bij vaste doelkans>1/1000 + + 9-12 + + >golfklap>dam1voorland1 + + 5-6 +
+ + + - pathReferenceResultsCSVFile + fmLabel - csvFileNameCurrentResults + indexLocationHBC - relativePathToSingleCalculationToFullyValidate + pathToAllCalculationsItem + pathReferenceResultsCSVFile + + + csvFileNameCurrentResults + + expectedWaterLevel @@ -7852,33 +8104,18 @@ fmLabel - fileToSave - - - fileToOpen - - - pathToHBCItem - - indexLocationHBC pathToAllCalculationsItem - rangeLoopInputViews - - pathReferenceResultsCSVFile csvFileNameCurrentResults - relativePathToSingleCalculationToFullyValidate - - expectedWaterLevel @@ -7899,33 +8136,50 @@ ZST - output_Project_15b_ZST.risk + 37 - X:\script15\currentRelease\input_Project_15b_ZST.risk + Traject>@ZST>@HB>WBI2017_Oosterschelde_28-1_v02 - Traject>Waterstanden bij vaste doelkans>1/1000 + X:\script15\reference\referenceResultsZST.csv - 37 + currentResultsZST.csv - Traject>@ZST>@HB>WBI2017_Oosterschelde_28-1_v02 + 3.34 - 1-4 + 0.42 - X:\script15\reference\referenceResultsZST.csv + 3.18 - currentResultsZST.csv + 317.03 - >zuilen>dam1voorland1 + -59.97 + + + ZST + + + 135 + + + Traject>@ZST>@HB>WBI2017_Oosterschelde_30-1_v02 + + + X:\script15\reference\referenceResultsZST.csv + + + currentResultsZST.csv + + 3.34 @@ -7946,33 +8200,50 @@ AGK - output_Project_15b_AGK.risk + 5 - X:\script15\currentRelease\input_Project_15b_AGK.risk + Traject>@AGK>@HB>WBI2017_IJsselmeer_8-3a_v02 - Traject>Waterstanden bij vaste doelkans>1/30000 + X:\script15\reference\referenceResultsAGK.csv - 5 + currentResultsAGK.csv - Traject>@AGK>@HB>WBI2017_IJsselmeer_8-3a_v02 + 2.42 - 5-8 + 1.43 - X:\script15\reference\referenceResultsAGK.csv + 6.42 - currentResultsAGK.csv + 350.29 - >dam1voorland1 + -6.71 + + + AGK + + + 25 + + + Traject>@AGK>@HB>WBI2017_Markermeer_8-2_8-3b_v02 + + + X:\script15\reference\referenceResultsAGK.csv + + + currentResultsAGK.csv + + 2.42 @@ -7993,33 +8264,50 @@ GEBU - output_Project_15ab_GEBU.risk + 164 - X:\script15\currentRelease\input_Project_15ab_GEBU.risk + Traject>@GEBU>@HB>WBI2017_Waddenzee_Oost_6-6_v03 - Traject>Waterstanden bij vaste doelkans>1/1000 + X:\script15\reference\referenceResultsGEBU.csv - 164 + currentResultsGEBU.csv - Traject>@GEBU>@HB>WBI2017_Waddenzee_Oost_6-6_v03 + 5.30 - 9-12 + 0.76 - X:\script15\reference\referenceResultsGEBU.csv + 3.85 - currentResultsGEBU.csv + 31.02 - >golfklap>dam1voorland1 + -76.98 + + + GEBU + + + 281 + + + Traject>@GEBU>@HB>WBI2017_Waddenzee_Oost_6-3_v03 + + + X:\script15\reference\referenceResultsGEBU.csv + + + currentResultsGEBU.csv + + 5.30 @@ -8731,6 +9019,9 @@ id="b94d20bf-4d0b-4056-ae2c-7dea46c7c177"> + + + +