Index: System tests/AutomatedSystemTests/AutomatedSystemTests.rxsln.pref =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests.rxsln.pref (.../AutomatedSystemTests.rxsln.pref) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests.rxsln.pref (.../AutomatedSystemTests.rxsln.pref) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -11,6 +11,6 @@ 60513a05-eab7-41e7-8c10-e51c735edc2e - + \ No newline at end of file Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -143,6 +143,18 @@ true 99e4a5ba-b748-433b-936c-1f44daec08ed + + 75c56bbc-55ab-4649-abbf-6157d7ab6a40 + CloseViewCentralPanelWithFocus.rxrec + true + 2ac12996-4383-45fb-b3e5-e238c19400cf + + + 75c56bbc-55ab-4649-abbf-6157d7ab6a40 + CloseViewCentralPanelWithFocus.rxrec + true + 25b9d3df-d029-427a-96c4-de8470c01737 + 5d1e103b-c666-4258-a32a-74d8fe397026 OpenProject.rxrec @@ -155,9 +167,45 @@ true b033024c-4757-4c74-87fa-f5c6b3daef0e + + 1cb570ed-7031-4292-a572-3c04e9fbc24a + OpenViewForFailureMechanismContribution.rxrec + true + 2e48adb4-f574-43e0-a102-a28e1362443a + + + 1cb570ed-7031-4292-a572-3c04e9fbc24a + OpenViewForFailureMechanismContribution.rxrec + true + 6405f2fa-2507-4ad6-aa04-2391e49e503b + fe704264-7ebd-4c5a-b96f-f5192c4d2944 + + b784c65f-eb14-47fb-8870-5baafbb7e6fe + SetRelevanceFMInFailureMechanismContributionView.rxrec + true + c5b5af27-aa34-4960-9173-c56b0b4681ad + + + b784c65f-eb14-47fb-8870-5baafbb7e6fe + SetRelevanceFMInFailureMechanismContributionView.rxrec + true + f660bbb8-b71e-4e9a-8c62-47a5aaa25be4 + + + a3cb26e3-a1be-4cb7-b372-a09785de9a9b + SetRelevanceFMInProjectExplorer.rxrec + true + f1b0a79a-82a4-4e37-a221-4bd28ed82a52 + + + a3cb26e3-a1be-4cb7-b372-a09785de9a9b + SetRelevanceFMInProjectExplorer.rxrec + true + 162de3c0-1993-49bf-9c31-01fef0b63137 + 8f7fe1fa-f1ef-4825-8e3a-6a13124b5fbc StartAUT.rxrec @@ -203,14 +251,31 @@ cb95bf1c-596d-4a04-b8ec-bb98b0333f75 07688822-3eb6-4d71-a97b-33498ae1d748 - - 49689626-d9fe-4bbf-ad9c-3d0ab683cfce + + 8b6648ca-2429-462f-8074-96184700bbed + 75c56bbc-55ab-4649-abbf-6157d7ab6a40 + 3c2d44f5-31b5-4584-91c8-1ad748affc77 8b6648ca-2429-462f-8074-96184700bbed 5d1e103b-c666-4258-a32a-74d8fe397026 3f746bb2-6845-45b4-9b28-b7fd605378f3 + + 8b6648ca-2429-462f-8074-96184700bbed + 1cb570ed-7031-4292-a572-3c04e9fbc24a + 5e81345e-66bc-4e08-8ade-03d386d824fd + + + 8b6648ca-2429-462f-8074-96184700bbed + b784c65f-eb14-47fb-8870-5baafbb7e6fe + 126d009c-618d-402d-8d3d-fa9ecc02bef7 + + + 8b6648ca-2429-462f-8074-96184700bbed + a3cb26e3-a1be-4cb7-b372-a09785de9a9b + 37154a5a-bed5-4655-91a2-0c5ebc672e77 + 8b6648ca-2429-462f-8074-96184700bbed 8f7fe1fa-f1ef-4825-8e3a-6a13124b5fbc @@ -236,9 +301,6 @@ 0876088b-059e-4c05-b2cd-fd3184c818bf - - 419bce8c-20e8-4863-970a-94ef1e44c8dc - Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.pref =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.pref (.../AutomatedSystemTests.csproj.pref) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.pref (.../AutomatedSystemTests.csproj.pref) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -5,7 +5,9 @@ + + Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.rxuser =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.rxuser (.../AutomatedSystemTests.csproj.rxuser) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj.rxuser (.../AutomatedSystemTests.csproj.rxuser) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -2,88 +2,88 @@ + lastcodegentimestamp="132454369261659527"> + lastcodegentimestamp="132454369261659527"> + lastcodegentimestamp="132454369261659527"> - - - - - - + filelength="11342" + lastcodegentimestamp="132454369261590115"> + filelength="26620" + lastcodegentimestamp="132454369261590115"> + lastcodegentimestamp="132454369261669427"> + lastcodegentimestamp="132454369261669427"> + lastcodegentimestamp="132454369261669427"> + lastcodegentimestamp="132454369261609891"> + filelength="5152" + lastcodegentimestamp="132454369261609891"> + lastcodegentimestamp="132454369261609891"> + + + + + + Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -6,7 +6,58 @@ id="0bbfd560-88d6-4516-bf12-c27a1fe6f4b9" name="ValidateFMsPresentInTrajects"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,25 +431,79 @@ D:\repos\Riskeer\System tests\AutomatedSystemTests\AutomatedSystemTests\Data\script21\input\CSVs\namesOfFMs.csv + + + + TextInTraject + + + Label + + + NameFM + + + IsRelevant + + + + + + D:\repos\Riskeer\System tests\AutomatedSystemTests\AutomatedSystemTests\Data\script21\input\CSVs\relevanceOfFMsInTraject12_2FMCView.csv + + + + + + TextInTraject + + + Label + + + NameFM + + + IsRelevant + + + + + + D:\repos\Riskeer\System tests\AutomatedSystemTests\AutomatedSystemTests\Data\script21\input\CSVs\relevanceOfFMsInTraject12_2PE.csv + + + id="0cb3406e-9796-40ad-a9fc-964ae357d98d"> + id="33d7e485-8bdd-4286-9e35-8e1b4c29bb6e"> + id="58a6b72e-26d9-47d1-87ab-f35fb84b127c"> + id="9339f92a-867d-4e0d-b2a5-1fe03f3fc82a"> + id="f16b204f-b66b-40a0-82c1-8d62dcbc8b22"> Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -28,9 +28,10 @@ { static AutomatedSystemTestsRepository instance = new AutomatedSystemTestsRepository(); AutomatedSystemTestsRepositoryFolders.RiskeerMainWindowAppFolder _riskeermainwindow; - AutomatedSystemTestsRepositoryFolders.CloseProjectDialogAppFolder _closeprojectdialog; + AutomatedSystemTestsRepositoryFolders.ConfirmSaveProjectDialogWhenClosingAppFolder _confirmsaveprojectdialogwhenclosing; AutomatedSystemTestsRepositoryFolders.OpenDialogAppFolder _opendialog; AutomatedSystemTestsRepositoryFolders.ActivityProgressDialogAppFolder _activityprogressdialog; + AutomatedSystemTestsRepositoryFolders.ContextMenuAppFolder _contextmenu; /// /// Gets the singleton class instance representing the AutomatedSystemTestsRepository element repository. @@ -48,9 +49,10 @@ : base("AutomatedSystemTestsRepository", "/", null, 0, false, "40cb8eed-98dc-4b16-a5ad-7ef93b4f444c", ".\\RepositoryImages\\AutomatedSystemTestsRepository40cb8eed.rximgres") { _riskeermainwindow = new AutomatedSystemTestsRepositoryFolders.RiskeerMainWindowAppFolder(this); - _closeprojectdialog = new AutomatedSystemTestsRepositoryFolders.CloseProjectDialogAppFolder(this); + _confirmsaveprojectdialogwhenclosing = new AutomatedSystemTestsRepositoryFolders.ConfirmSaveProjectDialogWhenClosingAppFolder(this); _opendialog = new AutomatedSystemTestsRepositoryFolders.OpenDialogAppFolder(this); _activityprogressdialog = new AutomatedSystemTestsRepositoryFolders.ActivityProgressDialogAppFolder(this); + _contextmenu = new AutomatedSystemTestsRepositoryFolders.ContextMenuAppFolder(this); } #region Variables @@ -79,6 +81,18 @@ set { _substringItemName = value; } } + string _labelFM = ""; + + /// + /// Gets or sets the value of variable labelFM. + /// + [TestVariable("5afdb904-9d2e-4bb5-ae28-38089eda6255")] + public string labelFM + { + get { return _labelFM; } + set { _labelFM = value; } + } + #endregion /// @@ -103,12 +117,12 @@ } /// - /// The CloseProjectDialog folder. + /// The ConfirmSaveProjectDialogWhenClosing folder. /// [RepositoryFolder("0c304014-01d3-44c4-9578-fb43d28c00b3")] - public virtual AutomatedSystemTestsRepositoryFolders.CloseProjectDialogAppFolder CloseProjectDialog + public virtual AutomatedSystemTestsRepositoryFolders.ConfirmSaveProjectDialogWhenClosingAppFolder ConfirmSaveProjectDialogWhenClosing { - get { return _closeprojectdialog; } + get { return _confirmsaveprojectdialogwhenclosing; } } /// @@ -128,6 +142,15 @@ { get { return _activityprogressdialog; } } + + /// + /// The ContextMenu folder. + /// + [RepositoryFolder("982924af-cebe-4e46-9281-476e566d6398")] + public virtual AutomatedSystemTestsRepositoryFolders.ContextMenuAppFolder ContextMenu + { + get { return _contextmenu; } + } } /// @@ -144,6 +167,10 @@ { AutomatedSystemTestsRepositoryFolders.ProjectExplorerFolder _projectexplorer; AutomatedSystemTestsRepositoryFolders.RibbonFolder _ribbon; + AutomatedSystemTestsRepositoryFolders.HeaderOpenViewsFolder _headeropenviews; + AutomatedSystemTestsRepositoryFolders.FailureMechanismContributionViewFolder _failuremechanismcontributionview; + AutomatedSystemTestsRepositoryFolders.MyFailureMechanismContributionViewFolder _myfailuremechanismcontributionview; + RepoItemInfo _isfmrelevantcellInfo; /// /// Creates a new RiskeerMainWindow folder. @@ -153,6 +180,10 @@ { _projectexplorer = new AutomatedSystemTestsRepositoryFolders.ProjectExplorerFolder(this); _ribbon = new AutomatedSystemTestsRepositoryFolders.RibbonFolder(this); + _headeropenviews = new AutomatedSystemTestsRepositoryFolders.HeaderOpenViewsFolder(this); + _failuremechanismcontributionview = new AutomatedSystemTestsRepositoryFolders.FailureMechanismContributionViewFolder(this); + _myfailuremechanismcontributionview = new AutomatedSystemTestsRepositoryFolders.MyFailureMechanismContributionViewFolder(this); + _isfmrelevantcellInfo = new RepoItemInfo(this, "IsFMRelevantCell", "list//container[@controlname='FailureMechanismContributionView']/?/table/row[@accessiblevalue~$labelFM]/cell[@accessiblename>'Is relevant']", 30000, null, "1029a286-ce5f-4de6-8f9d-d68210aae163"); } /// @@ -180,6 +211,30 @@ } /// + /// The IsFMRelevantCell item. + /// + [RepositoryItem("1029a286-ce5f-4de6-8f9d-d68210aae163")] + public virtual Ranorex.Cell IsFMRelevantCell + { + get + { + return _isfmrelevantcellInfo.CreateAdapter(true); + } + } + + /// + /// The IsFMRelevantCell item info. + /// + [RepositoryItemInfo("1029a286-ce5f-4de6-8f9d-d68210aae163")] + public virtual RepoItemInfo IsFMRelevantCellInfo + { + get + { + return _isfmrelevantcellInfo; + } + } + + /// /// The ProjectExplorer folder. /// [RepositoryFolder("f5ed0b8b-7145-426f-982e-b89248da6d53")] @@ -196,6 +251,33 @@ { get { return _ribbon; } } + + /// + /// The HeaderOpenViews folder. + /// + [RepositoryFolder("b2c76482-93c5-4171-9eaf-0f674aebb65b")] + public virtual AutomatedSystemTestsRepositoryFolders.HeaderOpenViewsFolder HeaderOpenViews + { + get { return _headeropenviews; } + } + + /// + /// The FailureMechanismContributionView folder. + /// + [RepositoryFolder("8de00d2a-2da8-41c8-b1cb-2600ea17161f")] + public virtual AutomatedSystemTestsRepositoryFolders.FailureMechanismContributionViewFolder FailureMechanismContributionView + { + get { return _failuremechanismcontributionview; } + } + + /// + /// The MyFailureMechanismContributionView folder. + /// + [RepositoryFolder("98749289-fdda-4451-b00f-f2464c039a30")] + public virtual AutomatedSystemTestsRepositoryFolders.MyFailureMechanismContributionViewFolder MyFailureMechanismContributionView + { + get { return _myfailuremechanismcontributionview; } + } } /// @@ -306,6 +388,7 @@ [RepositoryFolder("3bb01c51-3d9c-4c3f-adc4-408396425ed8")] public partial class TrajectWithSubstringInNameFolder : RepoGenBaseFolder { + RepoItemInfo _faalkansbegrotingInfo; RepoItemInfo _genericitemwithsubstringinnameInfo; /// @@ -314,6 +397,7 @@ public TrajectWithSubstringInNameFolder(RepoGenBaseFolder parentFolder) : base("TrajectWithSubstringInName", "treeitem[@accessiblename~$substringTrajectName]", parentFolder, 30000, null, false, "3bb01c51-3d9c-4c3f-adc4-408396425ed8", "") { + _faalkansbegrotingInfo = new RepoItemInfo(this, "Faalkansbegroting", "treeitem[@accessiblename='Faalkansbegroting']", 30000, null, "79c86dc7-8eee-48b2-b0af-b29632b7c092"); _genericitemwithsubstringinnameInfo = new RepoItemInfo(this, "GenericItemWithSubstringInName", "treeitem[@accessiblename~$substringItemName]", 30000, null, "92f53398-7bb2-45f8-a305-0adb56ec8aa7"); } @@ -342,6 +426,30 @@ } /// + /// The Faalkansbegroting item. + /// + [RepositoryItem("79c86dc7-8eee-48b2-b0af-b29632b7c092")] + public virtual Ranorex.TreeItem Faalkansbegroting + { + get + { + return _faalkansbegrotingInfo.CreateAdapter(true); + } + } + + /// + /// The Faalkansbegroting item info. + /// + [RepositoryItemInfo("79c86dc7-8eee-48b2-b0af-b29632b7c092")] + public virtual RepoItemInfo FaalkansbegrotingInfo + { + get + { + return _faalkansbegrotingInfo; + } + } + + /// /// The GenericItemWithSubstringInName item. /// [RepositoryItem("92f53398-7bb2-45f8-a305-0adb56ec8aa7")] @@ -484,18 +592,164 @@ } /// - /// The CloseProjectDialogAppFolder folder. + /// The HeaderOpenViewsFolder folder. /// + [RepositoryFolder("b2c76482-93c5-4171-9eaf-0f674aebb65b")] + public partial class HeaderOpenViewsFolder : RepoGenBaseFolder + { + RepoItemInfo _viewclosebuttonInfo; + + /// + /// Creates a new HeaderOpenViews folder. + /// + public HeaderOpenViewsFolder(RepoGenBaseFolder parentFolder) : + base("HeaderOpenViews", ".//button[@automationid='MenuDropDownButton']", parentFolder, 30000, null, true, "b2c76482-93c5-4171-9eaf-0f674aebb65b", "") + { + _viewclosebuttonInfo = new RepoItemInfo(this, "ViewCloseButton", "?/tabpage/button[@automationid='DocumentCloseButton']", 30000, null, "79aa5f18-da55-4d5b-9c7c-bc833052d329"); + } + + /// + /// The Self item. + /// + [RepositoryItem("b2c76482-93c5-4171-9eaf-0f674aebb65b")] + public virtual Ranorex.Button Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("b2c76482-93c5-4171-9eaf-0f674aebb65b")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The ViewCloseButton item. + /// + [RepositoryItem("79aa5f18-da55-4d5b-9c7c-bc833052d329")] + public virtual Ranorex.Button ViewCloseButton + { + get + { + return _viewclosebuttonInfo.CreateAdapter(true); + } + } + + /// + /// The ViewCloseButton item info. + /// + [RepositoryItemInfo("79aa5f18-da55-4d5b-9c7c-bc833052d329")] + public virtual RepoItemInfo ViewCloseButtonInfo + { + get + { + return _viewclosebuttonInfo; + } + } + } + + /// + /// The FailureMechanismContributionViewFolder folder. + /// + [RepositoryFolder("8de00d2a-2da8-41c8-b1cb-2600ea17161f")] + public partial class FailureMechanismContributionViewFolder : RepoGenBaseFolder + { + + /// + /// Creates a new FailureMechanismContributionView folder. + /// + public FailureMechanismContributionViewFolder(RepoGenBaseFolder parentFolder) : + base("FailureMechanismContributionView", ".//container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismContributionView']", parentFolder, 30000, null, false, "8de00d2a-2da8-41c8-b1cb-2600ea17161f", "") + { + } + + /// + /// The Self item. + /// + [RepositoryItem("8de00d2a-2da8-41c8-b1cb-2600ea17161f")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("8de00d2a-2da8-41c8-b1cb-2600ea17161f")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + } + + /// + /// The MyFailureMechanismContributionViewFolder folder. + /// + [RepositoryFolder("98749289-fdda-4451-b00f-f2464c039a30")] + public partial class MyFailureMechanismContributionViewFolder : RepoGenBaseFolder + { + + /// + /// Creates a new MyFailureMechanismContributionView folder. + /// + public MyFailureMechanismContributionViewFolder(RepoGenBaseFolder parentFolder) : + base("MyFailureMechanismContributionView", "list//container[@controlname='FailureMechanismContributionView']", parentFolder, 30000, null, false, "98749289-fdda-4451-b00f-f2464c039a30", "") + { + } + + /// + /// The Self item. + /// + [RepositoryItem("98749289-fdda-4451-b00f-f2464c039a30")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("98749289-fdda-4451-b00f-f2464c039a30")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + } + + /// + /// The ConfirmSaveProjectDialogWhenClosingAppFolder folder. + /// [RepositoryFolder("0c304014-01d3-44c4-9578-fb43d28c00b3")] - public partial class CloseProjectDialogAppFolder : RepoGenBaseFolder + public partial class ConfirmSaveProjectDialogWhenClosingAppFolder : RepoGenBaseFolder { RepoItemInfo _buttonnoInfo; /// - /// Creates a new CloseProjectDialog folder. + /// Creates a new ConfirmSaveProjectDialogWhenClosing folder. /// - public CloseProjectDialogAppFolder(RepoGenBaseFolder parentFolder) : - base("CloseProjectDialog", "/form[@title='Project afsluiten']", parentFolder, 30000, null, true, "0c304014-01d3-44c4-9578-fb43d28c00b3", "") + public ConfirmSaveProjectDialogWhenClosingAppFolder(RepoGenBaseFolder parentFolder) : + base("ConfirmSaveProjectDialogWhenClosing", "/form[@title='Project afsluiten']", parentFolder, 30000, null, true, "0c304014-01d3-44c4-9578-fb43d28c00b3", "") { _buttonnoInfo = new RepoItemInfo(this, "ButtonNo", "button[@text='&No']", 30000, null, "2229a024-7306-4b0d-a6ab-e43f6a29c1bd"); } @@ -707,6 +961,124 @@ } } + /// + /// The ContextMenuAppFolder folder. + /// + [RepositoryFolder("982924af-cebe-4e46-9281-476e566d6398")] + public partial class ContextMenuAppFolder : RepoGenBaseFolder + { + RepoItemInfo _openenInfo; + RepoItemInfo _isrelevantInfo; + RepoItemInfo _sluitenInfo; + + /// + /// Creates a new ContextMenu folder. + /// + public ContextMenuAppFolder(RepoGenBaseFolder parentFolder) : + base("ContextMenu", "/contextmenu[@processname='Riskeer']", parentFolder, 30000, null, true, "982924af-cebe-4e46-9281-476e566d6398", "") + { + _openenInfo = new RepoItemInfo(this, "Openen", "menuitem[@accessiblename='Openen']", 30000, null, "3162063a-bd8d-4e48-b6ab-9725baa70e0e"); + _isrelevantInfo = new RepoItemInfo(this, "IsRelevant", "menuitem[@accessiblename='Is relevant']", 30000, null, "561b2d91-62ad-4174-97e3-b9f7420df49a"); + _sluitenInfo = new RepoItemInfo(this, "Sluiten", "menuitem[@text='Sluiten']", 30000, null, "7792c7fb-8afc-4635-86af-1263ee5b805f"); + } + + /// + /// The Self item. + /// + [RepositoryItem("982924af-cebe-4e46-9281-476e566d6398")] + public virtual Ranorex.ContextMenu Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("982924af-cebe-4e46-9281-476e566d6398")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The Openen item. + /// + [RepositoryItem("3162063a-bd8d-4e48-b6ab-9725baa70e0e")] + public virtual Ranorex.MenuItem Openen + { + get + { + return _openenInfo.CreateAdapter(true); + } + } + + /// + /// The Openen item info. + /// + [RepositoryItemInfo("3162063a-bd8d-4e48-b6ab-9725baa70e0e")] + public virtual RepoItemInfo OpenenInfo + { + get + { + return _openenInfo; + } + } + + /// + /// The IsRelevant item. + /// + [RepositoryItem("561b2d91-62ad-4174-97e3-b9f7420df49a")] + public virtual Ranorex.MenuItem IsRelevant + { + get + { + return _isrelevantInfo.CreateAdapter(true); + } + } + + /// + /// The IsRelevant item info. + /// + [RepositoryItemInfo("561b2d91-62ad-4174-97e3-b9f7420df49a")] + public virtual RepoItemInfo IsRelevantInfo + { + get + { + return _isrelevantInfo; + } + } + + /// + /// The Sluiten item. + /// + [RepositoryItem("7792c7fb-8afc-4635-86af-1263ee5b805f")] + public virtual Ranorex.MenuItem Sluiten + { + get + { + return _sluitenInfo.CreateAdapter(true); + } + } + + /// + /// The Sluiten item info. + /// + [RepositoryItemInfo("7792c7fb-8afc-4635-86af-1263ee5b805f")] + public virtual RepoItemInfo SluitenInfo + { + get + { + return _sluitenInfo; + } + } + } + } #pragma warning restore 0436 } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rximg =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 Binary files differ Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -r1ca3a285ff24454c0b883fae96a5aa92329bf67a -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 1ca3a285ff24454c0b883fae96a5aa92329bf67a) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -48,6 +48,15 @@ + /form[@automationid='RiskeerMainWindow']//container[@controlname='ProjectExplorer']//tree[@controlname='treeView']/tree[@accessiblerole='Outline']/treeitem[1]/treeitem[@accessiblename~$substringTrajectName]/treeitem[@accessiblename='Faalkansbegroting'] + + + + + /form[@automationid='RiskeerMainWindow']//button[@automationid='MenuDropDownButton']/?/tabpage/button[@automationid='DocumentCloseButton'] + + + /form[@automationid='RiskeerMainWindow']//button[@automationid='MenuDropDownButton'] + + + + + /form[@automationid='RiskeerMainWindow']//container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismContributionView'] + + + + /form[@automationid='RiskeerMainWindow']/list//container[@controlname='FailureMechanismContributionView']/?/table/row[@accessiblevalue~$labelFM]/cell[@accessiblename>'Is relevant'] + + + + /form[@automationid='RiskeerMainWindow']/list//container[@controlname='FailureMechanismContributionView'] + + /form[@automationid='RiskeerMainWindow'] @@ -117,7 +180,7 @@ capname="form" id="0c304014-01d3-44c4-9578-fb43d28c00b3" isrooted="True" - name="CloseProjectDialog" + name="ConfirmSaveProjectDialogWhenClosing" refpath="/form[@title='Project afsluiten']" searchtimeout="30000ms" usecache="True"> @@ -217,6 +280,103 @@ cwAAAABJRU5ErkJggg== + + + /contextmenu[@processname='Riskeer']/menuitem[@accessiblename='Openen'] + + + /contextmenu[@processname='Riskeer']/menuitem[@accessiblename='Is relevant'] + + + /contextmenu[@processname='Riskeer']/menuitem[@text='Sluiten'] + + + /contextmenu[@processname='Riskeer'] + + + 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 + + @@ -229,5 +389,9 @@ id="3a7276c1-fca1-4026-9d2e-5bac10651a47" name="substringItemName"> + + Index: System tests/AutomatedSystemTests/AutomatedSystemTests/CloseAUT.UserCode.cs =================================================================== diff -u -r71d4a54d015d829ee21bea85a7a00c45be46ec9d -r31e9dfe382a070363659e0ef995e8ae6f7406e40 --- System tests/AutomatedSystemTests/AutomatedSystemTests/CloseAUT.UserCode.cs (.../CloseAUT.UserCode.cs) (revision 71d4a54d015d829ee21bea85a7a00c45be46ec9d) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/CloseAUT.UserCode.cs (.../CloseAUT.UserCode.cs) (revision 31e9dfe382a070363659e0ef995e8ae6f7406e40) @@ -35,7 +35,7 @@ public void ClickButtonNoIfDialogShown(RepoItemInfo buttonInfo) { - if (repo.CloseProjectDialog.SelfInfo.Exists()) + if (repo.ConfirmSaveProjectDialogWhenClosing.SelfInfo.Exists()) { Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'buttonInfo' at Center.", buttonInfo); buttonInfo.FindAdapter