Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj
===================================================================
diff -u -ra45fc884a9dd4952da3a8d8ad685db1a093ae48c -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision a45fc884a9dd4952da3a8d8ad685db1a093ae48c)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj (.../AutomatedSystemTests.csproj) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -2558,10 +2558,6 @@
Always
faacac5c-bf04-4ace-bbc3-437ef50a7a13
-
- Always
- 74642f17-dc74-44b4-ab64-77817f28b05e
-
Always
017681e7-a1cd-435c-97f3-c3e53f0103c5
@@ -2622,18 +2618,6 @@
Always
46c334e2-d9b9-44a3-aab0-9dc46cc81b6e
-
- Always
- f71d81ee-36f5-47c6-9e30-90d6eca704b7
-
-
- Always
- 2e98b015-ed94-4385-aa49-4cb36d7f2c62
-
-
- Always
- 55f842ba-2cc9-4ba2-b80f-75e4bdbb75e7
-
Always
6827c86e-753b-4849-9c40-0455c419adb9
@@ -3617,10 +3601,6 @@
Always
86dea715-1b95-4048-874c-00fcbd024d15
-
- Always
- 3253c1bd-a517-45e9-96ad-e70b88e902c5
-
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc
===================================================================
diff -u -ra00c7888b39b9ac6f1799537d7e982162581cfbb -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc (.../AutomatedSystemTests.rxsqc) (revision a00c7888b39b9ac6f1799537d7e982162581cfbb)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxsqc (.../AutomatedSystemTests.rxsqc) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -1,36 +1,11 @@
[
{
"Enabled": "True",
- "TestSuite": "NormalSystemTests",
- "RunConfig": "TestRun"
- },
- {
- "Enabled": "True",
- "TestSuite": "SlowTestCases",
- "RunConfig": "TestRun"
- },
- {
- "Enabled": "True",
"TestSuite": "WorkInProgressDavid",
"RunConfig": "TestRun"
},
{
- "Enabled": "False",
- "TestSuite": "WorkInProgressCarlos",
- "RunConfig": "TestRun"
- },
- {
- "Enabled": "False",
- "TestSuite": "WorkInProgressSylvia",
- "RunConfig": "TestRun"
- },
- {
"Enabled": "True",
- "TestSuite": "VerySlowTestCases",
- "RunConfig": "TestRun"
- },
- {
- "Enabled": "True",
"TestSuite": "Script20",
"RunConfig": "TestRun"
},
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs
===================================================================
diff -u -re6a5e37a6b8922f80210e8c37faf9fc4609c280e -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision e6a5e37a6b8922f80210e8c37faf9fc4609c280e)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -517,6 +517,18 @@
set { _substringName = value; }
}
+ string _stateName = "";
+
+ ///
+ /// Gets or sets the value of variable stateName.
+ ///
+ [TestVariable("968707f6-e0d0-4792-970c-cf0b3fc67bc8")]
+ public string stateName
+ {
+ get { return _stateName; }
+ set { _stateName = value; }
+ }
+
#endregion
///
@@ -8086,7 +8098,7 @@
_hydraulicloadsInfo = new RepoItemInfo(this, "HydraulicLoads", "button/text[@caption>'Hydraulische']/parent::button", 30000, null, "b1cf1423-a508-4c59-a4c5-107d6f6c3e8d");
_calculationsInfo = new RepoItemInfo(this, "Calculations", "button/text[@caption>'Sterkte']/parent::button", 30000, null, "79e70cd3-243c-4924-a9a3-342ff576a983");
_failurepathsInfo = new RepoItemInfo(this, "FailurePaths", "button/text[@caption>'Faalpaden']/parent::button", 30000, null, "406ca44b-f09e-4622-922c-11a65846e348");
- _genericribbonbuttonInfo = new RepoItemInfo(this, "GenericRibbonButton", "button/text[@caption>$StateToSelect]/parent::button", 30000, null, "10758b46-d10f-46af-883e-9629a38c517a");
+ _genericribbonbuttonInfo = new RepoItemInfo(this, "GenericRibbonButton", "button/text[@caption~$stateName]/parent::button", 30000, null, "10758b46-d10f-46af-883e-9629a38c517a");
}
///
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep
===================================================================
diff -u -re6a5e37a6b8922f80210e8c37faf9fc4609c280e -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision e6a5e37a6b8922f80210e8c37faf9fc4609c280e)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -2111,7 +2111,7 @@
name="GenericRibbonButton"
refimgid="b966d0a7-39df-499c-845c-63269d637e35"
searchtimeout="30000ms">
- /form[@automationid='RiskeerMainWindow']/?/?/container[@automationid='MainButtonStackPanel']/button/text[@caption>$StateToSelect]/parent::button
+ /form[@automationid='RiskeerMainWindow']/?/?/container[@automationid='MainButtonStackPanel']/button/text[@caption~$stateName]/parent::button
/form[@automationid='RiskeerMainWindow']/?/?/container[@automationid='MainButtonStackPanel']
@@ -3567,5 +3567,9 @@
id="c8f26984-6161-4190-9006-d6b627a1bf14"
name="substringName">
+
+
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.UserCode.cs
===================================================================
diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.UserCode.cs (.../SelectState.UserCode.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.UserCode.cs (.../SelectState.UserCode.cs) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -14,7 +14,9 @@
using System.Drawing;
using System.Threading;
using WinForms = System.Windows.Forms;
+using Ranorex_Automation_Helpers.UserCodeCollections;
+
using Ranorex;
using Ranorex.Core;
using Ranorex.Core.Repository;
@@ -33,5 +35,11 @@
// Your recording specific initialization code goes here.
}
+ public string ConvertAliasToFullName(string StateAlias)
+ {
+ stateName = StateAlias.ReplacePathAliases();
+ return stateName;
+ }
+
}
}
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.cs
===================================================================
diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.cs (.../SelectState.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.cs (.../SelectState.cs) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -41,6 +41,8 @@
///
public SelectState()
{
+ aliasState = "";
+ stateName = "";
}
///
@@ -53,16 +55,28 @@
#region Variables
+ string _aliasState;
+
///
- /// Gets or sets the value of variable StateToSelect.
+ /// Gets or sets the value of variable aliasState.
///
- [TestVariable("dd230550-3763-4882-aad6-2c842903d448")]
- public string StateToSelect
+ [TestVariable("68865ee7-33ba-43a8-8921-d189e77dd216")]
+ public string aliasState
{
- get { return repo.StateToSelect; }
- set { repo.StateToSelect = value; }
+ get { return _aliasState; }
+ set { _aliasState = value; }
}
+ ///
+ /// Gets or sets the value of variable stateName.
+ ///
+ [TestVariable("b3e82724-3cc6-4007-932a-4693bb8aaeec")]
+ public string stateName
+ {
+ get { return repo.stateName; }
+ set { repo.stateName = value; }
+ }
+
#endregion
///
@@ -89,10 +103,12 @@
Init();
- Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.RibbonButtons.GenericRibbonButton' at Center.", repo.RiskeerMainWindow.RibbonButtons.GenericRibbonButtonInfo, new RecordItemIndex(0));
+ stateName = ConvertAliasToFullName(aliasState);
+
+ Report.Log(ReportLevel.Info, "Mouse", "Mouse Left Click item 'RiskeerMainWindow.RibbonButtons.GenericRibbonButton' at Center.", repo.RiskeerMainWindow.RibbonButtons.GenericRibbonButtonInfo, new RecordItemIndex(1));
repo.RiskeerMainWindow.RibbonButtons.GenericRibbonButton.Click();
- Report.Log(ReportLevel.Info, "Delay", "Waiting for 300ms.", new RecordItemIndex(1));
+ Report.Log(ReportLevel.Info, "Delay", "Waiting for 300ms.", new RecordItemIndex(2));
Delay.Duration(300, false);
}
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.rxrec
===================================================================
diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -r932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.rxrec (.../SelectState.rxrec) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsRibbon/SelectState.rxrec (.../SelectState.rxrec) (revision 932b7cc572d0bdec4c2f1b912d32ecbdf3e60f50)
@@ -23,8 +23,45 @@
namespace="AutomatedSystemTests.Modules.ActionsRibbon">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ System.String
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -2412,6 +2439,10 @@
+
+
@@ -2876,54 +2907,60 @@
name="SignallingValue">
+
+
+ variableid="5cbfe7da-3ce3-4a31-baa8-dcc95a2c80d7"
+ variablename="signallingValue">
+ variableid="3624ac3a-3bbc-43cf-8c5b-c6a96b97116f"
+ variablename="lowLimitValue">
+ dataname="TrajectName"
+ datasourceid="34002ae7-b33b-4a66-a6a3-a7e4e9c8be57"
+ variableid="171a542e-eb85-404b-a2fe-920346f601f6"
+ variablename="trajectID">
@@ -2975,7 +3012,7 @@
+ name="a)_Classes_Failure_probability_space">
+
+
@@ -3176,14 +3219,6 @@
id="b468605b-ee5e-43c5-bc4e-88df820c5e8d"
name="Script08">
-
-
-
-
+ id="a42ea627-0e94-475a-ab47-26af7e16caeb"
+ name="SelectTraject">
+ id="d8de7f95-a908-4c53-8f6e-6d24e710c32f"
+ name="NewProjectUsingKeyboard">
+ name="a)_Classes_Failure_probability_space">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+