Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj =================================================================== diff -u -raa67ab584a3115a44c07a9ea80193ba568ce32da -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision aa67ab584a3115a44c07a9ea80193ba568ce32da) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -302,6 +302,18 @@ true f103591c-470f-43f6-9be6-e6eb74067b9c + + bbfde277-5adf-4de7-a49e-e6822bc65f48 + ValidateDetailedAssessmentAtRow.rxrec + true + 8ef49bdd-b485-4f22-bb85-942be3a64b1b + + + bbfde277-5adf-4de7-a49e-e6822bc65f48 + ValidateDetailedAssessmentAtRow.rxrec + true + 8658e6ac-2879-4557-85a0-bb2867183791 + 4321a5dc-dff9-4a99-9273-baf97a3bf99f ValidateFMRelevanceInFMCView.rxrec @@ -424,6 +436,11 @@ 8f7fe1fa-f1ef-4825-8e3a-6a13124b5fbc 825ce2a6-cd3b-42f6-9972-8ced75f1a54f + + 8b6648ca-2429-462f-8074-96184700bbed + bbfde277-5adf-4de7-a49e-e6822bc65f48 + 91919928-72e3-45e3-8af5-a51f8db749e3 + 8b6648ca-2429-462f-8074-96184700bbed 4321a5dc-dff9-4a99-9273-baf97a3bf99f Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst =================================================================== diff -u -raa67ab584a3115a44c07a9ea80193ba568ce32da -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision aa67ab584a3115a44c07a9ea80193ba568ce32da) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -1,4 +1,4 @@ - + @@ -101,16 +101,17 @@ name="LoopFMs"> + + - - + name="LoopRows"> + name="DetailedAssessmentFMsGroup1_STPH"> + + - + - - - - - - + name="LoopRowsSelectDetailedAssessment"> + name="LoopRows"> + name="LoopRows"> @@ -1446,7 +1438,7 @@ + name="LoopRows"> @@ -1484,27 +1476,31 @@ + name="DetailedAssessmentFMsGroup1_STPH"> + + + id="2de34f6f-37d9-43ec-bb73-99701040ddeb" + name="ValidateDetailedAsssessmentPerSectionExists"> + id="0cc64991-03f6-4736-848c-6a48265de8c6" + name="ValidateDetailedAssessmentAtRow"> - - - - + + + id="328383e3-e3fc-4be6-9787-baa30b524f66" + name="SelectDetailedAssessmentForRow"> + + + id="1eff0053-015a-4ebc-aece-f2f6f630f6bc"> + + + id="2de34f6f-37d9-43ec-bb73-99701040ddeb"> + + + + + + + + + + + + + + + + + /// Gets or sets the value of variable rowIndexNumber. + /// + [TestVariable("78d97b21-0313-4655-9f2d-4d37f9c41737")] + public string rowIndexNumber + { + get { return _rowIndexNumber; } + set { _rowIndexNumber = value; } + } + #endregion /// @@ -1007,6 +1019,7 @@ RepoItemInfo _eenvoudigetoetsvak12_2_00000Info; RepoItemInfo _eenvoudigetoetsrownthInfo; RepoItemInfo _gedetaileerdetoetsrownthInfo; + RepoItemInfo _gedetailleerdetoetspervakfaalkansrInfo; /// /// Creates a new TableDataGridView folder. @@ -1017,6 +1030,7 @@ _eenvoudigetoetsvak12_2_00000Info = new RepoItemInfo(this, "EenvoudigeToetsVak12_2_00000", "row/cell[@accessiblename>'Vak' and @text='12_2_00000']/../cell[@accessiblename>'Eenvoudige']", 30000, null, "892f29d9-c365-437c-91bd-7720a612cf0c"); _eenvoudigetoetsrownthInfo = new RepoItemInfo(this, "EenvoudigeToetsRowNth", "row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename='Eenvoudige toets Row '+$rowIndex]", 30000, null, "78777803-f3ba-489a-8aa8-3ad795fbe569"); _gedetaileerdetoetsrownthInfo = new RepoItemInfo(this, "GedetaileerdeToetsRowNth", "row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename='Gedetailleerde toets per vak Row '+$rowIndex]", 30000, null, "65e328b8-068a-4b37-a2d7-cb220911d1fe"); + _gedetailleerdetoetspervakfaalkansrInfo = new RepoItemInfo(this, "GedetailleerdeToetsPerVakFaalkansR", "row[@accessiblename='Row '+$rowIndexNumber]/cell[@accessiblename>'Gedetailleerde toets per vakfaalkans Row ']", 30000, null, "a641d0c3-927e-4d5c-8c7f-5164b18f8462"); } /// @@ -1114,6 +1128,30 @@ return _gedetaileerdetoetsrownthInfo; } } + + /// + /// The GedetailleerdeToetsPerVakFaalkansR item. + /// + [RepositoryItem("a641d0c3-927e-4d5c-8c7f-5164b18f8462")] + public virtual Ranorex.Cell GedetailleerdeToetsPerVakFaalkansR + { + get + { + return _gedetailleerdetoetspervakfaalkansrInfo.CreateAdapter(true); + } + } + + /// + /// The GedetailleerdeToetsPerVakFaalkansR item info. + /// + [RepositoryItemInfo("a641d0c3-927e-4d5c-8c7f-5164b18f8462")] + public virtual RepoItemInfo GedetailleerdeToetsPerVakFaalkansRInfo + { + get + { + return _gedetailleerdetoetspervakfaalkansrInfo; + } + } } /// Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rximg =================================================================== diff -u -r14e633cd649e143ce0f7946dd76cc39764904800 -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 Binary files differ Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -raa67ab584a3115a44c07a9ea80193ba568ce32da -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision aa67ab584a3115a44c07a9ea80193ba568ce32da) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -233,6 +233,15 @@ searchtimeout="30000ms"> /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename='Gedetailleerde toets per vak Row '+$rowIndex] + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndexNumber]/cell[@accessiblename>'Gedetailleerde toets per vakfaalkans Row '] + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView'] @@ -753,5 +762,9 @@ id="3191cedb-5ef9-4f31-85c1-c8b9bb6a46f0" name="rowIndex"> + + Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Data/script21/input/CSVs/detailedAssessmentFMsGroup1.csv =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Data/script21/input/CSVs/detailedAssessmentFMsGroup1.csv (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Data/script21/input/CSVs/detailedAssessmentFMsGroup1.csv (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -0,0 +1,9 @@ +rowIndex,SimpleAssessmentItem +0,Faalkans +1,NGO +2,Faalkans +3,NGO +4,Faalkans +5,NGO +6,Faalkans +7,NGO Index: System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.cs =================================================================== diff -u -rc2666987e7c68090b42c2ae4fe3a4d81ca4ef2b9 -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 --- System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.cs (.../OpenResultView.cs) (revision c2666987e7c68090b42c2ae4fe3a4d81ca4ef2b9) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.cs (.../OpenResultView.cs) (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -111,6 +111,8 @@ Delay.Milliseconds(0); } 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)); + } #region Image Feature Data Index: System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.rxrec =================================================================== diff -u -rc2666987e7c68090b42c2ae4fe3a4d81ca4ef2b9 -r7457115b7fb5e0b4dc89f450d7dbabaed719c789 --- System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.rxrec (.../OpenResultView.rxrec) (revision c2666987e7c68090b42c2ae4fe3a4d81ca4ef2b9) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/OpenResultView.rxrec (.../OpenResultView.rxrec) (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -117,6 +117,26 @@ + + + + + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter'] + + + + /// This method gets called right after the recording has been started. + /// It can be used to execute recording specific initialization code. + /// + private void Init() + { + // Your recording specific initialization code goes here. + } + + public void ValidateDetailedAssessmentCell(RepoItemInfo cellInfo, string expectedValue) + { + Report.Log(ReportLevel.Info, "Validation", "Validating AttributeEqual (AccessibleValue='" + expectedValue.ToString() + "') on item 'cellInfo'.", cellInfo); + Validate.AttributeEqual(cellInfo, "AccessibleValue", expectedValue); + } + + } +} Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.cs (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -0,0 +1,114 @@ +/////////////////////////////////////////////////////////////////////////////// +// +// This file was automatically generated by RANOREX. +// DO NOT MODIFY THIS FILE! It is regenerated by the designer. +// All your modifications will be lost! +// http://www.ranorex.com +// +/////////////////////////////////////////////////////////////////////////////// + +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.RegularExpressions; +using System.Drawing; +using System.Threading; +using WinForms = System.Windows.Forms; + +using Ranorex; +using Ranorex.Core; +using Ranorex.Core.Testing; +using Ranorex.Core.Repository; + +namespace AutomatedSystemTests +{ +#pragma warning disable 0436 //(CS0436) The type 'type' in 'assembly' conflicts with the imported type 'type2' in 'assembly'. Using the type defined in 'assembly'. + /// + ///The ValidateDetailedAssessmentAtRow recording. + /// + [TestModule("91919928-72e3-45e3-8af5-a51f8db749e3", ModuleType.Recording, 1)] + public partial class ValidateDetailedAssessmentAtRow : ITestModule + { + /// + /// Holds an instance of the AutomatedSystemTestsRepository repository. + /// + public static AutomatedSystemTestsRepository repo = AutomatedSystemTestsRepository.Instance; + + static ValidateDetailedAssessmentAtRow instance = new ValidateDetailedAssessmentAtRow(); + + /// + /// Constructs a new instance. + /// + public ValidateDetailedAssessmentAtRow() + { + expectedDetailedAssessmentCellValue = ""; + } + + /// + /// Gets a static instance of this recording. + /// + public static ValidateDetailedAssessmentAtRow Instance + { + get { return instance; } + } + +#region Variables + + string _expectedDetailedAssessmentCellValue; + + /// + /// Gets or sets the value of variable expectedDetailedAssessmentCellValue. + /// + [TestVariable("79d7d1d0-a157-4326-954d-9ee0a7bbe710")] + public string expectedDetailedAssessmentCellValue + { + get { return _expectedDetailedAssessmentCellValue; } + set { _expectedDetailedAssessmentCellValue = value; } + } + + /// + /// Gets or sets the value of variable rowIndexNumber. + /// + [TestVariable("78d97b21-0313-4655-9f2d-4d37f9c41737")] + public string rowIndexNumber + { + get { return repo.rowIndexNumber; } + set { repo.rowIndexNumber = value; } + } + +#endregion + + /// + /// Starts the replay of the static recording . + /// + [System.CodeDom.Compiler.GeneratedCode("Ranorex", global::Ranorex.Core.Constants.CodeGenVersion)] + public static void Start() + { + TestModuleRunner.Run(Instance); + } + + /// + /// Performs the playback of actions in this recording. + /// + /// You should not call this method directly, instead pass the module + /// instance to the method + /// that will in turn invoke this method. + [System.CodeDom.Compiler.GeneratedCode("Ranorex", global::Ranorex.Core.Constants.CodeGenVersion)] + void ITestModule.Run() + { + Mouse.DefaultMoveTime = 300; + Keyboard.DefaultKeyPressTime = 20; + Delay.SpeedFactor = 1.00; + + Init(); + + ValidateDetailedAssessmentCell(repo.RiskeerMainWindow.DocumentViewContainer.FailureMechanismResultView.TableDataGridView.GedetailleerdeToetsPerVakFaalkansRInfo, expectedDetailedAssessmentCellValue); + Delay.Milliseconds(0); + + } + +#region Image Feature Data +#endregion + } +#pragma warning restore 0436 +} Index: System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.rxrec =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.rxrec (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/ValidateDetailedAssessmentAtRow.rxrec (revision 7457115b7fb5e0b4dc89f450d7dbabaed719c789) @@ -0,0 +1,93 @@ + + + + 1 + + + False + + + True + + + 1 + + + True + + + + + + + + + + + + + + + + + Ranorex.Core.Repository.RepoItemInfo, Ranorex.Core, Culture=neutral + + + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row 2']/cell[@accessiblename>'Gedetailleerde toets per vakfaalkans Row '] + + + + + + System.String + + + + + + + + + + + + + + + ValidateDetailedAssessmentAtRow.UserCode.cs + + + +