Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -1026,7 +1026,13 @@ public partial class TrajectNodeFolder : RepoGenBaseFolder { AutomatedSystemTestsRepositoryFolders.TrajectWithSubstringInNameFolder _trajectwithsubstringinname; + AutomatedSystemTestsRepositoryFolders.GenericFMItemWithSubstringInNameFolder _genericfmitemwithsubstringinname; + AutomatedSystemTestsRepositoryFolders.GenericItemInTrajectWithSubstringInNameFolder _genericitemintrajectwithsubstringinname; RepoItemInfo _achtergrondkaartInfo; + RepoItemInfo _normenInfo; + RepoItemInfo _faalkansbegrotingInfo; + RepoItemInfo _genericitemintrajectInfo; + RepoItemInfo _copy_of_genericitemintrajectInfo; /// /// Creates a new TrajectNode folder. @@ -1035,7 +1041,13 @@ base("TrajectNode", "treeitem[1]", parentFolder, 30000, null, false, "b466899e-e209-4d83-a46c-0533f333cea5", "") { _trajectwithsubstringinname = new AutomatedSystemTestsRepositoryFolders.TrajectWithSubstringInNameFolder(this); - _achtergrondkaartInfo = new RepoItemInfo(this, "Achtergrondkaart", "?/?/treeitem[@accessiblename='Achtergrondkaart']", 30000, null, "6131d385-9dd7-4e3e-b606-103f620b1765"); + _genericfmitemwithsubstringinname = new AutomatedSystemTestsRepositoryFolders.GenericFMItemWithSubstringInNameFolder(this); + _genericitemintrajectwithsubstringinname = new AutomatedSystemTestsRepositoryFolders.GenericItemInTrajectWithSubstringInNameFolder(this); + _achtergrondkaartInfo = new RepoItemInfo(this, "Achtergrondkaart", "treeitem[@accessiblename='Achtergrondkaart']", 30000, null, "6131d385-9dd7-4e3e-b606-103f620b1765"); + _normenInfo = new RepoItemInfo(this, "Normen", "treeitem[@accessiblename='Normen']", 30000, null, "b5de4289-6f05-447d-a40a-c6f33536af15"); + _faalkansbegrotingInfo = new RepoItemInfo(this, "Faalkansbegroting", "treeitem[@accessiblename='Faalkansbegroting']", 30000, null, "79c86dc7-8eee-48b2-b0af-b29632b7c092"); + _genericitemintrajectInfo = new RepoItemInfo(this, "GenericItemInTraject", "treeitem[@accessiblename=$substringNameItemInTraject]", 30000, null, "c6e3307d-ef2f-4a61-bf7b-443c02d22136"); + _copy_of_genericitemintrajectInfo = new RepoItemInfo(this, "Copy_of_GenericItemInTraject", "treeitem[@accessiblename=$substringNameItemInTraject]", 30000, null, "dfd880dc-8e6a-4cff-9056-0c9f313b3d6d"); } /// @@ -1087,67 +1099,6 @@ } /// - /// The TrajectWithSubstringInName folder. - /// - [RepositoryFolder("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] - public virtual AutomatedSystemTestsRepositoryFolders.TrajectWithSubstringInNameFolder TrajectWithSubstringInName - { - get { return _trajectwithsubstringinname; } - } - } - - /// - /// The TrajectWithSubstringInNameFolder folder. - /// - [RepositoryFolder("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] - public partial class TrajectWithSubstringInNameFolder : RepoGenBaseFolder - { - AutomatedSystemTestsRepositoryFolders.GenericFMItemWithSubstringInNameFolder _genericfmitemwithsubstringinname; - AutomatedSystemTestsRepositoryFolders.GenericItemInTrajectWithSubstringInNameFolder _genericitemintrajectwithsubstringinname; - RepoItemInfo _normenInfo; - RepoItemInfo _faalkansbegrotingInfo; - RepoItemInfo _genericitemintrajectInfo; - RepoItemInfo _copy_of_genericitemintrajectInfo; - - /// - /// Creates a new TrajectWithSubstringInName folder. - /// - public TrajectWithSubstringInNameFolder(RepoGenBaseFolder parentFolder) : - base("TrajectWithSubstringInName", "treeitem[@accessiblename~$substringTrajectName]", parentFolder, 30000, null, false, "3bb01c51-3d9c-4c3f-adc4-408396425ed8", "") - { - _genericfmitemwithsubstringinname = new AutomatedSystemTestsRepositoryFolders.GenericFMItemWithSubstringInNameFolder(this); - _genericitemintrajectwithsubstringinname = new AutomatedSystemTestsRepositoryFolders.GenericItemInTrajectWithSubstringInNameFolder(this); - _normenInfo = new RepoItemInfo(this, "Normen", "treeitem[@accessiblename='Normen']", 30000, null, "b5de4289-6f05-447d-a40a-c6f33536af15"); - _faalkansbegrotingInfo = new RepoItemInfo(this, "Faalkansbegroting", "treeitem[@accessiblename='Faalkansbegroting']", 30000, null, "79c86dc7-8eee-48b2-b0af-b29632b7c092"); - _genericitemintrajectInfo = new RepoItemInfo(this, "GenericItemInTraject", "treeitem[@accessiblename=$substringNameItemInTraject]", 30000, null, "c6e3307d-ef2f-4a61-bf7b-443c02d22136"); - _copy_of_genericitemintrajectInfo = new RepoItemInfo(this, "Copy_of_GenericItemInTraject", "treeitem[@accessiblename=$substringNameItemInTraject]", 30000, null, "dfd880dc-8e6a-4cff-9056-0c9f313b3d6d"); - } - - /// - /// The Self item. - /// - [RepositoryItem("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] - public virtual Ranorex.TreeItem Self - { - get - { - return _selfInfo.CreateAdapter(true); - } - } - - /// - /// The Self item info. - /// - [RepositoryItemInfo("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] - public virtual RepoItemInfo SelfInfo - { - get - { - return _selfInfo; - } - } - - /// /// The Normen item. /// [RepositoryItem("b5de4289-6f05-447d-a40a-c6f33536af15")] @@ -1244,6 +1195,15 @@ } /// + /// The TrajectWithSubstringInName folder. + /// + [RepositoryFolder("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] + public virtual AutomatedSystemTestsRepositoryFolders.TrajectWithSubstringInNameFolder TrajectWithSubstringInName + { + get { return _trajectwithsubstringinname; } + } + + /// /// The GenericFMItemWithSubstringInName folder. /// [RepositoryFolder("92f53398-7bb2-45f8-a305-0adb56ec8aa7")] @@ -1263,6 +1223,46 @@ } /// + /// The TrajectWithSubstringInNameFolder folder. + /// + [RepositoryFolder("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] + public partial class TrajectWithSubstringInNameFolder : RepoGenBaseFolder + { + + /// + /// Creates a new TrajectWithSubstringInName folder. + /// + public TrajectWithSubstringInNameFolder(RepoGenBaseFolder parentFolder) : + base("TrajectWithSubstringInName", "treeitem[@accessiblename~$substringTrajectName]", parentFolder, 30000, null, false, "3bb01c51-3d9c-4c3f-adc4-408396425ed8", "") + { + } + + /// + /// The Self item. + /// + [RepositoryItem("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] + public virtual Ranorex.TreeItem Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + } + + /// /// The GenericFMItemWithSubstringInNameFolder folder. /// [RepositoryFolder("92f53398-7bb2-45f8-a305-0adb56ec8aa7")] Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rximg =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 Binary files differ Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -45,177 +45,177 @@ refimgid="6748b979-d963-4540-b8a3-bfc97c2b6b3c" searchtimeout="30000ms" usecache="False"> - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename='Normen'] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename='Faalkansbegroting'] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename=$substringNameItemInTraject] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename=$substringNameItemInTraject] - + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName] + + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename='Achtergrondkaart'] + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename='Normen'] + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename='Faalkansbegroting'] + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename=$substringNameItemInTraject] + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename=$substringNameItemInTraject] + + - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Profielschematisaties']/treeitem[$index] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Profielschematisaties'] - - - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Stochastische ondergrondmodellen']/treeitem[@accessiblename=$subsurfaceStochasticModelName]/treeitem[@accessiblename=$subsurfaceSchematizationName] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Stochastische ondergrondmodellen'] - - + id="bd9f4f52-e7e2-4811-828d-534fed0d25e2" + name="surfaceLine" + refimgid="b3ff837b-13bb-4efd-9616-abc33dcc810f" + searchtimeout="30000ms"> + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Profielschematisaties']/treeitem[$index] + - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer'] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Profielschematisaties'] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Berekeningen']/treeitem/treeitem[@accessiblename=$singleCalculationName]/treeitem[@accessiblename='Invoer'] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Stochastische ondergrondmodellen']/treeitem[@accessiblename=$subsurfaceStochasticModelName]/treeitem[@accessiblename=$subsurfaceSchematizationName] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Berekeningen'] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer']/treeitem[@accessiblename='Stochastische ondergrondmodellen'] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringFMName] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Invoer'] + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Berekeningen']/treeitem/treeitem[@accessiblename=$singleCalculationName]/treeitem[@accessiblename='Invoer'] + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName]/treeitem[@accessiblename='Berekeningen'] + + + + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringFMName] + + + + - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringItemName]/treeitem[@accessiblename~$substringSubItemName]/treeitem[@accessiblename~$substringSubSubItemName] - - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringItemName]/treeitem[@accessiblename~$substringSubItemName] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringItemName]/treeitem[@accessiblename~$substringSubItemName]/treeitem[@accessiblename~$substringSubSubItemName] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename~$substringItemName] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringItemName]/treeitem[@accessiblename~$substringSubItemName] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName] + /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringItemName] - - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/?/?/treeitem[@accessiblename='Achtergrondkaart'] - /form[@automationid='RiskeerMainWindow']/*/*/container/container[@instance='0']/container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1] Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsContextMenu/ExpandAllSubNodesCalculations.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsContextMenu/ExpandAllSubNodesCalculations.cs (.../ExpandAllSubNodesCalculations.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsContextMenu/ExpandAllSubNodesCalculations.cs (.../ExpandAllSubNodesCalculations.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -99,11 +89,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.SelfInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.SelfInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.Self.Focus(); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.SelfInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.Self.Click(System.Windows.Forms.MouseButtons.Right); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.SelfInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.Self.Click(System.Windows.Forms.MouseButtons.Right); Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'ContextMenu.AllesUitklappen' at Center.", repo.ContextMenu.AllesUitklappenInfo, new RecordItemIndex(2)); repo.ContextMenu.AllesUitklappen.Click(); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs (.../CalculateValueParameterN.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateValueParameterN.cs (.../CalculateValueParameterN.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -79,16 +79,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -134,11 +124,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); CalculateValueNFromFMParameters(); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.UserCode.cs =================================================================== diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.UserCode.cs (.../GetValueParameterForItemInTraject.UserCode.cs) (revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.UserCode.cs (.../GetValueParameterForItemInTraject.UserCode.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -35,7 +35,7 @@ public void Report_Log() { - Report.Log(ReportLevel.Info, "", "For traject: " + substringTrajectName + ", item: " + substringNameItemInTraject + ", parameter: " + nameOfParameterInPropertiesPanel + ", value read = " + valueOfParameterInPropertiesPanel); + Report.Log(ReportLevel.Info, "", "For item: " + substringNameItemInTraject + ", parameter: " + nameOfParameterInPropertiesPanel + ", value read = " + valueOfParameterInPropertiesPanel); } } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.cs (.../GetValueParameterForItemInTraject.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/GetValueParameterForItemInTraject.cs (.../GetValueParameterForItemInTraject.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -122,11 +112,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); Report.Log(ReportLevel.Info, "Get Value", "Getting attribute 'AccessibleValue' from item 'RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.GenericParameterVisibleInPropertiesPanel' and assigning its value to variable 'valueOfParameterInPropertiesPanel'.", repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.GenericParameterVisibleInPropertiesPanelInfo, new RecordItemIndex(2)); valueOfParameterInPropertiesPanel = repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.GenericParameterVisibleInPropertiesPanel.Element.GetAttributeValueText("AccessibleValue"); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenChartCalculation.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenChartCalculation.cs (.../OpenChartCalculation.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenChartCalculation.cs (.../OpenChartCalculation.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -68,16 +68,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -123,8 +113,8 @@ Init(); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculation' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculationInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculation.Click(System.Windows.Forms.MouseButtons.Right); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculation' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculationInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Calculations.InputSingleCalculation.Click(System.Windows.Forms.MouseButtons.Right); Delay.Milliseconds(0); Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'ContextMenu.Openen' at Center.", repo.ContextMenu.OpenenInfo, new RecordItemIndex(1)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenResultView.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenResultView.cs (.../OpenResultView.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenResultView.cs (.../OpenResultView.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -99,13 +89,13 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Focus(); - ExpandNode(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo); + ExpandNode(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo); try { - OpenResultViewIfFMIsRelevant(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, "Oordeel"); + OpenResultViewIfFMIsRelevant(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, "Oordeel"); } catch(Exception ex) { Report.Log(ReportLevel.Warn, "Module", "(Optional Action) " + ex.Message, new RecordItemIndex(2)); } Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.DocumentViewContainer.Self, false, new RecordItemIndex(3)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenTrajectNormenView.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenTrajectNormenView.cs (.../OpenTrajectNormenView.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenTrajectNormenView.cs (.../OpenTrajectNormenView.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -53,16 +53,6 @@ #region Variables - /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - #endregion /// @@ -89,12 +79,12 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Normen'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.NormenInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Normen.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Normen'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.NormenInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Normen.Focus(); Delay.Milliseconds(0); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Left DoubleClick item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Normen' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.NormenInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Normen.DoubleClick(); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Left DoubleClick item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Normen' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.NormenInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Normen.DoubleClick(); Delay.Milliseconds(0); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForCategoryBoundaries.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForCategoryBoundaries.cs (.../OpenViewForCategoryBoundaries.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForCategoryBoundaries.cs (.../OpenViewForCategoryBoundaries.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -99,13 +89,13 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Focus(); - ExpandNode(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo); + ExpandNode(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo); try { - OpenCategoryBoundariesView(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, "Oordeel"); + OpenCategoryBoundariesView(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, "Oordeel"); } catch(Exception ex) { Report.Log(ReportLevel.Warn, "Module", "(Optional Action) " + ex.Message, new RecordItemIndex(2)); } Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.DocumentViewContainer.Self, false, new RecordItemIndex(3)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForFailureMechanismContribution.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForFailureMechanismContribution.cs (.../OpenViewForFailureMechanismContribution.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForFailureMechanismContribution.cs (.../OpenViewForFailureMechanismContribution.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -53,16 +53,6 @@ #region Variables - /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - #endregion /// @@ -89,14 +79,14 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.FaalkansbegrotingInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.FaalkansbegrotingInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.FaalkansbegrotingInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.FaalkansbegrotingInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting.Select(); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Left DoubleClick item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.FaalkansbegrotingInfo, new RecordItemIndex(2)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting.DoubleClick(); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Left DoubleClick item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.FaalkansbegrotingInfo, new RecordItemIndex(2)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting.DoubleClick(); // Screenshot of FailureMechanismContributionView Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.DocumentViewContainer.Self, false, new RecordItemIndex(3)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForGenericFM.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForGenericFM.cs (.../OpenViewForGenericFM.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/OpenViews/OpenViewForGenericFM.cs (.../OpenViewForGenericFM.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -112,17 +102,17 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Select(); Report.Log(ReportLevel.Info, "Delay", "Waiting for 300ms.", new RecordItemIndex(2)); Delay.Duration(300, false); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(3)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Click(System.Windows.Forms.MouseButtons.Right); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(3)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Click(System.Windows.Forms.MouseButtons.Right); Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'ContextMenu.Openen' at Center.", repo.ContextMenu.OpenenInfo, new RecordItemIndex(4)); repo.ContextMenu.Openen.Click(); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectTrajectType.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectTrajectType.cs (.../SelectTrajectType.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Selection/SelectTrajectType.cs (.../SelectTrajectType.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable trajectType. /// [TestVariable("7e8f3140-795e-40f1-a611-9c126ff7de4f")] @@ -99,8 +89,8 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.FaalkansbegrotingInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.Faalkansbegroting.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.FaalkansbegrotingInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Faalkansbegroting.Select(); Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.Trajecttype' at CenterLeft.", repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.TrajecttypeInfo, new RecordItemIndex(1)); repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.Trajecttype.Click(Location.CenterLeft); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.cs (.../SetRelevanceFMInProjectExplorer.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.cs (.../SetRelevanceFMInProjectExplorer.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -69,16 +69,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("51976da0-b6de-418b-bda5-bc27195d3616")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("1f7734c3-2c4d-4c2c-b8f8-d8bbbf0017be")] @@ -88,6 +78,16 @@ set { repo.substringFMName = value; } } + /// + /// Gets or sets the value of variable substringTrajectName. + /// + [TestVariable("51976da0-b6de-418b-bda5-bc27195d3616")] + public string substringTrajectName + { + get { return repo.substringTrajectName; } + set { repo.substringTrajectName = value; } + } + #endregion /// @@ -118,7 +118,7 @@ Report.Log(ReportLevel.Info, "User", substringFMName, new RecordItemIndex(1)); - SetRelevanceFM(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, fmShouldBeRelevant); + SetRelevanceFM(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, fmShouldBeRelevant); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterForItemInTraject.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterForItemInTraject.cs (.../SetValueParameterForItemInTraject.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueParameterForItemInTraject.cs (.../SetValueParameterForItemInTraject.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -122,11 +112,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); Report.Log(ReportLevel.Info, "User", valueToSetParameterForItemInTraject, new RecordItemIndex(2)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueWithKeyPressParameterForItemInTraject.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueWithKeyPressParameterForItemInTraject.cs (.../SetValueWithKeyPressParameterForItemInTraject.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetValueWithKeyPressParameterForItemInTraject.cs (.../SetValueWithKeyPressParameterForItemInTraject.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -122,12 +112,12 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); Delay.Milliseconds(0); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); Delay.Milliseconds(0); Report.Log(ReportLevel.Info, "User", valueToSetParameterForItemInTraject, new RecordItemIndex(2)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateContributionOfFMInProjectExplorer.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateContributionOfFMInProjectExplorer.cs (.../ValidateContributionOfFMInProjectExplorer.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateContributionOfFMInProjectExplorer.cs (.../ValidateContributionOfFMInProjectExplorer.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -112,11 +102,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Select(); Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (AccessibleValue=$expectedContributionPE) on item 'RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.FaalkansbijdragePercent'.", repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.FaalkansbijdragePercentInfo, new RecordItemIndex(2)); Validate.AttributeEqual(repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.FaalkansbijdragePercentInfo, "AccessibleValue", expectedContributionPE); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateNode.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateNode.cs (.../ValidateNode.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateNode.cs (.../ValidateNode.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -103,10 +93,10 @@ repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.Self.Select(); // Validates that Item with Name containing $TextInItemName exists - Report.Log(ReportLevel.Info, "Validation", "Validates that Item with Name containing $TextInItemName exists\r\nValidating Exists on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); - Validate.Exists(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo); + Report.Log(ReportLevel.Info, "Validation", "Validates that Item with Name containing $TextInItemName exists\r\nValidating Exists on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); + Validate.Exists(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo); - Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self, false, new RecordItemIndex(2)); + Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self, false, new RecordItemIndex(2)); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateRelevanceFMInProjectExplorer.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateRelevanceFMInProjectExplorer.cs (.../ValidateRelevanceFMInProjectExplorer.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateRelevanceFMInProjectExplorer.cs (.../ValidateRelevanceFMInProjectExplorer.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -114,28 +104,28 @@ Report.Log(ReportLevel.Info, "User", "Validating number of subnodes", new RecordItemIndex(0)); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Focus(); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(2)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Click(); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(2)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Click(); Report.Log(ReportLevel.Info, "Keyboard", "Key sequence '{Right}'.", new RecordItemIndex(3)); Keyboard.Press("{Right}"); Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.ProjectExplorerPanel.Self, false, new RecordItemIndex(4)); try { - ValidateNumberOfNodesInFM(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, fmExpectedRelevance); + ValidateNumberOfNodesInFM(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, fmExpectedRelevance); } catch(Exception ex) { Report.Log(ReportLevel.Warn, "Module", "(Optional Action) " + ex.Message, new RecordItemIndex(5)); } Report.Log(ReportLevel.Info, "Keyboard", "Key sequence '{Left}'.", new RecordItemIndex(6)); Keyboard.Press("{Left}"); Report.Log(ReportLevel.Info, "User", "Validating context menu", new RecordItemIndex(7)); - Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(8)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.Self.Click(System.Windows.Forms.MouseButtons.Right); + Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName' at Center.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.SelfInfo, new RecordItemIndex(8)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.Self.Click(System.Windows.Forms.MouseButtons.Right); Report.Screenshot(ReportLevel.Info, "User", "", repo.ContextMenu.Self, false, new RecordItemIndex(9)); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateSurfaceLineInProjectExplorer.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateSurfaceLineInProjectExplorer.cs (.../ValidateSurfaceLineInProjectExplorer.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ProjectExplorer/ValidateSurfaceLineInProjectExplorer.cs (.../ValidateSurfaceLineInProjectExplorer.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringFMName. /// [TestVariable("3a7276c1-fca1-4026-9d2e-5bac10651a47")] @@ -122,10 +112,10 @@ Init(); - Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (Text=$expectedSurfaceLineName) on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLine'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLineInfo, new RecordItemIndex(0)); - Validate.AttributeEqual(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLineInfo, "Text", expectedSurfaceLineName); + Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (Text=$expectedSurfaceLineName) on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLine'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLineInfo, new RecordItemIndex(0)); + Validate.AttributeEqual(repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLineInfo, "Text", expectedSurfaceLineName); - Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLine, false, new RecordItemIndex(1)); + Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericFMItemWithSubstringInName.InputFM.SurfaceLinesCollectionNode.surfaceLine, false, new RecordItemIndex(1)); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateParameterDoesNotExistForItemInTraject.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateParameterDoesNotExistForItemInTraject.cs (.../ValidateParameterDoesNotExistForItemInTraject.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateParameterDoesNotExistForItemInTraject.cs (.../ValidateParameterDoesNotExistForItemInTraject.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -54,16 +54,6 @@ #region Variables /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -109,12 +99,12 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); Delay.Milliseconds(0); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); Delay.Milliseconds(0); Validate_GenericParameterVisibleInProjectExplorer(repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.GenericParameterVisibleInPropertiesPanelInfo); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateValueParameterForItemInTraject.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateValueParameterForItemInTraject.cs (.../ValidateValueParameterForItemInTraject.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateValueParameterForItemInTraject.cs (.../ValidateValueParameterForItemInTraject.cs) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -67,16 +67,6 @@ } /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return repo.substringTrajectName; } - set { repo.substringTrajectName = value; } - } - - /// /// Gets or sets the value of variable substringNameItemInTraject. /// [TestVariable("cb52c14e-9bef-4f4a-9d11-1758141c50cb")] @@ -122,11 +112,11 @@ Init(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(0)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Focus(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Focus() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(0)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Focus(); - Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTrajectInfo, new RecordItemIndex(1)); - repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.TrajectWithSubstringInName.GenericItemInTraject.Select(); + Report.Log(ReportLevel.Info, "Invoke action", "Invoking Select() on item 'RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject'.", repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTrajectInfo, new RecordItemIndex(1)); + repo.RiskeerMainWindow.ProjectExplorerPanel.TrajectNode.GenericItemInTraject.Select(); Validate_GenericParameterVisibleInProjectExplorer(repo.RiskeerMainWindow.ContainerMultipleViews.PropertiesPanelContainer.Table.GenericParameterVisibleInPropertiesPanelInfo); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r61ec0cd3860aca67bfb04ac464dae394fcce8fa7 --- System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision 61ec0cd3860aca67bfb04ac464dae394fcce8fa7) @@ -607,12 +607,6 @@ type="Recording"> - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + + + - + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - + - + - - + + + + - - + + + + - - + + + + - - - - + + + + - - + + + + - - + + + + - - + + + + - - - - - - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -272,12 +244,6 @@ type="Recording"> - - + + + + + + + + + + + + + + @@ -389,6 +385,12 @@ name="ValidateCategoryBoundaries"> + + + id="527a42ff-6fde-4f62-9fc6-95bb1500ccb0" + name="NewProjectUsingKeyboard"> + id="9ec04dce-fe54-4a06-96e4-3b651d02d543" + name="CloseViewCentralPanelWithFocus"> + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + + + - + - - - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - - - + + + + - + - + - - + + + + - - + + + + - - - - + + + + - + - + - - + + + + - - + + + + - - - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - + - + - - + + + + - - + + + + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + +