Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj =================================================================== diff -u -r9d847b65f86f90b15a7e115b6967ec4ce7b20c78 -ree06e25200d6cf77e0e3aa24900367550776b941 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 9d847b65f86f90b15a7e115b6967ec4ce7b20c78) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -444,21 +444,12 @@ 23adba43-d378-47bd-b172-3cb96cb42187 + + d2419161-241f-4ece-8633-548539a41aca + 7d817ded-00c9-4649-b93d-66f4b86400b6 - - CalculateSectionCategoryBoundary.rxrec - true - e6e89825-6bd5-445d-a2b3-c5c8a0cdc970 - 19cd184f-d473-437a-9fd5-c592a2f61743 - - - CalculateSectionCategoryBoundary.rxrec - true - 6217e391-5ede-44c5-97f8-aa4b0d6a63b0 - 19cd184f-d473-437a-9fd5-c592a2f61743 - 73ecd7bc-dfc1-425d-88b2-c8e4648b302c @@ -561,18 +552,6 @@ 3508caa8-41c7-4a29-b095-c69ec2c6f45b 59d3b275-2ad2-49f7-81c7-3af9ffd72495 - - CalculatePathInPropertiesPanelOfBoundaryCategory.rxrec - true - baec6999-9bb8-4ef5-990c-cdf55ac97b71 - ead7dbbc-6b97-49df-999c-7ea29e40cd4c - - - CalculatePathInPropertiesPanelOfBoundaryCategory.rxrec - true - 4a953aa8-5f5c-4bf0-92db-7ab2d99cd6ac - ead7dbbc-6b97-49df-999c-7ea29e40cd4c - CalculateValueParameterN.rxrec true @@ -1581,18 +1560,9 @@ 0ff1e861-1102-41de-9f2b-90d77af2f13f 98d503cc-6c1d-4e11-b39c-823ac4106391 - - ValidateSectionCategoryBoundaryInDocumentView.rxrec - true - 311a55ef-b84d-4ae2-89cd-1f81897d4107 - 28e8d2ac-8496-492c-bd67-c05dd0310839 + + 452096ad-9aec-4f1f-b5b9-5a9f507ce492 - - ValidateSectionCategoryBoundaryInDocumentView.rxrec - true - 42cfd11f-b1b1-4fec-bfb1-b648b87e1bcf - 28e8d2ac-8496-492c-bd67-c05dd0310839 - ValidateContributionInFailureMechanismContributionView.rxrec true @@ -1758,18 +1728,6 @@ 89cc3807-c64e-4752-aaf6-996a110e3a06 - - ValidateCategoryBoundaryInPropertiesPanel.rxrec - true - f617a859-903d-4326-a423-a5b02bf60a59 - 772256b0-c236-4c14-95ed-d0682f4b713d - - - ValidateCategoryBoundaryInPropertiesPanel.rxrec - true - d7fac196-e1dd-4d34-ad29-fa17def25d19 - 772256b0-c236-4c14-95ed-d0682f4b713d - ValidateDoubleValueParameterCurrentlyShownInPropertiesPanel.rxrec true @@ -2267,11 +2225,6 @@ 1a2c2ff6-3175-4621-8731-c6b45579fc0c 909ea538-c662-4239-a56a-672c6d28b694 - - 8b6648ca-2429-462f-8074-96184700bbed - 19cd184f-d473-437a-9fd5-c592a2f61743 - b235cebd-3495-47c7-96d9-f82c3092f4cb - 8b6648ca-2429-462f-8074-96184700bbed 0d625f89-ffec-435d-9b39-d07be9cf66b5 @@ -2292,11 +2245,6 @@ 59d3b275-2ad2-49f7-81c7-3af9ffd72495 cd64e64b-746a-4846-8490-369760278039 - - 8b6648ca-2429-462f-8074-96184700bbed - ead7dbbc-6b97-49df-999c-7ea29e40cd4c - 6fcd729a-b24a-42d7-8636-f8d75a283109 - 8b6648ca-2429-462f-8074-96184700bbed 169d05de-10e4-4de8-a1e7-b20d6b35e438 @@ -2702,11 +2650,6 @@ 98d503cc-6c1d-4e11-b39c-823ac4106391 5f11c431-c5f5-43ed-9e90-4eb9ec533e75 - - 8b6648ca-2429-462f-8074-96184700bbed - 28e8d2ac-8496-492c-bd67-c05dd0310839 - b8095d4b-9eb5-467b-976f-5811b54836f6 - 8b6648ca-2429-462f-8074-96184700bbed 45ca3cad-b4eb-4830-b715-695e59a034fc @@ -2772,11 +2715,6 @@ 4b53e680-197b-47b4-82d7-5157b394bfcb 2e0e4b2f-fccc-42ef-a61e-1a1da4acd8e3 - - 8b6648ca-2429-462f-8074-96184700bbed - 772256b0-c236-4c14-95ed-d0682f4b713d - 80ee3780-ce84-4fd2-bf57-10594c61bb9b - 8b6648ca-2429-462f-8074-96184700bbed 86cc1123-5b93-4182-acb0-1f14fa8feca8 Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -r9d847b65f86f90b15a7e115b6967ec4ce7b20c78 -ree06e25200d6cf77e0e3aa24900367550776b941 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 9d847b65f86f90b15a7e115b6967ec4ce7b20c78) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -2140,7 +2140,6 @@ AutomatedSystemTestsRepositoryFolders.ViewCategoryBoundariesFolder _viewcategoryboundaries; AutomatedSystemTestsRepositoryFolders.DesignWaterLevelCalculationsViewFolder _designwaterlevelcalculationsview; AutomatedSystemTestsRepositoryFolders.HydraulicBCDunesFolder _hydraulicbcdunes; - RepoItemInfo _insidedocument_isfmrelevantcellInfo; RepoItemInfo _btndialogInfo; RepoItemInfo _dropdownbuttoninrowpropertiespanelInfo; @@ -2154,7 +2153,6 @@ _viewcategoryboundaries = new AutomatedSystemTestsRepositoryFolders.ViewCategoryBoundariesFolder(this); _designwaterlevelcalculationsview = new AutomatedSystemTestsRepositoryFolders.DesignWaterLevelCalculationsViewFolder(this); _hydraulicbcdunes = new AutomatedSystemTestsRepositoryFolders.HydraulicBCDunesFolder(this); - _insidedocument_isfmrelevantcellInfo = new RepoItemInfo(this, "insideDocument_IsFMRelevantCell", ".//container[@controlname='FailureMechanismContributionView']/?/table/row[@accessiblevalue~$labelFM]/cell[@accessiblename>'Is relevant']", 30000, null, "db215a7f-7857-4f38-b16c-d96366f08703"); _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"); } @@ -2184,30 +2182,6 @@ } /// - /// The insideDocument_IsFMRelevantCell item. - /// - [RepositoryItem("db215a7f-7857-4f38-b16c-d96366f08703")] - public virtual Ranorex.Cell insideDocument_IsFMRelevantCell - { - get - { - return _insidedocument_isfmrelevantcellInfo.CreateAdapter(true); - } - } - - /// - /// The insideDocument_IsFMRelevantCell item info. - /// - [RepositoryItemInfo("db215a7f-7857-4f38-b16c-d96366f08703")] - public virtual RepoItemInfo insideDocument_IsFMRelevantCellInfo - { - get - { - return _insidedocument_isfmrelevantcellInfo; - } - } - - /// /// The BtnDialog item. /// [RepositoryItem("cefba828-ea6b-4e9d-a97a-641324e9af42")] @@ -2520,7 +2494,7 @@ /// Creates a new CategoryBoundariesTraject folder. /// public CategoryBoundariesTrajectFolder(RepoGenBaseFolder parentFolder) : - base("CategoryBoundariesTraject", "?/container[@controlname='failureMechanismAssemblyGroupBox']/?/table", parentFolder, 30000, null, false, "4745d840-a581-449e-847e-f550c8da8ab1", "") + base("CategoryBoundariesTraject", "container[@controlname='tableLayoutPanel']/container[@controlname='failureMechanismAssemblyGroupBox']/container/table", parentFolder, 30000, null, false, "4745d840-a581-449e-847e-f550c8da8ab1", "") { _trajectcategoryboundarycellInfo = new RepoItemInfo(this, "TrajectCategoryBoundaryCell", "row[@accessiblevalue>$categoryName]/cell[@accessiblename>$boundaryTypeSubstring]", 30000, null, "7a00fb5d-66a4-40e8-8a63-145f885e2cc1"); } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -r9d847b65f86f90b15a7e115b6967ec4ce7b20c78 -ree06e25200d6cf77e0e3aa24900367550776b941 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 9d847b65f86f90b15a7e115b6967ec4ce7b20c78) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -363,15 +363,6 @@ refimgid="e107b55a-b2a7-42e5-ad21-443242438546" searchtimeout="30000ms" usecache="False"> - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']//container[@controlname='FailureMechanismContributionView']/?/table/row[@accessiblevalue~$labelFM]/cell[@accessiblename>'Is relevant'] - - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/?/container[@controlname='failureMechanismAssemblyGroupBox']/?/table/row[@accessiblevalue>$categoryName]/cell[@accessiblename>$boundaryTypeSubstring] + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/container[@controlname='tableLayoutPanel']/container[@controlname='failureMechanismAssemblyGroupBox']/container/table/row[@accessiblevalue>$categoryName]/cell[@accessiblename>$boundaryTypeSubstring] - /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/?/container[@controlname='failureMechanismAssemblyGroupBox']/?/table + /form[@automationid='RiskeerMainWindow']/?/container[10]/container[@controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismAssemblyCategoriesView']/container[@controlname='tableLayoutPanel']/container[@controlname='failureMechanismAssemblyGroupBox']/container/table @@ -58,6 +58,15 @@ + + + + + + Options > Coding > Edit standard headers. + */ +using System; +using System.Globalization; +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.Calculation +{ + /// + /// Description of CalculateExpectedCategoriesBoundaries. + /// + [TestModule("CC703AD4-BBC5-4365-A154-3F7C69272854", ModuleType.UserCode, 1)] + public class CalculateExpectedCategoriesBoundaries : ITestModule + { + + string _expectedCategoriesBoundaries = ""; + [TestVariable("75c8278d-537e-4ed7-93e8-482b42700784")] + public string expectedCategoriesBoundaries + { + get { return _expectedCategoriesBoundaries; } + set { _expectedCategoriesBoundaries = value; } + } + + string _signalingValueText = ""; + [TestVariable("9729ee64-46b0-4724-8fb5-0622c4848710")] + public string signalingValueText + { + get { return _signalingValueText; } + set { _signalingValueText = value; } + } + + string _lowerLimitText = ""; + [TestVariable("e245e13a-797a-4e56-9da6-b6f4b788d7a6")] + public string lowerLimitText + { + get { return _lowerLimitText; } + set { _lowerLimitText = value; } + } + + string _contributionText = ""; + [TestVariable("6a695e78-69fe-4c10-94a2-e36d73f3974a")] + public string contributionText + { + get { return _contributionText; } + set { _contributionText = value; } + } + + string _parameterNText = ""; + [TestVariable("dcab1944-8539-41ad-b5f4-a46596d4879a")] + public string parameterNText + { + get { return _parameterNText; } + set { _parameterNText = value; } + } + + + + /// + /// Constructs a new instance. + /// + public CalculateExpectedCategoriesBoundaries() + { + // 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; + + List boundaryTypeCollection= new List { + "Onder", + "Boven" + }; + + List categoryNameCollection= new List { + "I", + "II", + "III", + "IV", + "V", + "VI" + }; + + List categoryTypeCollection= new List { + "t", + "v" + }; + + expectedCategoriesBoundaries =""; + + foreach (string categoryType in categoryTypeCollection) { + foreach (string categoryName in categoryNameCollection) { + foreach (string boundaryType in boundaryTypeCollection) { + expectedCategoriesBoundaries += CalculateSingleCategoryBoundary(signalingValueText, lowerLimitText, contributionText, parameterNText, boundaryType, categoryName, categoryType) + ";"; + } + } + } + expectedCategoriesBoundaries = expectedCategoriesBoundaries.TrimEnd(';'); + } + + private string CalculateSingleCategoryBoundary(string signalingValueText, string lowerLimitText, string contributionText, string parameterNText, string boundaryType, string categoryName, string categorySuffix) + { + System.Globalization.CultureInfo currentCulture = CultureInfo.CurrentCulture; + string lowerLimitDenominator = lowerLimitText.Substring(2, lowerLimitText.Length-2); + double lowerLimitD = 1/Double.Parse(lowerLimitDenominator, currentCulture); + string signalingValueDenominator = signalingValueText.Substring(2, signalingValueText.Length-2); + double signalingValueD = 1/Double.Parse(signalingValueDenominator, currentCulture); + double contributionD = Double.Parse(contributionText, currentCulture); + double parameterND = Double.Parse(parameterNText, currentCulture); + double boundaryValue; + var boundaryToEvaluate = categoryName + boundaryType; + + string calculatedCategoryBoundary = ""; + switch (boundaryToEvaluate) { + case "IOnder": + calculatedCategoryBoundary = "1/Oneindig"; + Report.Log(ReportLevel.Info, "", categoryName+categorySuffix+boundaryType+ " : " + calculatedCategoryBoundary); + return calculatedCategoryBoundary; + case "VIBoven": + calculatedCategoryBoundary = "1/1"; + Report.Log(ReportLevel.Info, "", categoryName+categorySuffix+boundaryType+ " : " + calculatedCategoryBoundary); + return calculatedCategoryBoundary; + case "IIOnder": + boundaryValue = (1.0/30.0)*signalingValueD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "IBoven": + boundaryValue = (1/30.0)*signalingValueD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "IIIOnder": + boundaryValue = signalingValueD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "IIBoven": + boundaryValue = signalingValueD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "IVOnder": + boundaryValue = lowerLimitD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "IIIBoven": + boundaryValue = lowerLimitD*contributionD/100.0; + if (categorySuffix=="v") { + boundaryValue = boundaryValue /parameterND; + } + break; + case "VOnder": + boundaryValue = lowerLimitD; + break; + case "IVBoven": + boundaryValue = lowerLimitD; + break; + case "VIOnder": + boundaryValue = 30.0*lowerLimitD; + break; + case "VBoven": + boundaryValue = 30.0*lowerLimitD; + break; + default: + Report.Log(ReportLevel.Info,"", "case : " + boundaryToEvaluate + "error!"); + throw new Exception(); + } + var denominatorBoundary = Math.Round(1/boundaryValue); + calculatedCategoryBoundary = "1/" + denominatorBoundary.ToString("N0", currentCulture.NumberFormat); + Report.Log(ReportLevel.Info, "", categoryName+categorySuffix+boundaryType+ " : " + calculatedCategoryBoundary); + return calculatedCategoryBoundary; + } + } +} Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculatePathInPropertiesPanelOfBoundaryCategory.UserCode.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculatePathInPropertiesPanelOfBoundaryCategory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculatePathInPropertiesPanelOfBoundaryCategory.rxrec'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateSectionCategoryBoundary.UserCode.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateSectionCategoryBoundary.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Calculation/CalculateSectionCategoryBoundary.rxrec'. Fisheye: No comparison available. Pass `N' to diff? Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/Assembly/GetRandomNorm.UserCode.cs =================================================================== diff -u -r717f57961d3fc89067f58af637a3a386b96206aa -ree06e25200d6cf77e0e3aa24900367550776b941 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/Assembly/GetRandomNorm.UserCode.cs (.../GetRandomNorm.UserCode.cs) (revision 717f57961d3fc89067f58af637a3a386b96206aa) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/Assembly/GetRandomNorm.UserCode.cs (.../GetRandomNorm.UserCode.cs) (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -35,13 +35,13 @@ public string GetRandomLowerLimitValue() { - return "1/" + new Random().Next(0, 50) * 100; + return "1/" + new Random().Next(1, 50) * 100; } public string GetRandomSignallingValue() { - return "1/" + new Random().Next(50, 900) * 100; + return "1/" + new Random().Next(51, 900) * 100; } } } Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundary.cs =================================================================== diff -u --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundary.cs (revision 0) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundary.cs (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -0,0 +1,194 @@ +/* + * Created by Ranorex + * User: rodriqu_dd + * Date: 30/11/2020 + * Time: 16:33 + * + * To change this template use Tools > Options > Coding > Edit standard headers. + */ +using System; +using System.Globalization; +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.Validation.DocumentView +{ + /// + /// Description of ValidateSectionCategoryBoundary. + /// + [TestModule("7DB319A1-061B-489D-A466-CC166AFEB2E0", ModuleType.UserCode, 1)] + public class ValidateSectionCategoryBoundary : ITestModule + { + + string _expectedCategoriesBoundaries = ""; + [TestVariable("2cf00c13-2878-4943-b748-690262879fa5")] + public string expectedCategoriesBoundaries + { + get { return _expectedCategoriesBoundaries; } + set { _expectedCategoriesBoundaries = value; } + } + + + /// + /// Constructs a new instance. + /// + public ValidateSectionCategoryBoundary() + { + // 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; + string categoriesBoundariesDocumentView = GetCategoriesBoundariesFromDocumentView(); + Report.Log(ReportLevel.Info, "Validating Values in Document view"); + ValidateCategoriesBoundaries(expectedCategoriesBoundaries, categoriesBoundariesDocumentView); + + string categoriesBoundariesPropertiesPanel = GetCategoriesBoundariesFromPropertiesPanel(); + Report.Log(ReportLevel.Info, "Validating Values in Properties Panel"); + ValidateCategoriesBoundaries(expectedCategoriesBoundaries, categoriesBoundariesPropertiesPanel); + + } + + private string GetCategoriesBoundariesFromDocumentView() + { + var repo =global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + var viewCategoryBoundaries = repo.RiskeerMainWindow.DocumentViewContainerUncached.ViewCategoryBoundaries; + + Ranorex.Table tableTraject = viewCategoryBoundaries.CategoryBoundariesTraject.Self; + Ranorex.Table tableVak = viewCategoryBoundaries.CategoryBoundariesSection.Self; + + Dictionary dictCategoryTypeTable = new Dictionary{ + {1, tableTraject}, + {2, tableVak} + }; + + Dictionary dictCategoryType = new Dictionary{ + {1, "t"}, + {2, "v"} + }; + + Dictionary dictCategoryName = new Dictionary{ + {1, "I"}, + {2, "II"}, + {3, "III"}, + {4, "IV"}, + {5, "V"}, + {6, "VI"} + }; + + Dictionary dictBoundaryType = new Dictionary{ + {3, "Onder"}, + {4, "Boven"} + }; + + + string allResults = ""; + // CategoryType: {1, "t"}, {2, "v"} + for (int idxCategoryType = 1; idxCategoryType < 3; idxCategoryType++) { + // CategoryName: {1, "I"}, {2, "II"}, {3, "III"}, + // {4, "IV"}, {5, "V"}, {6, "VI"} + for (int idxCategoryName = 1; idxCategoryName < 7; idxCategoryName++) { + // BoundaryType: {3, "Onder"}, {4, "Boven"} + for (int idxBoundaryType = 3; idxBoundaryType < 5; idxBoundaryType++) { + var currentCell = dictCategoryTypeTable[idxCategoryType].Rows[idxCategoryName].Cells[idxBoundaryType]; + currentCell.Select(); + string valueCell = currentCell.Element.GetAttributeValueText("AccessibleValue"); + allResults += valueCell + ";"; + } + } + } + allResults = allResults.TrimEnd(';'); + return allResults; + } + + private string GetCategoriesBoundariesFromPropertiesPanel() + { + AutomatedSystemTestsRepository repo = global::AutomatedSystemTests.AutomatedSystemTestsRepository.Instance; + Adapter propertiesPanelAdapter = repo.RiskeerMainWindow.PropertiesPanelContainer.Table.Self; + + var allRows = propertiesPanelAdapter.As().Rows.ToList(); + string allResults = ""; + foreach (Ranorex.Row row in allRows) { + string parameterName = row.Element.GetAttributeValueText("AccessibleName"); + if (parameterName.Contains("grens [1/jaar]")) { + allResults += row.Element.GetAttributeValueText("AccessibleValue") + ";"; + } + } + allResults = allResults.TrimEnd(';'); + return allResults; + } + + private void ValidateCategoriesBoundaries(string expectedString, string actualString) + { + List boundaryTypeCollection= new List { + "Ondergrens [1/jaar]", + "Bovengrens [1/jaar]" + }; + + List categoryNameCollection= new List { + "I", + "II", + "III", + "IV", + "V", + "VI" + }; + + List categoryTypeCollection= new List { + "t", + "v" + }; + + List expectedValues = expectedString.Split(';').ToList(); + List actualValues = actualString.Split(';').ToList(); + + int idx = 0; + foreach (string categoryType in categoryTypeCollection) { + foreach (string categoryName in categoryNameCollection) { + foreach (string boundaryType in boundaryTypeCollection) { + string messageCase = "Validating boundary " + categoryName + categoryType + " " + boundaryType + " : expected = " + expectedValues[idx] + "; actual = " + actualValues[idx]+ " "; + Report.Log(ReportLevel.Info, messageCase); + ValidateSingleCategoryBoundary(expectedValues[idx], actualValues[idx]); + idx++; + } + } + } + expectedCategoriesBoundaries = expectedCategoriesBoundaries.TrimEnd(';'); + } + + private void ValidateSingleCategoryBoundary(string expectedValue, string actualValue) + { + if (actualValue==expectedValue) { + Validate.AreEqual(actualValue, expectedValue); + } + else { + System.Globalization.CultureInfo currentCulture = CultureInfo.CurrentCulture; + Report.Log(ReportLevel.Info, "Validation", "Value found: " + actualValue + " is not equal to expected value: " + expectedValue + "\r\nEvaluating whether they are almost (within 0.01%) equal..."); + var expectedDouble = 1.0/(Double.Parse(expectedValue.Substring(2,expectedValue.Length-2), currentCulture)); + var actualDouble = 1.0/(Double.Parse(actualValue.Substring(2,actualValue.Length-2), currentCulture)); + var deviation = Math.Abs(100.0*(expectedDouble - actualDouble) / expectedDouble); + Report.Log(ReportLevel.Info, "Validation", "Deviation = " + deviation + " %"); + Validate.IsTrue(deviation<0.01); + } + + } + } +} Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundaryInDocumentView.UserCode.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundaryInDocumentView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/DocumentView/ValidateSectionCategoryBoundaryInDocumentView.rxrec'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateCategoryBoundaryInPropertiesPanel.UserCode.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateCategoryBoundaryInPropertiesPanel.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ee06e25200d6cf77e0e3aa24900367550776b941 refers to a dead (removed) revision in file `System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/PropertiesPanel/ValidateCategoryBoundaryInPropertiesPanel.rxrec'. Fisheye: No comparison available. Pass `N' to diff? Index: System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst =================================================================== diff -u -rc26e2bd1d2ccd38bf3657993ff25f2062569d7f4 -ree06e25200d6cf77e0e3aa24900367550776b941 --- System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision c26e2bd1d2ccd38bf3657993ff25f2062569d7f4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/NormalSystemTests.rxtst (.../NormalSystemTests.rxtst) (revision ee06e25200d6cf77e0e3aa24900367550776b941) @@ -196,6 +196,10 @@ + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7157,6 +7363,10 @@ + + + + - - + + + + + + @@ -7609,7 +7828,7 @@ + name="c)_d)_DeterminationOfAssessmentRequirements"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9981,10 +10343,6 @@ - - @@ -10307,11 +10665,6 @@ - - @@ -10408,38 +10761,6 @@ - - - - - - - - - - - - + + @@ -10979,103 +11306,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12374,6 +12719,12 @@ + + @@ -12869,6 +13220,10 @@ + + @@ -13031,6 +13386,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + name="c)_d)_DeterminationOfAssessmentRequirements"> - - - - - - + id="bf3b2b23-c737-43fb-9220-4444f3d2bb6d" + name="CheckWithOriginalValues"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="5f95ce06-adb9-415e-9d25-8d36708cfcc8" + name="ChangeNormToRandomValues"> + + + id="7303e49b-393b-461c-8ddd-602529b61f6b" + name="SignallingValue"> + id="6ca5b8eb-bd49-40a1-89a0-d78d43447e3a" + name="SetValueWithKeyPressParameterForItemInTraject"> + + + id="71a68bda-da60-44b5-92db-b4634c49cbad" + name="LowerLimitValue"> + id="550c9f3a-ad00-4f21-b10d-6cbe7ca0b4de" + name="SetValueWithKeyPressParameterForItemInTraject"> + + + + + id="650a40cd-af06-490a-9c3d-dd0eb2b39ac0" + name="RetrieveValuesFromNorm"> + id="54c7b225-fe98-4ab4-8213-f00f6298c3d4" + name="GetValueParameterForItemInTraject"> + + + + + id="cc2642f7-53a8-4043-a6b2-88a43cb41e20" + name="LoopFMsGeneralFormula"> - - - - - - - - - - - - - - - - + id="c6dab619-519c-47a3-9179-8aa5c0eda948" + name="GetFailureContribution"> + + + + + + + + + + + + + + + + + + + + + + @@ -35594,6 +36176,9 @@ id="02d6fbbd-047b-4a52-86eb-40cf83f3a5ba"> + + - - + + + + + + + + + id="7303e49b-393b-461c-8ddd-602529b61f6b"> + id="736e861c-1887-4e43-88b2-60622379fdc6"> @@ -35978,6 +36572,9 @@ id="7783fb34-8a52-4a34-bc5b-614dbb5040c3"> + + - - - - - - + + + + + + + +