Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj =================================================================== diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -378,6 +378,9 @@ 09e7b9a2-edbd-4e89-b3bf-3fe10325a21d 0eabce3a-8b80-466b-aa80-402c74d568d4 + + a7f60192-3e84-4fc1-81fd-beda27b6510d + ConvertToCurrentCulture.rxrec true @@ -1638,6 +1641,10 @@ Always 74642f17-dc74-44b4-ab64-77817f28b05e + + Always + 6827c86e-753b-4849-9c40-0455c419adb9 + 26a72276-7a2e-4ee3-bb52-7e45071fe9ee Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc =================================================================== diff -u -r5a299fa8ed9921e074bbef9a71dd6520855765ea -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc (.../AutomatedSystemTests.rxsqc) (revision 5a299fa8ed9921e074bbef9a71dd6520855765ea) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc (.../AutomatedSystemTests.rxsqc) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -8,5 +8,10 @@ "Enabled": "True", "TestSuite": "SlowTestCases", "RunConfig": "TestRun" + }, + { + "Enabled": "False", + "TestSuite": "WorkOnProgressDavid", + "RunConfig": "TestRun" } ] \ No newline at end of file Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst =================================================================== diff -u -rf10b6a8d0acabcf407cac570f9565f67fcaf3dcc -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision f10b6a8d0acabcf407cac570f9565f67fcaf3dcc) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst (.../AutomatedSystemTests.rxtst) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -1,4 +1,4 @@ - + @@ -2143,16 +2143,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6238,17 +6186,6 @@ id="716669cb-8d3f-4f98-a608-2311ffb07430" name="SaveProject"> - - - - - - - - - - - - - - - - @@ -12371,20 +12285,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14297,31 +14151,6 @@ - - - - - - - - - - - - - - - - @@ -16769,66 +16598,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -rebc704de490f9037cbabe65b44a005ee22831e56 -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision ebc704de490f9037cbabe65b44a005ee22831e56) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -4317,15 +4317,15 @@ [RepositoryFolder("ebb0b0be-617b-4c07-a1f1-dd02286813f8")] public partial class MessagesDataGridViewFolder : RepoGenBaseFolder { - AutomatedSystemTestsRepositoryFolders.GenericRowFolder _genericrow; + AutomatedSystemTestsRepositoryFolders.GenericMessageRowFolder _genericmessagerow; /// /// Creates a new MessagesDataGridView folder. /// public MessagesDataGridViewFolder(RepoGenBaseFolder parentFolder) : base("MessagesDataGridView", "?/container/?/container[@controlname='MessageWindow']/table[@controlname='messagesDataGridView']", parentFolder, 30000, null, true, "ebb0b0be-617b-4c07-a1f1-dd02286813f8", "") { - _genericrow = new AutomatedSystemTestsRepositoryFolders.GenericRowFolder(this); + _genericmessagerow = new AutomatedSystemTestsRepositoryFolders.GenericMessageRowFolder(this); } /// @@ -4353,30 +4353,30 @@ } /// - /// The GenericRow folder. + /// The GenericMessageRow folder. /// [RepositoryFolder("d79a0edd-fbc5-415d-8701-852d3bf28406")] - public virtual AutomatedSystemTestsRepositoryFolders.GenericRowFolder GenericRow + public virtual AutomatedSystemTestsRepositoryFolders.GenericMessageRowFolder GenericMessageRow { - get { return _genericrow; } + get { return _genericmessagerow; } } } /// - /// The GenericRowFolder folder. + /// The GenericMessageRowFolder folder. /// [RepositoryFolder("d79a0edd-fbc5-415d-8701-852d3bf28406")] - public partial class GenericRowFolder : RepoGenBaseFolder + public partial class GenericMessageRowFolder : RepoGenBaseFolder { SelfInfoClass _selfInfo; GenericCellIconInfoClass _genericcelliconInfo; RepoItemInfo _genericcellmessageInfo; /// - /// Creates a new GenericRow folder. + /// Creates a new GenericMessageRow folder. /// - public GenericRowFolder(RepoGenBaseFolder parentFolder) : - base("GenericRow", "row[@accessiblename='Row '+$indexRowMessage]", parentFolder, 30000, null, false, "d79a0edd-fbc5-415d-8701-852d3bf28406", "") + public GenericMessageRowFolder(RepoGenBaseFolder parentFolder) : + base("GenericMessageRow", "row[@accessiblename='Row '+$indexRowMessage]", parentFolder, 30000, null, false, "d79a0edd-fbc5-415d-8701-852d3bf28406", "") { _selfInfo = new SelfInfoClass(this); _genericcelliconInfo = new GenericCellIconInfoClass(this); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -rebc704de490f9037cbabe65b44a005ee22831e56 -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision ebc704de490f9037cbabe65b44a005ee22831e56) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -1045,7 +1045,7 @@ capname="row" id="d79a0edd-fbc5-415d-8701-852d3bf28406" isrooted="True" - name="GenericRow" + name="GenericMessageRow" refimgid="d5377a2d-9d5a-4d81-928b-0ed2747fc681" searchtimeout="30000ms" usecache="False"> Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.UserCode.cs =================================================================== diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.UserCode.cs (.../ValidateErrorIcon.UserCode.cs) (revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.UserCode.cs (.../ValidateErrorIcon.UserCode.cs) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -35,7 +35,7 @@ public void Validate_GenericCellIcon(RepoItemInfo cellInfo) { - CompressedImage GenericCellIcon_ErrorIcon = repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo.GetErrorIcon(new Rectangle(0, 1, 17, 15)); + CompressedImage GenericCellIcon_ErrorIcon = repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellIconInfo.GetErrorIcon(new Rectangle(0, 1, 17, 15)); Imaging.FindOptions GenericCellIcon_ErrorIcon_Options = Imaging.FindOptions.Parse("0.8;Edges;0,0,0,0;True;10000000;0ms"); Report.Log(ReportLevel.Info, "Validation", "(Optional Action)\r\nValidating ContainsImage (Screenshot: 'ErrorIcon' with region {X=0,Y=1,Width=17,Height=15}) on item 'cellInfo'.", cellInfo); Validate.ContainsImage(cellInfo, GenericCellIcon_ErrorIcon, GenericCellIcon_ErrorIcon_Options, "Comparing with error icon", new Validate.Options(){ReportSimilarity=Validate.ResultOption.Always, ReportDifferenceImages=Validate.ResultOption.OnFail, ReportExpectedAndActualImages=Validate.ResultOption.Always}); Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.cs =================================================================== diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.cs (.../ValidateErrorIcon.cs) (revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateErrorIcon.cs (.../ValidateErrorIcon.cs) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -89,7 +89,7 @@ Init(); - Validate_GenericCellIcon(repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo); + Validate_GenericCellIcon(repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellIconInfo); Delay.Milliseconds(0); } @@ -99,7 +99,7 @@ /// DO NOT REFERENCE THIS CODE - auto generated /// CompressedImage GenericCellIcon_ErrorIcon - { get { return repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellIconInfo.GetErrorIcon(new Rectangle(0, 1, 17, 15)); } } + { get { return repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellIconInfo.GetErrorIcon(new Rectangle(0, 1, 17, 15)); } } /// /// DO NOT REFERENCE THIS CODE - auto generated Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateTextMesage.cs =================================================================== diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -rcc4c7502851d3bc4a3f6f555baba3b0a70545342 --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateTextMesage.cs (.../ValidateTextMesage.cs) (revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Validation/ValidateTextMesage.cs (.../ValidateTextMesage.cs) (revision cc4c7502851d3bc4a3f6f555baba3b0a70545342) @@ -102,10 +102,10 @@ Init(); - Report.Log(ReportLevel.Info, "Validation", "Validating AttributeContains (Text>$expectedMessage) on item 'RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellMessage'.", repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellMessageInfo, new RecordItemIndex(0)); - Validate.AttributeContains(repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellMessageInfo, "Text", expectedMessage); + Report.Log(ReportLevel.Info, "Validation", "Validating AttributeContains (Text>$expectedMessage) on item 'RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellMessage'.", repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellMessageInfo, new RecordItemIndex(0)); + Validate.AttributeContains(repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellMessageInfo, "Text", expectedMessage); - Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.MessagesDataGridView.GenericRow.GenericCellMessage, false, new RecordItemIndex(1)); + Report.Screenshot(ReportLevel.Info, "User", "", repo.RiskeerMainWindow.MessagesDataGridView.GenericMessageRow.GenericCellMessage, false, new RecordItemIndex(1)); }