Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538) @@ -734,10 +734,9 @@ AutomatedSystemTestsRepositoryFolders.RibbonFolder _ribbon; AutomatedSystemTestsRepositoryFolders.ContainerMultipleViewsFolder _containermultipleviews; AutomatedSystemTestsRepositoryFolders.DocumentViewContainerFolder _documentviewcontainer; + AutomatedSystemTestsRepositoryFolders.GenericContainerMapViewTitleFolder _genericcontainermapviewtitle; AutomatedSystemTestsRepositoryFolders.BackstageButtonsFolder _backstagebuttons; AutomatedSystemTestsRepositoryFolders.RibbonButtonsFolder _ribbonbuttons; - RepoItemInfo _genericcontainermapInfo; - RepoItemInfo _closebuttongenericcontainermapInfo; RepoItemInfo _textlabelpanelonleftInfo; /// @@ -750,10 +749,9 @@ _ribbon = new AutomatedSystemTestsRepositoryFolders.RibbonFolder(this); _containermultipleviews = new AutomatedSystemTestsRepositoryFolders.ContainerMultipleViewsFolder(this); _documentviewcontainer = new AutomatedSystemTestsRepositoryFolders.DocumentViewContainerFolder(this); + _genericcontainermapviewtitle = new AutomatedSystemTestsRepositoryFolders.GenericContainerMapViewTitleFolder(this); _backstagebuttons = new AutomatedSystemTestsRepositoryFolders.BackstageButtonsFolder(this); _ribbonbuttons = new AutomatedSystemTestsRepositoryFolders.RibbonButtonsFolder(this); - _genericcontainermapInfo = new RepoItemInfo(this, "GenericContainerMap", "*/container/container/tabpagelist[$indexContainerMap]", 30000, null, "c3fa3e58-ebae-43e2-88e2-41bd6c9116ad"); - _closebuttongenericcontainermapInfo = new RepoItemInfo(this, "CloseButtonGenericContainerMap", "*/container/container/tabpagelist[$indexContainerMap]//button[@name='DocumentCloseButton']", 30000, null, "ce11034c-12e0-4686-8388-75ac745d1755"); _textlabelpanelonleftInfo = new RepoItemInfo(this, "TextLabelPanelOnLeft", "container/container/tabpagelist/container[@automationid='HeaderPanel']/tabpage/text[@text=$nameOfPanel]", 30000, null, "e1c99c99-37e6-45b7-8ef7-3177828972c0"); } @@ -782,54 +780,6 @@ } /// - /// The GenericContainerMap item. - /// - [RepositoryItem("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] - public virtual Ranorex.TabPageList GenericContainerMap - { - get - { - return _genericcontainermapInfo.CreateAdapter(true); - } - } - - /// - /// The GenericContainerMap item info. - /// - [RepositoryItemInfo("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] - public virtual RepoItemInfo GenericContainerMapInfo - { - get - { - return _genericcontainermapInfo; - } - } - - /// - /// The CloseButtonGenericContainerMap item. - /// - [RepositoryItem("ce11034c-12e0-4686-8388-75ac745d1755")] - public virtual Ranorex.Button CloseButtonGenericContainerMap - { - get - { - return _closebuttongenericcontainermapInfo.CreateAdapter(true); - } - } - - /// - /// The CloseButtonGenericContainerMap item info. - /// - [RepositoryItemInfo("ce11034c-12e0-4686-8388-75ac745d1755")] - public virtual RepoItemInfo CloseButtonGenericContainerMapInfo - { - get - { - return _closebuttongenericcontainermapInfo; - } - } - - /// /// The TextLabelPanelOnLeft item. /// [RepositoryItem("e1c99c99-37e6-45b7-8ef7-3177828972c0")] @@ -890,6 +840,15 @@ } /// + /// The GenericContainerMapViewTitle folder. + /// + [RepositoryFolder("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] + public virtual AutomatedSystemTestsRepositoryFolders.GenericContainerMapViewTitleFolder GenericContainerMapViewTitle + { + get { return _genericcontainermapviewtitle; } + } + + /// /// The BackstageButtons folder. /// [RepositoryFolder("636ce012-0182-4643-b426-4c5d6e56ef16")] @@ -7778,6 +7737,72 @@ } /// + /// The GenericContainerMapViewTitleFolder folder. + /// + [RepositoryFolder("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] + public partial class GenericContainerMapViewTitleFolder : RepoGenBaseFolder + { + RepoItemInfo _closebuttongenericcontainermapInfo; + + /// + /// Creates a new GenericContainerMapViewTitle folder. + /// + public GenericContainerMapViewTitleFolder(RepoGenBaseFolder parentFolder) : + base("GenericContainerMapViewTitle", "container/container/container/container/tabpagelist[$indexContainerMap]", parentFolder, 30000, null, false, "c3fa3e58-ebae-43e2-88e2-41bd6c9116ad", "") + { + _closebuttongenericcontainermapInfo = new RepoItemInfo(this, "CloseButtonGenericContainerMap", "button/tabpage/button", 30000, null, "ce11034c-12e0-4686-8388-75ac745d1755"); + } + + /// + /// The Self item. + /// + [RepositoryItem("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] + public virtual Ranorex.TabPageList Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("c3fa3e58-ebae-43e2-88e2-41bd6c9116ad")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The CloseButtonGenericContainerMap item. + /// + [RepositoryItem("ce11034c-12e0-4686-8388-75ac745d1755")] + public virtual Ranorex.Button CloseButtonGenericContainerMap + { + get + { + return _closebuttongenericcontainermapInfo.CreateAdapter(true); + } + } + + /// + /// The CloseButtonGenericContainerMap item info. + /// + [RepositoryItemInfo("ce11034c-12e0-4686-8388-75ac745d1755")] + public virtual RepoItemInfo CloseButtonGenericContainerMapInfo + { + get + { + return _closebuttongenericcontainermapInfo; + } + } + } + + /// /// The BackstageButtonsFolder folder. /// [RepositoryFolder("636ce012-0182-4643-b426-4c5d6e56ef16")] Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rximg =================================================================== diff -u -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 Binary files differ Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538) @@ -1954,25 +1954,29 @@ /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter'] - - /form[@automationid='RiskeerMainWindow']/*/container/container/tabpagelist[$indexContainerMap] - + isrooted="True" + name="GenericContainerMapViewTitle" + refimgid="0fa5762c-d2bc-4921-9d71-fc6bb221469d" + searchtimeout="30000ms" + usecache="False"> + + /form[@automationid='RiskeerMainWindow']/container/container/container/container/tabpagelist[$indexContainerMap]/button/tabpage/button + + + /form[@automationid='RiskeerMainWindow']/container/container/container/container/tabpagelist[$indexContainerMap] + + - /form[@automationid='RiskeerMainWindow']/*/container/container/tabpagelist[$indexContainerMap]//button[@name='DocumentCloseButton'] - - - - - - - - - - Nieuwe verticale tabgroep - - - Nieuwe verticale tabgroep - - - Nieuwe verticale tabgroep - - - - - - - - - False - - - False - - - False - - - - - - - - - System.Windows.Controls.TextBlock - - - Ranorex.Plugin.Wpf.DepoGroup<System.Windows.Controls.TextBlock> - - - DepoGroup<TextBlock> - - - d0b7e39a-8a10-441a-a0a6-c83407d4f97f - - - AAEAAAD/////AQAAAAAAAAAHAQAAAAABAAAAAgAAAAMLU3lzdGVtLkd1aWQE/v///wtTeXN0ZW0u -R3VpZAsAAAACX2ECX2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwIC -AgICAgICFv/cv3h19k2WkV6Zw85U+wH9/////v///5rjt9AQihpEoKbINAfU+X8L - - - 2b5f4a28-7a1c-461d-a557-cee80a2258c7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /contextmenu[@processname='Riskeer']/?/?/text[@caption='Nieuwe verticale tabgroep'] - - - - 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 -lFMk/9k= - - - ').ToList(); - var children = rootNodeInfo.FindAdapter().Children; - // start up variable stepChild - var stepChild = children[0].As(); - var nameStepChild = NameOfTreeItem(stepChild); - for (int i=0; i < stepsPathItem.Count; i++) { - // Find the item corresponding to the step - var step = stepsPathItem[i]; - if (children.Count(ch => ch.ToString().Contains(step))==1) - { - Report.Log(ReportLevel.Info, "Information", "Only one occurrence of '" + step + "' found: choosing item containing the string in its name."); - stepChild = children.FirstOrDefault(ch => ch.ToString().Contains(step)).As(); - } else { - Report.Log(ReportLevel.Info, "Information", "Multiple occurrences of '" + step + "' found: choosing item with this exact name."); - stepChild = children.FirstOrDefault(ch => NameOfTreeItem(ch.As())==step).As(); - } - // - if (i != stepsPathItem.Count - 1) - { - // Update the children - children = stepChild.Children; - // Expand if intermediate node is collased - var stateIntermediateChild = stepChild.Element.GetAttributeValueText("AccessibleState"); - stepChild.Focus(); - if (stateIntermediateChild.Contains("Collapsed")) { - stepChild.Expand(); - } - } else { - // child is last one in path - stepChild.Focus(); - stepChild.Click(Location.CenterLeft); - } - } - return; + Mouse.DefaultMoveTime = 0; + Keyboard.DefaultKeyPressTime = 0; + Delay.SpeedFactor = 0.0; + + Action actions = (it=> (it as Adapter).Focus()); + actions += (it=>it.Click(Location.CenterLeft)); + + TreeItemHelpers.FindNodeInTree(pathItem, rootNodeInfo, actions); + return; } - - private string NameOfTreeItem(object treeItemInfo) - { - return treeItemInfo.ToString().Substring(10, treeItemInfo.ToString().Length-11); - } } } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectGenericItemInProjectExplorer.UserCode.cs =================================================================== diff -u -r012448ea4d8f8e97204b87b3d22a7999629fe632 -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectGenericItemInProjectExplorer.UserCode.cs (.../SelectGenericItemInProjectExplorer.UserCode.cs) (revision 012448ea4d8f8e97204b87b3d22a7999629fe632) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectGenericItemInProjectExplorer.UserCode.cs (.../SelectGenericItemInProjectExplorer.UserCode.cs) (revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538) @@ -36,21 +36,11 @@ } public void SelectTreeItemInProjectExplorerGivenPath(string pathItem, RepoItemInfo rootNodeInfo) - { - Mouse.DefaultMoveTime = 0; - Keyboard.DefaultKeyPressTime = 0; - Delay.SpeedFactor = 0.0; - + { Action actions = (it=> (it as Adapter).Focus()); actions += (it=>it.ClickWithoutBoundsCheck(new Location(-0.02, 0.5))); - TreeItemHelpers.FindNodeInTree(pathItem, rootNodeInfo, actions); return; - } - - private string NameOfTreeItem(object treeItemInfo) - { - return treeItemInfo.ToString().Substring(10, treeItemInfo.ToString().Length-11); - } + } } } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst =================================================================== diff -u -r5bb5e797754d75fcc3d8dce0338b9b27c3b4b41b -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst (.../Script29.rxtst) (revision 5bb5e797754d75fcc3d8dce0338b9b27c3b4b41b) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script29.rxtst (.../Script29.rxtst) (revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538) @@ -127,6 +127,28 @@ + + + + + + + + + + @@ -256,6 +278,12 @@ + + @@ -296,6 +324,12 @@ + + + + + + + + @@ -340,6 +384,10 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -401,6 +494,22 @@ name="extensionRiskeerProjects" value="*.risk"> + + + + + + + + + + + + + + @@ -552,12 +671,6 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + name="OpenViewForFP"> + + + + + + + + + + + + + + @@ -1396,8 +1733,8 @@ type="Recording"> @@ -1462,6 +1799,43 @@ name="ReportScreenShotOfApplication"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2164,6 +2656,28 @@ + + + + + + + + + + + + + + + + + + @@ -2429,6 +2959,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2800,6 +3422,14 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id="3789e403-9ec5-4959-8ef7-03c7af296b21" + name="SetStateFailurePathsAssembly"> + id="e9602b84-a632-4951-959e-0913e3e40972" + name="SelectState"> - - + + + + + + + + + + + + + + + + @@ -3578,143 +4280,143 @@ STPH - Traject>Dijken en dammen - Piping + Dijken en dammen - Piping GEKB - Traject>Dijken en dammen - Grasbekleding erosie kruin en binnentalud + Dijken en dammen - Grasbekleding erosie kruin en binnentalud STBI - Traject>Dijken en dammen - Macrostabiliteit binnenwaarts + Dijken en dammen - Macrostabiliteit binnenwaarts STBU - Traject>Dijken en dammen - Macrostabiliteit buitenwaarts + Dijken en dammen - Macrostabiliteit buitenwaarts STMI - Traject>Dijken en dammen - Microstabiliteit + Dijken en dammen - Microstabiliteit ZST - Traject>Dijken en dammen - Stabiliteit steenzetting + Dijken en dammen - Stabiliteit steenzetting AGK - Traject>Dijken en dammen - Golfklappen op asfaltbekleding + Dijken en dammen - Golfklappen op asfaltbekleding AWO - Traject>Dijken en dammen - Wateroverdruk bij asfaltbekleding + Dijken en dammen - Wateroverdruk bij asfaltbekleding GEBU - Traject>Dijken en dammen - Grasbekleding erosie buitentalud + Dijken en dammen - Grasbekleding erosie buitentalud GABU - Traject>Dijken en dammen - Grasbekleding afschuiven buitentalud + Dijken en dammen - Grasbekleding afschuiven buitentalud GABI - Traject>Dijken en dammen - Grasbekleding afschuiven binnentalud + Dijken en dammen - Grasbekleding afschuiven binnentalud HTKW - Traject>Kunstwerken - Hoogte kunstwerk + Kunstwerken - Hoogte kunstwerk BSKW - Traject>Kunstwerken - Betrouwbaarheid sluiting kunstwerk + Kunstwerken - Betrouwbaarheid sluiting kunstwerk PKW - Traject>Kunstwerken - Piping bij kunstwerk + Kunstwerken - Piping bij kunstwerk STKWp - Traject>Kunstwerken - Sterkte en stabiliteit puntconstructies + Kunstwerken - Sterkte en stabiliteit puntconstructies STKWl - Traject>Kunstwerken - Sterkte en stabiliteit langsconstructies + Kunstwerken - Sterkte en stabiliteit langsconstructies DA - Traject>Duinwaterkering - Duinafslag + Duinwaterkering - Duinafslag INN - Traject>Technische innovaties - Technische innovaties + Technische innovaties - Technische innovaties @@ -4162,7 +4864,7 @@ type="Ranorex.Core.Data.SimpleDataConnector"> - layerName + endPathMapLayer labelFMTraject @@ -4173,7 +4875,7 @@
- layerName + endPathMapLayer labelFMTraject @@ -4668,7 +5370,7 @@ type="Ranorex.Core.Data.SimpleDataConnector"> - labelFM + labelFP pathProjectRequired @@ -4677,18 +5379,15 @@ rangeLayersToValidate - pathToFMItemInProjectExplorer + fullNameFP - - pathToBackgroundItemInProjectExplorer - - - - - - - - - - - - - - - - - - - -
- labelFM + labelFP pathProjectRequired @@ -4697,11 +5396,8 @@ rangeLayersToValidate - pathToFMItemInProjectExplorer + fullNameFP - pathToBackgroundItemInProjectExplorer -
@@ -4714,11 +5410,8 @@ 3,4,6-16 - Traject 12-2>Dijken en dammen - Piping + Dijken en dammen - Piping - Traject 12-2>Achtergrondkaart -
@@ -4731,11 +5424,8 @@ 5-16 - Traject 41-1>Dijken en dammen - Macrostabiliteit binnenwaarts + Dijken en dammen - Macrostabiliteit binnenwaarts - Traject 41-1>Achtergrondkaart -
@@ -4748,11 +5438,8 @@ 17-28 - Traject 12-2 (1)>Dijken en dammen - Grasbekleding erosie kruin en binnentalud + Dijken en dammen - Grasbekleding erosie kruin en binnentalud - Traject 12-2 (1)>Achtergrondkaart -
@@ -4765,11 +5452,8 @@ 29-40 - Traject 34-1>Kunstwerken - Betrouwbaarheid sluiting kunstwerk + Kunstwerken - Betrouwbaarheid sluiting kunstwerk - Traject 34-1>Achtergrondkaart -
@@ -4782,11 +5466,8 @@ 29-40 - Traject 36-2>Kunstwerken - Hoogte kunstwerk + Kunstwerken - Hoogte kunstwerk - Traject 36-2>Achtergrondkaart -
@@ -4799,11 +5480,8 @@ 29-40 - Traject 44-2>Kunstwerken - Sterkte en stabiliteit puntconstructies + Kunstwerken - Sterkte en stabiliteit puntconstructies - Traject 44-2>Achtergrondkaart -
@@ -4816,11 +5494,8 @@ 41-51 - Traject 28-1 (ZST)>Dijken en dammen - Stabiliteit steenzetting + Dijken en dammen - Stabiliteit steenzetting - Traject 28-1 (ZST)>Achtergrondkaart -
@@ -4833,11 +5508,8 @@ 41-51 - Traject 8-3 (AGK)>Dijken en dammen - Golfklappen op asfaltbekleding + Dijken en dammen - Golfklappen op asfaltbekleding - Traject 8-3 (AGK)>Achtergrondkaart -
@@ -4850,11 +5522,8 @@ 41-51 - Traject 6-6 (GEBU)>Dijken en dammen - Grasbekleding erosie buitentalud + Dijken en dammen - Grasbekleding erosie buitentalud - Traject 6-6 (GEBU)>Achtergrondkaart -
@@ -4867,11 +5536,8 @@ 52-60 - Traject 14-9>Duinwaterkering - Duinafslag + Duinwaterkering - Duinafslag - Traject 14-9>Achtergrondkaart -
@@ -4884,11 +5550,8 @@ 52-60 - Traject 50-1>Dijken en dammen - Macrostabiliteit buitenwaarts + Dijken en dammen - Macrostabiliteit buitenwaarts - Traject 50-1>Achtergrondkaart -
@@ -4901,11 +5564,8 @@ 52-60 - Traject 50-1>Dijken en dammen - Microstabiliteit + Dijken en dammen - Microstabiliteit - Traject 50-1>Achtergrondkaart -
@@ -4918,11 +5578,8 @@ 52-54,56-60 - Traject 50-1>Dijken en dammen - Wateroverdruk bij asfaltbekleding + Dijken en dammen - Wateroverdruk bij asfaltbekleding - Traject 50-1>Achtergrondkaart -
@@ -4935,11 +5592,8 @@ 52-60 - Traject 50-1>Dijken en dammen - Grasbekleding afschuiven buitentalud + Dijken en dammen - Grasbekleding afschuiven buitentalud - Traject 50-1>Achtergrondkaart -
@@ -4952,11 +5606,8 @@ 52-60 - Traject 50-1>Dijken en dammen - Grasbekleding afschuiven binnentalud + Dijken en dammen - Grasbekleding afschuiven binnentalud - Traject 50-1>Achtergrondkaart -
@@ -4969,11 +5620,8 @@ 52-60 - Traject 50-1>Kunstwerken - Piping bij kunstwerk + Kunstwerken - Piping bij kunstwerk - Traject 50-1>Achtergrondkaart -
@@ -4986,11 +5634,8 @@ 52-54,56-60 - Traject 50-1>Kunstwerken - Sterkte en stabiliteit langsconstructies + Kunstwerken - Sterkte en stabiliteit langsconstructies - Traject 50-1>Achtergrondkaart -
@@ -5003,11 +5648,8 @@ 52-54,56-60 - Traject 50-1>Technische innovaties - Technische innovaties + Technische innovaties - Technische innovaties - Traject 50-1>Achtergrondkaart -
@@ -5081,7 +5723,7 @@ Polygons 		- gem_2011_gn1 + Trajectkaart>gem_2011_gn1 1-7 @@ -5092,7 +5734,7 @@ Lines - Referentielijn + Trajectkaart>Referentielijn 8-14 @@ -5103,7 +5745,7 @@ Points - Hydraulische belastingen + Trajectkaart>Hydraulische belastingen 15-23 @@ -5152,15 +5794,6 @@ - - - - - - + id="19ed3775-279e-4955-97b2-3dc0b5408c33"> + id="1ed4be99-bbb5-4edf-9e3b-319638778f38"> @@ -5182,9 +5815,6 @@ id="21114deb-06e3-49f6-85ff-11b20b73d8e5"> - - + id="36f21baa-1ec0-4e46-bf57-d6447505058c"> + id="3789e403-9ec5-4959-8ef7-03c7af296b21"> @@ -5209,12 +5839,6 @@ id="3d83574c-6f48-4cb7-9396-3f339e4f315e"> - - - - - - - - - - - - - - + id="70940fe9-2f5b-4e74-8265-7559f879dc0b"> + id="79abff31-455d-4c92-b0b6-b9df8bc99aa9"> - - - - - - - - - - - - - - - - + id="a567a181-7393-443c-9396-c15f458fad26"> + id="af08cb25-9520-4cc9-abee-83741f042d70"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/TreeItemHelpers.cs =================================================================== diff -u -rc60c0efb55b1a6dcfcc28a238cb16abff1d74785 -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 --- System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/TreeItemHelpers.cs (.../TreeItemHelpers.cs) (revision c60c0efb55b1a6dcfcc28a238cb16abff1d74785) +++ System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/TreeItemHelpers.cs (.../TreeItemHelpers.cs) (revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538) @@ -41,17 +41,22 @@ for (int i=0; i < stepsPathItem.Count; i++) { // Find the item corresponding to the step var step = stepsPathItem[i]; - var childrenWithStepInName = children.Where(ch => ch.ToString().Contains(step)); - int amountChildrenWithStepInName = childrenWithStepInName.Count(); - if (amountChildrenWithStepInName==1) - { - stepChild = childrenWithStepInName.FirstOrDefault().As(); - } else if (amountChildrenWithStepInName>1){ - Report.Info("Information", "Multiple occurrences of '" + step + "' found: choosing first item with this exact name."); - stepChild = childrenWithStepInName.FirstOrDefault(ch => NameOfTreeItem(ch.As())==step).As(); - } else { - throw new Ranorex.RanorexException("No occurrences of '" + step + "' found."); - } + if (step=="*" && children.Count==1) { + Report.Info("Information", "Using wildcard '*'. One single child found."); + stepChild = children.Single().As(); + } else { + var childrenWithStepInName = children.Where(ch => ch.ToString().Contains(step)); + int amountChildrenWithStepInName = childrenWithStepInName.Count(); + if (amountChildrenWithStepInName==1) + { + stepChild = childrenWithStepInName.FirstOrDefault().As(); + } else if (amountChildrenWithStepInName>1){ + Report.Info("Information", "Multiple occurrences of '" + step + "' found: choosing first item with this exact name."); + stepChild = childrenWithStepInName.FirstOrDefault(ch => NameOfTreeItem(ch.As())==step).As(); + } else { + throw new Ranorex.RanorexException("No occurrences of '" + step + "' found."); + } + } if (i != stepsPathItem.Count - 1) { // Update the children