Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.cd =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.cd (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.cd (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,1593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -39,6 +39,9 @@ TRACE + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + False @@ -402,12 +405,21 @@ 36c7adeb-dd3d-478a-a616-7bda4854a2dd 764f9833-0f5f-4be1-ba5b-275a72cc032e - + 93fc40b2-25f2-4a04-9470-ea76f13116f0 + + 8e53cfa4-7861-4ae3-aad4-f06b1aeea7e1 + 608d45dc-fe27-457c-83c7-c201f32a598d + + 2b05cc1b-9f11-495c-a7b1-ec53d69f9bc9 + + + 5a8d1d39-770a-499a-bd2b-f165e9451f94 + 0654a5f3-7f4f-4513-a435-530a7709f072 ZoomMapViewWithMouseWheel.rxrec @@ -2111,6 +2123,9 @@ + + 66fe0cf2-33f8-4d9e-b13c-c2ffd8b9ec02 + PreserveNewest 9b851ffe-ba07-4571-9820-ec050a6ab8f0 @@ -2934,6 +2949,9 @@ f9b54cc6-cbb7-406e-99ab-c3c41eee8d0e a653ace9-5ee8-4659-932a-53a321bc6e32 + + dfd3a3f5-0e6a-4028-8144-ed4d6153f833 + 33bfacb4-10d7-4c99-ab52-0f94bd94b857 Always Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -2142,6 +2142,8 @@ AutomatedSystemTestsRepositoryFolders.DesignWaterLevelCalculationsViewFolder _designwaterlevelcalculationsview; AutomatedSystemTestsRepositoryFolders.ScenariosViewFolder _scenariosview; AutomatedSystemTestsRepositoryFolders.HydraulicBCDunesFolder _hydraulicbcdunes; + AutomatedSystemTestsRepositoryFolders.AssemblyResultFolder _assemblyresult; + AutomatedSystemTestsRepositoryFolders.AssemblyResultsCategoryViewFolder _assemblyresultscategoryview; RepoItemInfo _btndialogInfo; RepoItemInfo _dropdownbuttoninrowpropertiespanelInfo; RepoItemInfo _tablevakindelingInfo; @@ -2158,6 +2160,8 @@ _designwaterlevelcalculationsview = new AutomatedSystemTestsRepositoryFolders.DesignWaterLevelCalculationsViewFolder(this); _scenariosview = new AutomatedSystemTestsRepositoryFolders.ScenariosViewFolder(this); _hydraulicbcdunes = new AutomatedSystemTestsRepositoryFolders.HydraulicBCDunesFolder(this); + _assemblyresult = new AutomatedSystemTestsRepositoryFolders.AssemblyResultFolder(this); + _assemblyresultscategoryview = new AutomatedSystemTestsRepositoryFolders.AssemblyResultsCategoryViewFolder(this); _btndialogInfo = new RepoItemInfo(this, "BtnDialog", "?/?/button[@controlname='btnDialog']", 30000, null, "cefba828-ea6b-4e9d-a97a-641324e9af42"); _dropdownbuttoninrowpropertiespanelInfo = new RepoItemInfo(this, "DropDownButtonInRowPropertiesPanel", "?/?/button[@controlname='btnDropDown']", 30000, null, "3bf645bc-b589-440e-9827-e97c895e810b"); _tablevakindelingInfo = new RepoItemInfo(this, "TableVakindeling", "?/?/table[@controlname='dataGridView']", 30000, null, "e1c75820-980f-411c-9ada-a9dcd59572ae"); @@ -2312,6 +2316,24 @@ { get { return _hydraulicbcdunes; } } + + /// + /// The AssemblyResult folder. + /// + [RepositoryFolder("82c9e9d8-a1cb-491c-82a8-73b6890efdc7")] + public virtual AutomatedSystemTestsRepositoryFolders.AssemblyResultFolder AssemblyResult + { + get { return _assemblyresult; } + } + + /// + /// The AssemblyResultsCategoryView folder. + /// + [RepositoryFolder("5c34ec61-2a27-47dd-9034-14bc035f18c4")] + public virtual AutomatedSystemTestsRepositoryFolders.AssemblyResultsCategoryViewFolder AssemblyResultsCategoryView + { + get { return _assemblyresultscategoryview; } + } } /// @@ -2464,6 +2486,8 @@ public partial class FM_ResultViewFolder : RepoGenBaseFolder { AutomatedSystemTestsRepositoryFolders.TableFolder1 _table; + AutomatedSystemTestsRepositoryFolders.AssemblyWithProbFolder _assemblywithprob; + RepoItemInfo _labelnoprobInfo; /// /// Creates a new FM_ResultView folder. @@ -2472,6 +2496,8 @@ base("FM_ResultView", "container[@controlname='FailureMechanismResultView']", parentFolder, 10000, null, true, "9f847d0f-b605-48f5-b38e-9eb9bbefddb9", "") { _table = new AutomatedSystemTestsRepositoryFolders.TableFolder1(this); + _assemblywithprob = new AutomatedSystemTestsRepositoryFolders.AssemblyWithProbFolder(this); + _labelnoprobInfo = new RepoItemInfo(this, "LabelNoProb", "container[@controlname='TableLayoutPanel']/container/container/text/text", 30000, null, "c399e33b-877b-44d3-b11d-669c5860639a"); } /// @@ -2499,13 +2525,46 @@ } /// + /// The LabelNoProb item. + /// + [RepositoryItem("c399e33b-877b-44d3-b11d-669c5860639a")] + public virtual Ranorex.Text LabelNoProb + { + get + { + return _labelnoprobInfo.CreateAdapter(true); + } + } + + /// + /// The LabelNoProb item info. + /// + [RepositoryItemInfo("c399e33b-877b-44d3-b11d-669c5860639a")] + public virtual RepoItemInfo LabelNoProbInfo + { + get + { + return _labelnoprobInfo; + } + } + + /// /// The Table folder. /// [RepositoryFolder("a41c39c2-763f-4195-aef0-17e3e2be8655")] public virtual AutomatedSystemTestsRepositoryFolders.TableFolder1 Table { get { return _table; } } + + /// + /// The AssemblyWithProb folder. + /// + [RepositoryFolder("3a553cf8-c13d-4d90-ac0f-fc1cb3a8c6a9")] + public virtual AutomatedSystemTestsRepositoryFolders.AssemblyWithProbFolder AssemblyWithProb + { + get { return _assemblywithprob; } + } } /// @@ -3017,6 +3076,98 @@ } /// + /// The AssemblyWithProbFolder folder. + /// + [RepositoryFolder("3a553cf8-c13d-4d90-ac0f-fc1cb3a8c6a9")] + public partial class AssemblyWithProbFolder : RepoGenBaseFolder + { + RepoItemInfo _labelInfo; + RepoItemInfo _probabilityInfo; + + /// + /// Creates a new AssemblyWithProb folder. + /// + public AssemblyWithProbFolder(RepoGenBaseFolder parentFolder) : + base("AssemblyWithProb", "container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']", parentFolder, 30000, null, false, "3a553cf8-c13d-4d90-ac0f-fc1cb3a8c6a9", "") + { + _labelInfo = new RepoItemInfo(this, "Label", "container[@controlname='GroupPanel']/text/text", 30000, null, "555de67d-51df-407a-8568-fd4103465a3d"); + _probabilityInfo = new RepoItemInfo(this, "Probability", "container[@controlname='probabilityPanel']/text/text", 30000, null, "4bda29c4-58e8-4b08-ac2e-ec866b6f1fb6"); + } + + /// + /// The Self item. + /// + [RepositoryItem("3a553cf8-c13d-4d90-ac0f-fc1cb3a8c6a9")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("3a553cf8-c13d-4d90-ac0f-fc1cb3a8c6a9")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The Label item. + /// + [RepositoryItem("555de67d-51df-407a-8568-fd4103465a3d")] + public virtual Ranorex.Text Label + { + get + { + return _labelInfo.CreateAdapter(true); + } + } + + /// + /// The Label item info. + /// + [RepositoryItemInfo("555de67d-51df-407a-8568-fd4103465a3d")] + public virtual RepoItemInfo LabelInfo + { + get + { + return _labelInfo; + } + } + + /// + /// The Probability item. + /// + [RepositoryItem("4bda29c4-58e8-4b08-ac2e-ec866b6f1fb6")] + public virtual Ranorex.Text Probability + { + get + { + return _probabilityInfo.CreateAdapter(true); + } + } + + /// + /// The Probability item info. + /// + [RepositoryItemInfo("4bda29c4-58e8-4b08-ac2e-ec866b6f1fb6")] + public virtual RepoItemInfo ProbabilityInfo + { + get + { + return _probabilityInfo; + } + } + } + + /// /// The ViewCategoryBoundariesFolder folder. /// [RepositoryFolder("a7a59ba5-6496-4ab2-b44f-ade262080acc")] @@ -3948,6 +4099,318 @@ } /// + /// The AssemblyResultFolder folder. + /// + [RepositoryFolder("82c9e9d8-a1cb-491c-82a8-73b6890efdc7")] + public partial class AssemblyResultFolder : RepoGenBaseFolder + { + AutomatedSystemTestsRepositoryFolders.SummaryFolder _summary; + AutomatedSystemTestsRepositoryFolders.TableFolder4 _table; + + /// + /// Creates a new AssemblyResult folder. + /// + public AssemblyResultFolder(RepoGenBaseFolder parentFolder) : + base("AssemblyResult", ".//container[@controlname='AssemblyResultTotalView']", parentFolder, 30000, null, false, "82c9e9d8-a1cb-491c-82a8-73b6890efdc7", "") + { + _summary = new AutomatedSystemTestsRepositoryFolders.SummaryFolder(this); + _table = new AutomatedSystemTestsRepositoryFolders.TableFolder4(this); + } + + /// + /// The Self item. + /// + [RepositoryItem("82c9e9d8-a1cb-491c-82a8-73b6890efdc7")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("82c9e9d8-a1cb-491c-82a8-73b6890efdc7")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The Summary folder. + /// + [RepositoryFolder("b6c16815-7d2e-4c8f-a729-4eb72e26ccdd")] + public virtual AutomatedSystemTestsRepositoryFolders.SummaryFolder Summary + { + get { return _summary; } + } + + /// + /// The Table folder. + /// + [RepositoryFolder("4c15a955-c1b0-48c4-bcdc-7150cc96054e")] + public virtual AutomatedSystemTestsRepositoryFolders.TableFolder4 Table + { + get { return _table; } + } + } + + /// + /// The SummaryFolder folder. + /// + [RepositoryFolder("b6c16815-7d2e-4c8f-a729-4eb72e26ccdd")] + public partial class SummaryFolder : RepoGenBaseFolder + { + RepoItemInfo _securityassessmentInfo; + RepoItemInfo _assessmentlabelgroups1and2Info; + RepoItemInfo _assessmentprobabilitygroups1and2Info; + RepoItemInfo _assessmentgroups3and4Info; + + /// + /// Creates a new Summary folder. + /// + public SummaryFolder(RepoGenBaseFolder parentFolder) : + base("Summary", "container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel']", parentFolder, 30000, null, false, "b6c16815-7d2e-4c8f-a729-4eb72e26ccdd", "") + { + _securityassessmentInfo = new RepoItemInfo(this, "SecurityAssessment", "container[@controlname='totalAssemblyCategoryGroupControl']/container/text", 30000, null, "06fa95f1-b47a-4a0e-a616-04091c02e9cb"); + _assessmentlabelgroups1and2Info = new RepoItemInfo(this, "AssessmentLabelGroups1And2", "container[@controlname='failureMechanismsWithProbabilityAssemblyControl']/container[@controlname='GroupPanel']/text/text", 30000, null, "41d87314-6a5d-4b48-bb76-cee7c6f57537"); + _assessmentprobabilitygroups1and2Info = new RepoItemInfo(this, "AssessmentProbabilityGroups1And2", "container[@controlname='failureMechanismsWithProbabilityAssemblyControl']/container[@controlname='probabilityPanel']/text/text", 30000, null, "1d9add26-2df5-4fe6-b94b-07f83cce63eb"); + _assessmentgroups3and4Info = new RepoItemInfo(this, "AssessmentGroups3And4", "container[@controlname='failureMechanismsWithoutProbabilityAssemblyControl']/container/text", 30000, null, "82e26559-e7f0-45f2-822d-cb7a9db63950"); + } + + /// + /// The Self item. + /// + [RepositoryItem("b6c16815-7d2e-4c8f-a729-4eb72e26ccdd")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("b6c16815-7d2e-4c8f-a729-4eb72e26ccdd")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The SecurityAssessment item. + /// + [RepositoryItem("06fa95f1-b47a-4a0e-a616-04091c02e9cb")] + public virtual Ranorex.Text SecurityAssessment + { + get + { + return _securityassessmentInfo.CreateAdapter(true); + } + } + + /// + /// The SecurityAssessment item info. + /// + [RepositoryItemInfo("06fa95f1-b47a-4a0e-a616-04091c02e9cb")] + public virtual RepoItemInfo SecurityAssessmentInfo + { + get + { + return _securityassessmentInfo; + } + } + + /// + /// The AssessmentLabelGroups1And2 item. + /// + [RepositoryItem("41d87314-6a5d-4b48-bb76-cee7c6f57537")] + public virtual Ranorex.Text AssessmentLabelGroups1And2 + { + get + { + return _assessmentlabelgroups1and2Info.CreateAdapter(true); + } + } + + /// + /// The AssessmentLabelGroups1And2 item info. + /// + [RepositoryItemInfo("41d87314-6a5d-4b48-bb76-cee7c6f57537")] + public virtual RepoItemInfo AssessmentLabelGroups1And2Info + { + get + { + return _assessmentlabelgroups1and2Info; + } + } + + /// + /// The AssessmentProbabilityGroups1And2 item. + /// + [RepositoryItem("1d9add26-2df5-4fe6-b94b-07f83cce63eb")] + public virtual Ranorex.Text AssessmentProbabilityGroups1And2 + { + get + { + return _assessmentprobabilitygroups1and2Info.CreateAdapter(true); + } + } + + /// + /// The AssessmentProbabilityGroups1And2 item info. + /// + [RepositoryItemInfo("1d9add26-2df5-4fe6-b94b-07f83cce63eb")] + public virtual RepoItemInfo AssessmentProbabilityGroups1And2Info + { + get + { + return _assessmentprobabilitygroups1and2Info; + } + } + + /// + /// The AssessmentGroups3And4 item. + /// + [RepositoryItem("82e26559-e7f0-45f2-822d-cb7a9db63950")] + public virtual Ranorex.Text AssessmentGroups3And4 + { + get + { + return _assessmentgroups3and4Info.CreateAdapter(true); + } + } + + /// + /// The AssessmentGroups3And4 item info. + /// + [RepositoryItemInfo("82e26559-e7f0-45f2-822d-cb7a9db63950")] + public virtual RepoItemInfo AssessmentGroups3And4Info + { + get + { + return _assessmentgroups3and4Info; + } + } + } + + /// + /// The TableFolder4 folder. + /// + [RepositoryFolder("4c15a955-c1b0-48c4-bcdc-7150cc96054e")] + public partial class TableFolder4 : RepoGenBaseFolder + { + + /// + /// Creates a new Table folder. + /// + public TableFolder4(RepoGenBaseFolder parentFolder) : + base("Table", "container[@controlname='dataGridViewControl']/table", parentFolder, 30000, null, false, "4c15a955-c1b0-48c4-bcdc-7150cc96054e", "") + { + } + + /// + /// The Self item. + /// + [RepositoryItem("4c15a955-c1b0-48c4-bcdc-7150cc96054e")] + public virtual Ranorex.Table Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("4c15a955-c1b0-48c4-bcdc-7150cc96054e")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + } + + /// + /// The AssemblyResultsCategoryViewFolder folder. + /// + [RepositoryFolder("5c34ec61-2a27-47dd-9034-14bc035f18c4")] + public partial class AssemblyResultsCategoryViewFolder : RepoGenBaseFolder + { + RepoItemInfo _tableInfo; + + /// + /// Creates a new AssemblyResultsCategoryView folder. + /// + public AssemblyResultsCategoryViewFolder(RepoGenBaseFolder parentFolder) : + base("AssemblyResultsCategoryView", "container[@controlname='AssemblyResultCategoriesView']", parentFolder, 30000, null, false, "5c34ec61-2a27-47dd-9034-14bc035f18c4", "") + { + _tableInfo = new RepoItemInfo(this, "Table", "container/container/container/table", 30000, null, "d5f0ab31-e18f-41da-99e1-2baef3b7cc43"); + } + + /// + /// The Self item. + /// + [RepositoryItem("5c34ec61-2a27-47dd-9034-14bc035f18c4")] + public virtual Ranorex.Container Self + { + get + { + return _selfInfo.CreateAdapter(true); + } + } + + /// + /// The Self item info. + /// + [RepositoryItemInfo("5c34ec61-2a27-47dd-9034-14bc035f18c4")] + public virtual RepoItemInfo SelfInfo + { + get + { + return _selfInfo; + } + } + + /// + /// The Table item. + /// + [RepositoryItem("d5f0ab31-e18f-41da-99e1-2baef3b7cc43")] + public virtual Ranorex.Table Table + { + get + { + return _tableInfo.CreateAdapter(true); + } + } + + /// + /// The Table item info. + /// + [RepositoryItemInfo("d5f0ab31-e18f-41da-99e1-2baef3b7cc43")] + public virtual RepoItemInfo TableInfo + { + get + { + return _tableInfo; + } + } + } + + /// /// The DocumentViewContainerFolder folder. /// [RepositoryFolder("78b3cba4-3858-49b9-8809-b7f79f03aa5c")] @@ -4828,15 +5291,15 @@ [RepositoryFolder("93d4e291-937c-4920-ad9f-0e07533582a4")] public partial class FailureMechanismsContributionViewFolder : RepoGenBaseFolder { - AutomatedSystemTestsRepositoryFolders.TableFolder4 _table; + AutomatedSystemTestsRepositoryFolders.TableFolder5 _table; /// /// Creates a new FailureMechanismsContributionView folder. /// public FailureMechanismsContributionViewFolder(RepoGenBaseFolder parentFolder) : base("FailureMechanismsContributionView", "container[@controlname='FailureMechanismContributionView']", parentFolder, 30000, null, false, "93d4e291-937c-4920-ad9f-0e07533582a4", "") { - _table = new AutomatedSystemTestsRepositoryFolders.TableFolder4(this); + _table = new AutomatedSystemTestsRepositoryFolders.TableFolder5(this); } /// @@ -4867,25 +5330,25 @@ /// The Table folder. /// [RepositoryFolder("bac209b8-47a0-49c9-aabb-618dc821852b")] - public virtual AutomatedSystemTestsRepositoryFolders.TableFolder4 Table + public virtual AutomatedSystemTestsRepositoryFolders.TableFolder5 Table { get { return _table; } } } /// - /// The TableFolder4 folder. + /// The TableFolder5 folder. /// [RepositoryFolder("bac209b8-47a0-49c9-aabb-618dc821852b")] - public partial class TableFolder4 : RepoGenBaseFolder + public partial class TableFolder5 : RepoGenBaseFolder { RepoItemInfo _contributioncellInfo; RepoItemInfo _probabilityspacecellInfo; /// /// Creates a new Table folder. /// - public TableFolder4(RepoGenBaseFolder parentFolder) : + public TableFolder5(RepoGenBaseFolder parentFolder) : base("Table", "container[@controlname='probabilityDistributionGrid']/table", parentFolder, 30000, null, false, "bac209b8-47a0-49c9-aabb-618dc821852b", "") { _contributioncellInfo = new RepoItemInfo(this, "ContributionCell", "row[@accessiblevalue~';'+$fmLabel+';']/cell[@accessiblename>'Toegestane bijdrage']", 30000, null, "4b3f7ec4-14c8-42ca-a940-a03d49ae168c"); @@ -5033,7 +5496,7 @@ [RepositoryFolder("d5d31bfe-0545-4bf6-ae8d-2a692de100bd")] public partial class LeftSideFolder1 : RepoGenBaseFolder { - AutomatedSystemTestsRepositoryFolders.TableFolder5 _table; + AutomatedSystemTestsRepositoryFolders.TableFolder6 _table; AutomatedSystemTestsRepositoryFolders.CalculationButtonsFolder1 _calculationbuttons; /// @@ -5042,7 +5505,7 @@ public LeftSideFolder1(RepoGenBaseFolder parentFolder) : base("LeftSide", "container[@controlname='panel1']", parentFolder, 30000, null, false, "d5d31bfe-0545-4bf6-ae8d-2a692de100bd", "") { - _table = new AutomatedSystemTestsRepositoryFolders.TableFolder5(this); + _table = new AutomatedSystemTestsRepositoryFolders.TableFolder6(this); _calculationbuttons = new AutomatedSystemTestsRepositoryFolders.CalculationButtonsFolder1(this); } @@ -5074,7 +5537,7 @@ /// The Table folder. /// [RepositoryFolder("ca96439e-ba37-4ebe-aa7b-19515fb51914")] - public virtual AutomatedSystemTestsRepositoryFolders.TableFolder5 Table + public virtual AutomatedSystemTestsRepositoryFolders.TableFolder6 Table { get { return _table; } } @@ -5090,10 +5553,10 @@ } /// - /// The TableFolder5 folder. + /// The TableFolder6 folder. /// [RepositoryFolder("ca96439e-ba37-4ebe-aa7b-19515fb51914")] - public partial class TableFolder5 : RepoGenBaseFolder + public partial class TableFolder6 : RepoGenBaseFolder { RepoItemInfo _genericrowInfo; RepoItemInfo _checkboxcalculatenthrowInfo; @@ -5103,7 +5566,7 @@ /// /// Creates a new Table folder. /// - public TableFolder5(RepoGenBaseFolder parentFolder) : + public TableFolder6(RepoGenBaseFolder parentFolder) : base("Table", "container/table", parentFolder, 30000, null, false, "ca96439e-ba37-4ebe-aa7b-19515fb51914", "") { _genericrowInfo = new RepoItemInfo(this, "GenericRow", "row[@accessiblename='Row '+$rowIndex]", 30000, null, "8d26c2ea-9826-475b-ba13-7a87660216ce"); @@ -5345,7 +5808,7 @@ [RepositoryFolder("b29993ca-0b96-4e0e-b212-220bcef5fd4f")] public partial class HydraulicBCDunesFolder1 : RepoGenBaseFolder { - AutomatedSystemTestsRepositoryFolders.TableFolder6 _table; + AutomatedSystemTestsRepositoryFolders.TableFolder7 _table; AutomatedSystemTestsRepositoryFolders.CalculationButtonsDAFolder1 _calculationbuttonsda; /// @@ -5354,7 +5817,7 @@ public HydraulicBCDunesFolder1(RepoGenBaseFolder parentFolder) : base("HydraulicBCDunes", "container[@controlname>'Dune']", parentFolder, 30000, null, false, "b29993ca-0b96-4e0e-b212-220bcef5fd4f", "") { - _table = new AutomatedSystemTestsRepositoryFolders.TableFolder6(this); + _table = new AutomatedSystemTestsRepositoryFolders.TableFolder7(this); _calculationbuttonsda = new AutomatedSystemTestsRepositoryFolders.CalculationButtonsDAFolder1(this); } @@ -5386,7 +5849,7 @@ /// The Table folder. /// [RepositoryFolder("7f2e2214-c731-479d-a92c-16e73c0a37a0")] - public virtual AutomatedSystemTestsRepositoryFolders.TableFolder6 Table + public virtual AutomatedSystemTestsRepositoryFolders.TableFolder7 Table { get { return _table; } } @@ -5402,18 +5865,18 @@ } /// - /// The TableFolder6 folder. + /// The TableFolder7 folder. /// [RepositoryFolder("7f2e2214-c731-479d-a92c-16e73c0a37a0")] - public partial class TableFolder6 : RepoGenBaseFolder + public partial class TableFolder7 : RepoGenBaseFolder { RepoItemInfo _genericrowhydraulicbcdunesInfo; RepoItemInfo _cellcalculatedwaterleveldaInfo; /// /// Creates a new Table folder. /// - public TableFolder6(RepoGenBaseFolder parentFolder) : + public TableFolder7(RepoGenBaseFolder parentFolder) : base("Table", "container/table", parentFolder, 30000, null, false, "7f2e2214-c731-479d-a92c-16e73c0a37a0", "") { _genericrowhydraulicbcdunesInfo = new RepoItemInfo(this, "GenericRowHydraulicBCDunes", "row[@accessiblename='Row '+$indexRow]", 30000, null, "73e414b7-73d4-49d0-bf0a-6486e581e805"); @@ -5565,15 +6028,15 @@ [RepositoryFolder("41bb0ddf-7a93-4518-a257-8322f257edf1")] public partial class PropertiesPanelContainerFolder : RepoGenBaseFolder { - AutomatedSystemTestsRepositoryFolders.TableFolder7 _table; + AutomatedSystemTestsRepositoryFolders.TableFolder8 _table; /// /// Creates a new PropertiesPanelContainer folder. /// public PropertiesPanelContainerFolder(RepoGenBaseFolder parentFolder) : base("PropertiesPanelContainer", ".//container[@controlname='PropertiesPanelGridView']", parentFolder, 30000, null, true, "41bb0ddf-7a93-4518-a257-8322f257edf1", "") { - _table = new AutomatedSystemTestsRepositoryFolders.TableFolder7(this); + _table = new AutomatedSystemTestsRepositoryFolders.TableFolder8(this); } /// @@ -5604,17 +6067,17 @@ /// The Table folder. /// [RepositoryFolder("50f9e3b1-cf09-4ca3-8d3c-7edd64e7251e")] - public virtual AutomatedSystemTestsRepositoryFolders.TableFolder7 Table + public virtual AutomatedSystemTestsRepositoryFolders.TableFolder8 Table { get { return _table; } } } /// - /// The TableFolder7 folder. + /// The TableFolder8 folder. /// [RepositoryFolder("50f9e3b1-cf09-4ca3-8d3c-7edd64e7251e")] - public partial class TableFolder7 : RepoGenBaseFolder + public partial class TableFolder8 : RepoGenBaseFolder { RepoItemInfo _isrelevantInfo; RepoItemInfo _genericparametervisibleinprojectexplorerInfo; @@ -5628,7 +6091,7 @@ /// /// Creates a new Table folder. /// - public TableFolder7(RepoGenBaseFolder parentFolder) : + public TableFolder8(RepoGenBaseFolder parentFolder) : base("Table", ".//table[@accessiblename='Properties Window']", parentFolder, 30000, null, true, "50f9e3b1-cf09-4ca3-8d3c-7edd64e7251e", "") { _isrelevantInfo = new RepoItemInfo(this, "IsRelevant", "row[@accessiblename='Is relevant']", 30000, null, "a71a9303-6a79-4eab-86c6-b77f1a561c93"); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rximg =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 Binary files differ Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -589,6 +589,45 @@ /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView'] + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='GroupPanel']/text/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='probabilityPanel']/text/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl'] + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container/container/text/text + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView'] @@ -877,6 +916,98 @@ searchtimeout="30000ms"> /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/?/?/table[@controlname='dataGridView'] + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel']/container[@controlname='totalAssemblyCategoryGroupControl']/container/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel']/container[@controlname='failureMechanismsWithProbabilityAssemblyControl']/container[@controlname='GroupPanel']/text/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel']/container[@controlname='failureMechanismsWithProbabilityAssemblyControl']/container[@controlname='probabilityPanel']/text/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel']/container[@controlname='failureMechanismsWithoutProbabilityAssemblyControl']/container/text + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='assemblyResultGroupBox']/container[@controlname='assemblyResultTableLayoutPanel'] + + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView']/container[@controlname='dataGridViewControl']/table + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='AssemblyResultTotalView'] + + + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultCategoriesView']/container/container/container/table + + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='AssemblyResultCategoriesView'] + + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter'] Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadCombinedAssessmentInformationFMFromResultView.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadCombinedAssessmentInformationFMFromResultView.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadCombinedAssessmentInformationFMFromResultView.cs (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,131 @@ +/* + * Created by Ranorex + * User: rodriqu_dd + * Date: 04/12/2020 + * Time: 18:23 + * + * To change this template use Tools > Options > Coding > Edit standard headers. + */ +using System; +using System.Linq; +using System.Collections.Generic; +using System.Text; +using System.Text.RegularExpressions; +using System.Drawing; +using System.Threading; +using WinForms = System.Windows.Forms; +using Newtonsoft.Json; + +using Ranorex; +using Ranorex.Core; +using Ranorex.Core.Testing; + +namespace AutomatedSystemTests.Modules.ActionsDocumentView +{ + /// + /// Description of ReadCombinedAssessmentPerSectionFromResultView. + /// + [TestModule("0D324E02-5DAE-41D7-8EE9-9352A1327E9C", ModuleType.UserCode, 1)] + public class ReadCombinedAssessmentInformationFMFromResultView : ITestModule + { + + + string _trajectAssessmentInformationString = ""; + [TestVariable("9ac12269-a27c-4f0c-9b29-11857490bb77")] + public string trajectAssessmentInformationString + { + get { return _trajectAssessmentInformationString; } + set { _trajectAssessmentInformationString = value; } + } + + + string _labelFM = ""; + [TestVariable("37288c18-36a9-4f7e-840d-7627a311f6a8")] + public string labelFM + { + get { return _labelFM; } + set { _labelFM = value; } + } + + + /// + /// Constructs a new instance. + /// + public ReadCombinedAssessmentInformationFMFromResultView() + { + // Do not delete - a parameterless constructor is required! + } + + /// + /// Performs the playback of actions in this module. + /// + /// You should not call this method directly, instead pass the module + /// instance to the method + /// that will in turn invoke this method. + void ITestModule.Run() + { + Mouse.DefaultMoveTime = 0; + Keyboard.DefaultKeyPressTime = 0; + Delay.SpeedFactor = 0.0; + var trajectAssessmentInformation = BuildAssessmenTrajectInformation(trajectAssessmentInformationString); + + var repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + var tableResults = repo.RiskeerMainWindow.DocumentViewContainerUncached.FM_ResultView.Table.Self.As(); + var rowsData = tableResults.Rows; + var rowHeader = rowsData[0]; + + int indexName = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Vak"); + int indexCombinedAssessmentLabel = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Toetsoordeel\r\ngecombineerd"); + int indexCombinedAssessmentProbability = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Toetsoordeel\r\ngecombineerde\r\nfaalkansschatting"); + + var currentFMAssessmentInformation = trajectAssessmentInformation.ListFMsAssessmentInformation.Where(fmItem=>fmItem.Label==labelFM).FirstOrDefault(); + + int rowIndex = 0; + rowsData.RemoveAt(0); + foreach (var row in rowsData) { + var cellsDataInRow = row.Cells.ToList(); + currentFMAssessmentInformation.SectionList[rowIndex].CombinedAssessmentLabel = cellsDataInRow[indexCombinedAssessmentLabel].Element.GetAttributeValueText("AccessibleValue"); + if (indexCombinedAssessmentProbability!=-1) + { + currentFMAssessmentInformation.SectionList[rowIndex].CombinedAssessmentProbability = cellsDataInRow[indexCombinedAssessmentProbability].Element.GetAttributeValueText("AccessibleValue"); + } + rowIndex++; + } + var resultView = repo.RiskeerMainWindow.DocumentViewContainerUncached.FM_ResultView; + if (indexCombinedAssessmentProbability!=-1) { + currentFMAssessmentInformation.AssessmentLabel = resultView.AssemblyWithProb.Label.TextValue; + currentFMAssessmentInformation.AssessmentProbability = resultView.AssemblyWithProb.Probability.TextValue; + } else { + currentFMAssessmentInformation.AssessmentLabel = resultView.LabelNoProb.TextValue; + } + trajectAssessmentInformationString = JsonConvert.SerializeObject(trajectAssessmentInformation, Formatting.Indented); + Report.Log(ReportLevel.Info, trajectAssessmentInformationString); + } + + private TrajectAssessmentInformation BuildAssessmenTrajectInformation(string trajectAssessmentInformationString) + { + TrajectAssessmentInformation trajectAssessmentInformation; + if (trajectAssessmentInformationString=="") { + trajectAssessmentInformation = new TrajectAssessmentInformation(); + } else { + var error = false; + trajectAssessmentInformation = JsonConvert.DeserializeObject(trajectAssessmentInformationString, new JsonSerializerSettings + { + Error = (s, e) => + { + error = true; + e.ErrorContext.Handled = true; + } + } + ); + if (error==true) { + + Report.Log(ReportLevel.Error, "error unserializing json string for trajectAssessmentInformationString: " + trajectAssessmentInformationString); + } + + } + return trajectAssessmentInformation; + } + + } +} Fisheye: Tag 3e35ac8865d3303751def1967203a03dca8f6f74 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadCombinedAssessmentPerSectionFromResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadDataCategoryBoundariesTrajectView.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadDataCategoryBoundariesTrajectView.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadDataCategoryBoundariesTrajectView.cs (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,90 @@ +/* + * Created by Ranorex + * User: rodriqu_dd + * Date: 07/12/2020 + * Time: 09:16 + * + * To change this template use Tools > Options > Coding > Edit standard headers. + */ +using System; +using System.Linq; +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; + +namespace AutomatedSystemTests.Modules.ActionsDocumentView +{ + /// + /// Description of ReadDataCategoryBoundariesTrajectView. + /// + [TestModule("2078E4E4-9E0D-4396-A14A-8D19B9465BCA", ModuleType.UserCode, 1)] + public class ReadDataCategoryBoundariesTrajectView : ITestModule + { + + + string _categoryBoundariesTraject = ""; + [TestVariable("3848b12b-0450-4651-8089-385b98ccb5db")] + public string categoryBoundariesTraject + { + get { return _categoryBoundariesTraject; } + set { _categoryBoundariesTraject = value; } + } + + /// + /// Constructs a new instance. + /// + public ReadDataCategoryBoundariesTrajectView() + { + // Do not delete - a parameterless constructor is required! + } + + /// + /// Performs the playback of actions in this module. + /// + /// You should not call this method directly, instead pass the module + /// instance to the method + /// that will in turn invoke this method. + void ITestModule.Run() + { + Mouse.DefaultMoveTime = 0; + Keyboard.DefaultKeyPressTime = 0; + Delay.SpeedFactor = 0.0; + + var repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + var tableCategoryBoundariesTraject = repo.RiskeerMainWindow.DocumentViewContainerUncached.AssemblyResultsCategoryView.Table; + + int idxColumn = 3; + for (int indexRow = 2; indexRow < 7; indexRow++) { + string fraction = tableCategoryBoundariesTraject.Rows[indexRow].Cells[idxColumn].Element.GetAttributeValueText("AccessibleValue"); + categoryBoundariesTraject += fraction + ";"; + } + categoryBoundariesTraject = categoryBoundariesTraject.TrimEnd(';'); + } + + private string GetBackgroundColorOfCell(Table table, int rowIndex, int columnIndex) + { + Ranorex.Control tableCtrl = (Ranorex.Control) table.Element; + + // Invoke Remotely + string colorOfCell = (string)tableCtrl.InvokeRemotely( delegate(System.Windows.Forms.Control control, object input) + { + System.Windows.Forms.DataGridView dataGrid = (System.Windows.Forms.DataGridView) control; + // Now you can access each cell: + Color color = dataGrid.Rows[rowIndex].Cells[columnIndex].Style.BackColor; + Console.WriteLine("Color: "+color); + return color.ToString(); + } + ); + + Report.Info("Color of Cell: "+colorOfCell); + return colorOfCell; + } + } +} Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadSectionsDivisionsFromSectionsView.cs =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadSectionsDivisionsFromSectionsView.cs (.../ReadSectionsDivisionsFromSectionsView.cs) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadSectionsDivisionsFromSectionsView.cs (.../ReadSectionsDivisionsFromSectionsView.cs) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -14,6 +14,7 @@ using System.Drawing; using System.Threading; using WinForms = System.Windows.Forms; +using Newtonsoft.Json; using Ranorex; using Ranorex.Core; @@ -29,15 +30,33 @@ { - string _stringDataTable = ""; - [TestVariable("89baf06e-3128-406f-92f0-3478857af297")] - public string stringDataTable + string _trajectAssessmentInformation = ""; + [TestVariable("b4271fc1-5724-4698-85e2-3434ee79f78f")] + public string trajectAssessmentInformationString { - get { return _stringDataTable; } - set { _stringDataTable = value; } + get { return _trajectAssessmentInformation; } + set { _trajectAssessmentInformation = value; } } + string _labelFM = ""; + [TestVariable("f6ff4e12-a192-49bd-9f9e-85c8899a2f7b")] + public string labelFM + { + get { return _labelFM; } + set { _labelFM = value; } + } + + + string _groupFM = ""; + [TestVariable("7d468079-12d4-43ac-bd2c-bf6ec1396763")] + public string groupFM + { + get { return _groupFM; } + set { _groupFM = value; } + } + + /// /// Constructs a new instance. /// @@ -58,25 +77,161 @@ Keyboard.DefaultKeyPressTime = 0; Delay.SpeedFactor = 0; + var trajectAssessmentInformation = BuildAssessmenTrajectInformation(trajectAssessmentInformationString); var repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; - var tableSectionsDivisions = repo.RiskeerMainWindow.DocumentViewContainerUncached.TableVakindeling; + var rowsData = tableSectionsDivisions.Rows; - rowsData.RemoveAt(0); - string tableData = ""; + // Indeces of the properties of the section. + Row rowHeader = rowsData[0]; + int indexName = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Vaknaam"); + int indexStartDistance = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Metrering van* [m]"); + int indexEndDistance = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Metrering tot* [m]"); + int indexLength = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Lengte* [m]"); + int indexNVak = rowHeader.Cells.ToList().FindIndex(c => c.Element.GetAttributeValueText("AccessibleValue")=="Nvak* [-]"); + rowsData.RemoveAt(0); + FailureMechanismAssessmentInformation fmAssessmentInformation = + new FailureMechanismAssessmentInformation(); + fmAssessmentInformation.Label = labelFM; + fmAssessmentInformation.Group = Int32.Parse(groupFM); foreach (var row in rowsData) { var cellsDataInRow = row.Cells.ToList(); - tableData += "["; - for (int i = 1; i < 4; i++) { - var cellCurrent = cellsDataInRow[i]; - cellCurrent.Select(); - tableData += cellCurrent.Element.GetAttributeValueText("AccessibleValue") + ";"; + Section section = new Section(); + cellsDataInRow[indexName].Select(); + section.Name = cellsDataInRow[indexName].Element.GetAttributeValueText("AccessibleValue"); + cellsDataInRow[indexStartDistance].Select(); + section.StartDistance = Double.Parse(cellsDataInRow[indexStartDistance].Element.GetAttributeValueText("AccessibleValue")); + cellsDataInRow[indexEndDistance].Select(); + section.EndDistance = Double.Parse(cellsDataInRow[indexEndDistance].Element.GetAttributeValueText("AccessibleValue")); + cellsDataInRow[indexLength].Select(); + section.Length = Double.Parse(cellsDataInRow[indexLength].Element.GetAttributeValueText("AccessibleValue")); + if (indexNVak!=-1) { + cellsDataInRow[indexNVak].Select(); + section.Nvak = Double.Parse(cellsDataInRow[indexNVak].Element.GetAttributeValueText("AccessibleValue")); } - tableData = tableData.TrimEnd(';') + "]*"; + fmAssessmentInformation.SectionList.Add(section); } - stringDataTable += tableData.TrimEnd('*') + "|"; + // Information for this FM not existing yet + trajectAssessmentInformation.ListFMsAssessmentInformation.Add(fmAssessmentInformation); + trajectAssessmentInformationString = JsonConvert.SerializeObject(trajectAssessmentInformation, Formatting.Indented); + Report.Log(ReportLevel.Info, "Done!"); } + + private TrajectAssessmentInformation BuildAssessmenTrajectInformation(string trajectAssessmentInformationString) + { + TrajectAssessmentInformation trajectAssessmentInformation; + if (trajectAssessmentInformationString=="") { + trajectAssessmentInformation = new TrajectAssessmentInformation(); + } else { + var error = false; + trajectAssessmentInformation = JsonConvert.DeserializeObject(trajectAssessmentInformationString, new JsonSerializerSettings + { + Error = (s, e) => + { + error = true; + e.ErrorContext.Handled = true; + } + } + ); + if (error==true) { + + Report.Log(ReportLevel.Error, "error unserializing json string for trajectAssessmentInformationString: " + trajectAssessmentInformationString); + } + + } + return trajectAssessmentInformation; + } } + + + /// + /// A section (vak) is a subdivision of a traject. The set of sections is independent for each FM. + /// + public class Section + { + public Section() + { + this.CombinedAssessmentProbability ="-"; + this.CombinedAssessmentLabel = ""; + this.Nvak = Double.NaN; + } + + /// + /// Label for the combined assessment of the section (Iv, IIv, IIIv, ...) + /// + public string CombinedAssessmentLabel {get; set;} + + /// + /// Probability associated to the combined assessment of the section (it exists for some FMs). + /// + public string CombinedAssessmentProbability {get; set;} + + /// + /// The name of the section (vak). + /// + public string Name {get; set;} + + /// + /// The distance along the reference line at which the setion starts. + /// + public double StartDistance {get; set;} + + /// + /// The distance along the reference line at which the setion ends. + /// + public double EndDistance {get; set;} + + /// + /// The length of the section along the reference line. + /// + public double Length {get; set;} + + /// + /// The value of the parameter NVak, if it exists. + /// + public double Nvak {get; set;} + + } + + public class FailureMechanismAssessmentInformation + { + public FailureMechanismAssessmentInformation() + { + this.SectionList = new List
(); + this.AssessmentProbability = "-"; + } + + /// + /// Label fo the FM + /// + public string Label{get; set;} + + /// + /// The group to which the FM belongs. + /// + public int Group {get; set;} + + /// + /// The label for the assessment of this FM regarding the entire traject (It, IIt, ..., VIIt) + /// + public string AssessmentLabel {get; set;} + + /// + /// The probability assigned to the entire traject assessment, if this value exists. + /// + public string AssessmentProbability {get; set;} + + public List
SectionList {get; set;} + } + + public class TrajectAssessmentInformation + { + public TrajectAssessmentInformation() + { + ListFMsAssessmentInformation = new List(); + } + public List ListFMsAssessmentInformation {get; set;} + } } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateAssemblyTrajectView.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateAssemblyTrajectView.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateAssemblyTrajectView.cs (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,173 @@ +/* + * Created by Ranorex + * User: rodriqu_dd + * Date: 06/12/2020 + * Time: 18:42 + * + * To change this template use Tools > Options > Coding > Edit standard headers. + */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Drawing; +using System.Threading; +using WinForms = System.Windows.Forms; +using Newtonsoft.Json; +using Ranorex; +using Ranorex.Core; +using Ranorex.Core.Testing; + +namespace AutomatedSystemTests.Modules.ActionsDocumentView +{ + /// + /// Description of ValidateAssemblyTrajectView. + /// + [TestModule("38D69B05-5CA8-43A0-AFCF-16D6DF183738", ModuleType.UserCode, 1)] + public class ValidateAssemblyTrajectView : ITestModule + { + + + string _trajectAssessmentInformationString = ""; + [TestVariable("4188b6a9-c5aa-4416-9731-a4fba6fa5dbb")] + public string trajectAssessmentInformationString + { + get { return _trajectAssessmentInformationString; } + set { _trajectAssessmentInformationString = value; } + } + + + string _categoryBoundariesTraject = ""; + [TestVariable("fb2221fa-c3ce-41c4-a074-6e2cbece5657")] + public string categoryBoundariesTraject + { + get { return _categoryBoundariesTraject; } + set { _categoryBoundariesTraject = value; } + } + + + /// + /// Constructs a new instance. + /// + public ValidateAssemblyTrajectView() + { + // Do not delete - a parameterless constructor is required! + } + + /// + /// Performs the playback of actions in this module. + /// + /// You should not call this method directly, instead pass the module + /// instance to the method + /// that will in turn invoke this method. + void ITestModule.Run() + { + Mouse.DefaultMoveTime = 0; + Keyboard.DefaultKeyPressTime = 0; + Delay.SpeedFactor = 0.0; + + var trajectAssessmentInformation = BuildAssessmenTrajectInformation(trajectAssessmentInformationString); + var listAssembliesFMs = trajectAssessmentInformation.ListFMsAssessmentInformation; + var repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + + var table = repo.RiskeerMainWindow.DocumentViewContainerUncached.AssemblyResult.Table.Self; + ValidateTableAssemblyTrajectView(table, trajectAssessmentInformation); + + + + + } + + private void ValidateTableAssemblyTrajectView(Table table, TrajectAssessmentInformation trajectAssessmentInfo) + { + var headerRow = table.Rows[0]; + int indexLabel = GetIndex(headerRow, "Label"); + int indexGroup = GetIndex(headerRow, "Groep"); + int indexAssessmentLabel = GetIndex(headerRow, "Toetsoordeel"); + int indexAssessmentProb = GetIndex(headerRow, "Benaderde"); + + for (int i = 1; i < table.Rows.Count; i++) { + var row = table.Rows[i]; + row.Cells[indexLabel].Select(); + string currentFM = GetAV(row.Cells[indexLabel]); + var assInfo = trajectAssessmentInfo.ListFMsAssessmentInformation.Where(ai=>ai.Label==currentFM).FirstOrDefault(); + if (assInfo!=null) { + Report.Info("Validation for FM = " + currentFM); + Report.Info("Validating group..."); + row.Cells[indexGroup].Select(); + Validate.AreEqual(GetAV(row.Cells[indexGroup]), assInfo.Group); + Report.Info("Validating assessment label..."); + row.Cells[indexAssessmentLabel].Select(); + Validate.AreEqual(GetAV(row.Cells[indexAssessmentLabel]), assInfo.AssessmentLabel); + //if (assInfo.Group==1 || assInfo==2) { + Report.Info("Validating (approx.) probability of failure..."); + row.Cells[indexAssessmentProb].Select(); + Validate.AreEqual(GetAV(row.Cells[indexAssessmentProb]), assInfo.AssessmentProbability); + //} + } + + } + } + + /// + /// Returns accessible value of a cell + /// + /// Cell for which the accessible value is returned. + /// The accessible value fo teh cell. + private string GetAV(Cell cl) + { + return cl.Element.GetAttributeValueText("AccessibleValue"); + } + + private int GetIndex(Row row, string name) + { + return row.Cells.ToList().FindIndex(cl=>GetAV(cl).Contains(name)); + } + + private TrajectAssessmentInformation BuildAssessmenTrajectInformation(string trajectAssessmentInformationString) + { + TrajectAssessmentInformation trajectAssessmentInformation; + if (trajectAssessmentInformationString=="") { + trajectAssessmentInformation = new TrajectAssessmentInformation(); + } else { + var error = false; + trajectAssessmentInformation = JsonConvert.DeserializeObject(trajectAssessmentInformationString, new JsonSerializerSettings + { + Error = (s, e) => + { + error = true; + e.ErrorContext.Handled = true; + } + } + ); + if (error==true) { + + Report.Log(ReportLevel.Error, "error unserializing json string for trajectAssessmentInformationString: " + trajectAssessmentInformationString); + } + + } + return trajectAssessmentInformation; + } + + private string GetBackgroundColorOfCell(Table table, int rowIndex, int columnIndex) + { + Ranorex.Control tableCtrl = (Ranorex.Control) table.Element; + + // Invoke Remotely + string colorOfCell = (string)tableCtrl.InvokeRemotely( delegate(System.Windows.Forms.Control control, object input) + { + System.Windows.Forms.DataGridView dataGrid = (System.Windows.Forms.DataGridView) control; + // Now you can access each cell: + Color color = dataGrid.Rows[rowIndex].Cells[columnIndex].Style.BackColor; + Console.WriteLine("Color: "+color); + return color.ToString(); + } + ); + + Report.Info("Color of Cell: "+colorOfCell); + + return colorOfCell; + } + } +} Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateSectionsCombinationsView.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateSectionsCombinationsView.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateSectionsCombinationsView.cs (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,91 @@ +/* + * Created by Ranorex + * User: rodriqu_dd + * Date: 06/12/2020 + * Time: 18:44 + * + * To change this template use Tools > Options > Coding > Edit standard headers. + */ +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 Newtonsoft.Json; + +using Ranorex; +using Ranorex.Core; +using Ranorex.Core.Testing; + +namespace AutomatedSystemTests.Modules.ActionsDocumentView +{ + /// + /// Description of ValidateSectionsCombinationsView. + /// + [TestModule("4AEF939A-35A6-4173-A921-C521453B760A", ModuleType.UserCode, 1)] + public class ValidateSectionsCombinationsView : ITestModule + { + + + string _trajectAssessmentInformationString = ""; + [TestVariable("5dda9c28-3af1-49bc-b8d6-81c994d32f4d")] + public string trajectAssessmentInformationString + { + get { return _trajectAssessmentInformationString; } + set { _trajectAssessmentInformationString = value; } + } + + + /// + /// Constructs a new instance. + /// + public ValidateSectionsCombinationsView() + { + // Do not delete - a parameterless constructor is required! + } + + /// + /// Performs the playback of actions in this module. + /// + /// You should not call this method directly, instead pass the module + /// instance to the method + /// that will in turn invoke this method. + void ITestModule.Run() + { + Mouse.DefaultMoveTime = 0; + Keyboard.DefaultKeyPressTime = 0; + Delay.SpeedFactor = 0.0; + + var trajectAssessmentInformation = BuildAssessmenTrajectInformation(trajectAssessmentInformationString); + var repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + + } + + private TrajectAssessmentInformation BuildAssessmenTrajectInformation(string trajectAssessmentInformationString) + { + TrajectAssessmentInformation trajectAssessmentInformation; + if (trajectAssessmentInformationString=="") { + trajectAssessmentInformation = new TrajectAssessmentInformation(); + } else { + var error = false; + trajectAssessmentInformation = JsonConvert.DeserializeObject(trajectAssessmentInformationString, new JsonSerializerSettings + { + Error = (s, e) => + { + error = true; + e.ErrorContext.Handled = true; + } + } + ); + if (error==true) { + + Report.Log(ReportLevel.Error, "error unserializing json string for trajectAssessmentInformationString: " + trajectAssessmentInformationString); + } + + } + return trajectAssessmentInformation; + } + } +} Index: System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -42049,6 +42049,9 @@ + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/SlowTestCases.rxtst =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/SlowTestCases.rxtst (.../SlowTestCases.rxtst) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/SlowTestCases.rxtst (.../SlowTestCases.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -21267,6 +21267,9 @@ + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst (.../VerySlowTestCases.rxtst) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/VerySlowTestCases.rxtst (.../VerySlowTestCases.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -10544,6 +10544,9 @@ + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressCarlos.rxtst =================================================================== diff -u -r717f57961d3fc89067f58af637a3a386b96206aa -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressCarlos.rxtst (.../WorkInProgressCarlos.rxtst) (revision 717f57961d3fc89067f58af637a3a386b96206aa) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressCarlos.rxtst (.../WorkInProgressCarlos.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -343,6 +343,9 @@ + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressSylvia.rxtst =================================================================== diff -u -re681496bea8008b0f75608c25200bcd4a7d0f58c -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressSylvia.rxtst (.../WorkInProgressSylvia.rxtst) (revision e681496bea8008b0f75608c25200bcd4a7d0f58c) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/WorkInProgressSylvia.rxtst (.../WorkInProgressSylvia.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -51,6 +51,9 @@ + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst =================================================================== diff -u -r13d645c4db236e7750ce8db981b13923297ce4cc -r3e35ac8865d3303751def1967203a03dca8f6f74 --- System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst (.../WorkOnProgressDavid.rxtst) (revision 13d645c4db236e7750ce8db981b13923297ce4cc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/WorkOnProgressDavid.rxtst (.../WorkOnProgressDavid.rxtst) (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -2,6 +2,12 @@ + + @@ -12,14 +18,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,20 +255,54 @@ + + + + + + + + + + + + + + + name="ReadCombinedAssessmentInformationForFM"> + + - - - - - - + id="756de3f4-c491-466b-bcf1-6e24d5d16a0b" + name="CreateScreenshotDocumentView" + ref="8badabce-c10f-42fb-a575-8d9ad473c375" + type="Recording"> + + + + @@ -309,33 +411,16 @@ value="22"> + name="trajectAssessmentInformation" + value=""> + name="categoryBoundariesTraject" + value=""> - - - - - - - - + name="c)AssemblingSectionsCombination"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + variableid="b4271fc1-5724-4698-85e2-3434ee79f78f" + variablename="trajectAssessmentInformationString"> + + + + + + + + + + + + + + + + + + + + + name="TakeScreenshot"> + + + + + + @@ -613,10 +832,34 @@ + + + + + + + + + + + + + + + + + + + + + + + name="TakeScreenshot"> @@ -791,10 +1058,10 @@ + name="ReadCombinedAssessmentInformationForFM"> + id="5260a109-50b5-4a8c-a25d-eeb0fdd2e93b" + name="ReadCombinedAssessmentInformationFMFromResultView"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + name="c)AssemblingSectionsCombination"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pathToVakindelingInProjectExplorer + + group + @@ -864,6 +1270,9 @@
+ + + + + +
pathToVakindelingInProjectExplorer + group +
@@ -878,6 +1287,9 @@ Traject 50-1>Dijken en dammen - Piping>Invoer>Vakindeling + 2 +
@@ -892,6 +1304,9 @@ Traject 50-1>Dijken en dammen - Grasbekleding erosie kruin en binnentalud>Invoer>Vakindeling + 1 +
@@ -906,6 +1321,9 @@ Traject 50-1>Dijken en dammen - Microstabiliteit>Invoer>Vakindeling + 4 +
@@ -920,6 +1338,9 @@ Traject 50-1>Dijken en dammen - Stabiliteit steenzetting>Invoer>Vakindeling + 3 +
@@ -934,6 +1355,9 @@ Traject 50-1>Kunstwerken - Betrouwbaarheid sluiting kunstwerk>Invoer>Vakindeling + 1 +
@@ -943,21 +1367,45 @@ + id="04b251ac-8df1-4c85-855e-73c7e6bb166d"> + + + + + + + + + + + + + + + + + + + id="ab9d3646-a5e8-49cc-8479-ef2fe16035e9"> + + + + + + + + + + + + + + + + + + + + + Newtonsoft.Json.dll + + Ranorex Automation Helpers.dll Index: System tests/AutomatedSystemTests/AutomatedSystemTests/packages.config =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/packages.config (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/packages.config (revision 3e35ac8865d3303751def1967203a03dca8f6f74) @@ -0,0 +1,4 @@ + + + + \ No newline at end of file