Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -r6e06bf343fc545b7b0417d22b1b7209a51d3f073 -r491b3e4ecca17495df5dbfad65192499ff58de7f --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 6e06bf343fc545b7b0417d22b1b7209a51d3f073) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 491b3e4ecca17495df5dbfad65192499ff58de7f) @@ -4092,13 +4092,15 @@ [RepositoryFolder("e8cdff70-b26f-44b2-916f-95e061da9ed1")] public partial class CalculationButtonsFolder : RepoGenBaseFolder { + RepoItemInfo _calculateselectedbuttonInfo; /// /// Creates a new CalculationButtons folder. /// public CalculationButtonsFolder(RepoGenBaseFolder parentFolder) : base("CalculationButtons", "container[@controlname>'Button']", parentFolder, 30000, null, false, "e8cdff70-b26f-44b2-916f-95e061da9ed1", "") { + _calculateselectedbuttonInfo = new RepoItemInfo(this, "CalculateSelectedButton", "button[@controlname='CalculateForSelectedButton']", 30000, null, "705925a9-d286-4eed-8f22-23a9e3afce1c"); } /// @@ -4124,6 +4126,30 @@ return _selfInfo; } } + + /// + /// The CalculateSelectedButton item. + /// + [RepositoryItem("705925a9-d286-4eed-8f22-23a9e3afce1c")] + public virtual Ranorex.Button CalculateSelectedButton + { + get + { + return _calculateselectedbuttonInfo.CreateAdapter(true); + } + } + + /// + /// The CalculateSelectedButton item info. + /// + [RepositoryItemInfo("705925a9-d286-4eed-8f22-23a9e3afce1c")] + public virtual RepoItemInfo CalculateSelectedButtonInfo + { + get + { + return _calculateselectedbuttonInfo; + } + } } /// @@ -6307,7 +6333,6 @@ public partial class DesignWaterLevelCalculationsViewCachedFolder : RepoGenBaseFolder { AutomatedSystemTestsRepositoryFolders.LeftSideFolder1 _leftside; - AutomatedSystemTestsRepositoryFolders.RightSideFolder1 _rightside; /// /// Creates a new DesignWaterLevelCalculationsViewCached folder. @@ -6316,7 +6341,6 @@ base("DesignWaterLevelCalculationsViewCached", "container[@controlname<'CalculationsView']/container", parentFolder, 30000, null, false, "535b985f-89e1-4888-9b6e-edd71990ca55", "") { _leftside = new AutomatedSystemTestsRepositoryFolders.LeftSideFolder1(this); - _rightside = new AutomatedSystemTestsRepositoryFolders.RightSideFolder1(this); } /// @@ -6351,15 +6375,6 @@ { get { return _leftside; } } - - /// - /// The RightSide folder. - /// - [RepositoryFolder("aabb4c48-1864-49ac-941f-427294cae8cd")] - public virtual AutomatedSystemTestsRepositoryFolders.RightSideFolder1 RightSide - { - get { return _rightside; } - } } /// @@ -6369,7 +6384,6 @@ public partial class LeftSideFolder1 : RepoGenBaseFolder { AutomatedSystemTestsRepositoryFolders.TableFolder7 _table; - AutomatedSystemTestsRepositoryFolders.CalculationButtonsFolder1 _calculationbuttons; /// /// Creates a new LeftSide folder. @@ -6378,7 +6392,6 @@ base("LeftSide", "container[@controlname='panel1']", parentFolder, 30000, null, false, "d5d31bfe-0545-4bf6-ae8d-2a692de100bd", "") { _table = new AutomatedSystemTestsRepositoryFolders.TableFolder7(this); - _calculationbuttons = new AutomatedSystemTestsRepositoryFolders.CalculationButtonsFolder1(this); } /// @@ -6413,15 +6426,6 @@ { get { return _table; } } - - /// - /// The CalculationButtons folder. - /// - [RepositoryFolder("6cf96c09-a937-4047-b3a1-28455bd1a4ae")] - public virtual AutomatedSystemTestsRepositoryFolders.CalculationButtonsFolder1 CalculationButtons - { - get { return _calculationbuttons; } - } } /// @@ -6569,112 +6573,6 @@ } /// - /// The CalculationButtonsFolder1 folder. - /// - [RepositoryFolder("6cf96c09-a937-4047-b3a1-28455bd1a4ae")] - public partial class CalculationButtonsFolder1 : RepoGenBaseFolder - { - RepoItemInfo _calculateselectedbuttonInfo; - - /// - /// Creates a new CalculationButtons folder. - /// - public CalculationButtonsFolder1(RepoGenBaseFolder parentFolder) : - base("CalculationButtons", "container[@controlname>'Button']", parentFolder, 30000, null, false, "6cf96c09-a937-4047-b3a1-28455bd1a4ae", "") - { - _calculateselectedbuttonInfo = new RepoItemInfo(this, "CalculateSelectedButton", "button[@controlname='CalculateForSelectedButton']", 30000, null, "7df2b82b-0568-480a-ad83-3057ec323365"); - } - - /// - /// The Self item. - /// - [RepositoryItem("6cf96c09-a937-4047-b3a1-28455bd1a4ae")] - public virtual Ranorex.Container Self - { - get - { - return _selfInfo.CreateAdapter(true); - } - } - - /// - /// The Self item info. - /// - [RepositoryItemInfo("6cf96c09-a937-4047-b3a1-28455bd1a4ae")] - public virtual RepoItemInfo SelfInfo - { - get - { - return _selfInfo; - } - } - - /// - /// The CalculateSelectedButton item. - /// - [RepositoryItem("7df2b82b-0568-480a-ad83-3057ec323365")] - public virtual Ranorex.Button CalculateSelectedButton - { - get - { - return _calculateselectedbuttonInfo.CreateAdapter(true); - } - } - - /// - /// The CalculateSelectedButton item info. - /// - [RepositoryItemInfo("7df2b82b-0568-480a-ad83-3057ec323365")] - public virtual RepoItemInfo CalculateSelectedButtonInfo - { - get - { - return _calculateselectedbuttonInfo; - } - } - } - - /// - /// The RightSideFolder1 folder. - /// - [RepositoryFolder("aabb4c48-1864-49ac-941f-427294cae8cd")] - public partial class RightSideFolder1 : RepoGenBaseFolder - { - - /// - /// Creates a new RightSide folder. - /// - public RightSideFolder1(RepoGenBaseFolder parentFolder) : - base("RightSide", "container[@controlname='panel2']", parentFolder, 30000, null, false, "aabb4c48-1864-49ac-941f-427294cae8cd", "") - { - } - - /// - /// The Self item. - /// - [RepositoryItem("aabb4c48-1864-49ac-941f-427294cae8cd")] - public virtual Ranorex.Container Self - { - get - { - return _selfInfo.CreateAdapter(true); - } - } - - /// - /// The Self item info. - /// - [RepositoryItemInfo("aabb4c48-1864-49ac-941f-427294cae8cd")] - public virtual RepoItemInfo SelfInfo - { - get - { - return _selfInfo; - } - } - } - - /// /// The HydraulicBCDunesFolder1 folder. /// [RepositoryFolder("b29993ca-0b96-4e0e-b212-220bcef5fd4f")] Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -r6e06bf343fc545b7b0417d22b1b7209a51d3f073 -r491b3e4ecca17495df5dbfad65192499ff58de7f --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 6e06bf343fc545b7b0417d22b1b7209a51d3f073) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 491b3e4ecca17495df5dbfad65192499ff58de7f) @@ -864,6 +864,14 @@ refimgid="23190340-8af0-4944-9d16-2a3ec2c5b794" searchtimeout="30000ms" usecache="False"> + + /form[@automationid='RiskeerMainWindow']/?/container/container[@instance='1']/container[@controlname='DesignWaterLevelCalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button']/button[@controlname='CalculateForSelectedButton'] + /form[@automationid='RiskeerMainWindow']/?/container/container[@instance='1']/container[@controlname='DesignWaterLevelCalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button'] @@ -1594,42 +1602,10 @@ /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container/container[@controlname='panel1']/container/table - - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button']/button[@controlname='CalculateForSelectedButton'] - - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button'] - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container/container[@controlname='panel1'] - - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container/container[@controlname='panel2'] - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname<'CalculationsView']/container Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.cs =================================================================== diff -u -r74e6e57dce9fadd00e011bfdd5a08e2c34661ca0 -r491b3e4ecca17495df5dbfad65192499ff58de7f --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.cs (.../ClickOnRunSelectedHBCCalculations.cs) (revision 74e6e57dce9fadd00e011bfdd5a08e2c34661ca0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.cs (.../ClickOnRunSelectedHBCCalculations.cs) (revision 491b3e4ecca17495df5dbfad65192499ff58de7f) @@ -79,8 +79,8 @@ Init(); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.DocumentViewContainer.DesignWaterLevelCalculationsViewCached.LeftSide.CalculationButtons.CalculateSelectedButton' at Center.", repo.RiskeerMainWindow.DocumentViewContainer.DesignWaterLevelCalculationsViewCached.LeftSide.CalculationButtons.CalculateSelectedButtonInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.DocumentViewContainer.DesignWaterLevelCalculationsViewCached.LeftSide.CalculationButtons.CalculateSelectedButton.Click(); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.DocumentViewContainerUncached.DesignWaterLevelCalculationsView.LeftSide.CalculationButtons.CalculateSelectedButton' at Center.", repo.RiskeerMainWindow.DocumentViewContainerUncached.DesignWaterLevelCalculationsView.LeftSide.CalculationButtons.CalculateSelectedButtonInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.DocumentViewContainerUncached.DesignWaterLevelCalculationsView.LeftSide.CalculationButtons.CalculateSelectedButton.Click(); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.rxrec =================================================================== diff -u -r74e6e57dce9fadd00e011bfdd5a08e2c34661ca0 -r491b3e4ecca17495df5dbfad65192499ff58de7f --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.rxrec (.../ClickOnRunSelectedHBCCalculations.rxrec) (revision 74e6e57dce9fadd00e011bfdd5a08e2c34661ca0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ClickOnRunSelectedHBCCalculations.rxrec (.../ClickOnRunSelectedHBCCalculations.rxrec) (revision 491b3e4ecca17495df5dbfad65192499ff58de7f) @@ -42,10 +42,10 @@ - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='DesignWaterLevelCalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button']/button[@controlname='CalculateForSelectedButton'] + /form[@automationid='RiskeerMainWindow']/?/container/container[@instance='1']/container[@controlname='DesignWaterLevelCalculationsView']/container/container[@controlname='panel1']/container[@controlname>'Button']/button[@controlname='CalculateForSelectedButton'] @@ -65,7 +65,7 @@ - ClickOnRunSelectedCalculations.UserCode.cs + ClickOnRunSelectedHBCCalculations.UserCode.cs Index: System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst =================================================================== diff -u -r9a229e8ae6d3daf0727428267d7894cf7ddae821 -r491b3e4ecca17495df5dbfad65192499ff58de7f --- System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst (.../WorkOnProgressDavid.rxtst) (revision 9a229e8ae6d3daf0727428267d7894cf7ddae821) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst (.../WorkOnProgressDavid.rxtst) (revision 491b3e4ecca17495df5dbfad65192499ff58de7f) @@ -215,6 +215,31 @@ id="1193949a-2644-475b-9163-57c3f3e21acc" name="ReadDataCategoryBoundariesTraject"> + + + + + + + + + + + + + + + + + + + + + + + + + name="SelectSectionWithGeneratedCaculations"> + + + + + + + + + @@ -1087,6 +1149,20 @@ + + + + + + + + + + + + + + + + value="ConfigurationCalculationsLoopSections"> @@ -1605,7 +1698,7 @@ + value="LoopCalculationsForEachSection"> + + + + + + + name="LoopCalculationsForEachSection"> + + + + + + + name="ConfigurationCalculationsLoopSections"> + + + + + + + + @@ -3337,10 +3466,10 @@ + name="ConfigurationCalculationsLoopSections"> + name="SelectSectionWithGeneratedCaculations"> @@ -3355,29 +3484,37 @@ + name="LoopCalculationsForEachSection"> - - + + + + + + @@ -3560,24 +3697,13 @@ - 36-2_3 - - - 3 - - - 18 - - - - 36-2_23 23 - 19 + 18 @@ -3655,7 +3781,7 @@ listIndecesHBCLocationsToCalculate - rangeConfigurationCalculationsLoopItems + rangeConfigurationCalculationsLoopSections listIndecesItemsToGenerateCalculations @@ -3732,7 +3858,7 @@ listIndecesHBCLocationsToCalculate - rangeConfigurationCalculationsLoopItems + rangeConfigurationCalculationsLoopSections listIndecesItemsToGenerateCalculations @@ -3996,11 +4122,13 @@ X:\script17\HTKW\HTkw_traject_36-2.shp + [Berekeningen->['Keersluis Cuijk'->[Opmerkingen][Invoer][Resultaat]]['Gemaal van Sasse'->[Opmerkingen][Invoer][Resultaat]][Nieuwe berekening->[Opmerkingen][Invoer][Resultaat]]] 16,112 + 8-9 0,1 @@ -4010,7 +4138,7 @@ @@ -4276,39 +4404,31 @@ 0 + 20-21 + 10 - 'Keersluis Cuijk' - - - 0 - - - - - - - - 'Gemaal van Sasse' 0 + 22-23 + 11 @@ -4608,11 +4728,67 @@ STBI + + + Voorland en (haven)dam>Voorlandprofiel + + + profiel3 + + + DropDown + + + HTKW + + + + + Uitvoer>Illustratiepunten inlezen + + + True + + + Text + + + HTKW + + + + + Voorland en (haven)dam>Voorlandprofiel + + + profiel4 + + + DropDown + + + HTKW + + + + + Uitvoer>Illustratiepunten inlezen + + + True + + + Text + + + HTKW + + @@ -4739,6 +4915,28 @@ STBI + + + Hydraulische belastingenlocatie + + + MA_1_36-2_dk_00212 (59 m) + + + HTKW + + + + + Hydraulische belastingenlocatie + + + MA_1_36-2_dk_00308 (74 m) + + + HTKW + + + +