Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs =================================================================== diff -u -rc5f69680b82fbaae2659fba0d555722f042de455 -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision c5f69680b82fbaae2659fba0d555722f042de455) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs (.../AutomatedSystemTestsRepository.cs) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) @@ -85,18 +85,6 @@ #region Variables - string _substringTrajectName = ""; - - /// - /// Gets or sets the value of variable substringTrajectName. - /// - [TestVariable("77ae6c27-603e-4704-add9-e1249169f0e5")] - public string substringTrajectName - { - get { return _substringTrajectName; } - set { _substringTrajectName = value; } - } - string _substringFMName = ""; /// @@ -145,18 +133,6 @@ set { _rowIndex = value; } } - string _trajectToAdd = ""; - - /// - /// Gets or sets the value of variable trajectToAdd. - /// - [TestVariable("4ea4fb61-50c3-4243-9a99-25901a404ce2")] - public string trajectToAdd - { - get { return _trajectToAdd; } - set { _trajectToAdd = value; } - } - string _normType = ""; /// @@ -289,18 +265,6 @@ set { _substringNameItemInTraject = value; } } - string _textDropDownMenu = ""; - - /// - /// Gets or sets the value of variable textDropDownMenu. - /// - [TestVariable("4f707b64-d756-4bb7-a45a-f34af402b280")] - public string textDropDownMenu - { - get { return _textDropDownMenu; } - set { _textDropDownMenu = value; } - } - string _DropDownItem = ""; /// @@ -409,18 +373,6 @@ set { _itemInDropDownMenu = value; } } - string _locationName = ""; - - /// - /// Gets or sets the value of variable locationName. - /// - [TestVariable("d3f8e98c-052e-4dbf-84ca-9ec77e91cb0b")] - public string locationName - { - get { return _locationName; } - set { _locationName = value; } - } - string _newValueForParameter = ""; /// @@ -433,18 +385,6 @@ set { _newValueForParameter = value; } } - string _newValue = ""; - - /// - /// Gets or sets the value of variable newValue. - /// - [TestVariable("973b7938-8c88-411b-81f4-2d7160c01d81")] - public string newValue - { - get { return _newValue; } - set { _newValue = value; } - } - string _nameOfItem = ""; /// @@ -541,18 +481,6 @@ set { _nameColumn = value; } } - string _NameState = ""; - - /// - /// Gets or sets the value of variable NameState. - /// - [TestVariable("a5fb3f89-9def-4a33-b1a0-454f91840689")] - public string NameState - { - get { return _NameState; } - set { _NameState = value; } - } - string _StateToSelect = ""; /// Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep =================================================================== diff -u -rc5f69680b82fbaae2659fba0d555722f042de455 -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc --- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision c5f69680b82fbaae2659fba0d555722f042de455) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep (.../AutomatedSystemTestsRepository.rxrep) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) @@ -3404,10 +3404,6 @@ - - @@ -3424,10 +3420,6 @@ name="rowIndex"> - - @@ -3472,10 +3464,6 @@ name="substringNameItemInTraject"> - - @@ -3512,18 +3500,10 @@ name="itemInDropDownMenu"> - - - - @@ -3556,10 +3536,6 @@ name="nameColumn"> - - Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/SetContributionValueInScenariosView.cs =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc --- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/SetContributionValueInScenariosView.cs (.../SetContributionValueInScenariosView.cs) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/SetContributionValueInScenariosView.cs (.../SetContributionValueInScenariosView.cs) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) @@ -54,14 +54,16 @@ #region Variables + string _newValue; + /// /// Gets or sets the value of variable newValue. /// [TestVariable("fa77a94b-5e57-4ae0-959e-21197789d225")] public string newValue { - get { return repo.newValue; } - set { repo.newValue = value; } + get { return _newValue; } + set { _newValue = value; } } #endregion Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst =================================================================== diff -u -rd0381298fca287ee1230cba84b5b71b21d5f89ed -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc --- System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst (.../Script07.rxtst) (revision d0381298fca287ee1230cba84b5b71b21d5f89ed) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script07.rxtst (.../Script07.rxtst) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) @@ -280,14 +280,6 @@ variablename="valueToSetParameterForItemInTraject"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -911,36 +851,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2872,44 +2526,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3407,36 +2905,6 @@ name="CopyOriginalFiles"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - ' to path of schematizations folder]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5205,22 +4523,6 @@ name="ReplaceSubstring"> - - - - - - - - @@ -5389,14 +4691,6 @@ id="cd7cd4d6-8fce-46f7-8b3b-64ac8ba1fca3" name="ValidateItemNameInProjectExplorer"> - - - - @@ -5412,10 +4706,6 @@ id="bbf1a3be-4032-4ba4-a346-b6257b05eea7" name="ExpandAllRowItemsInPropertiesPanel"> - - - - - - - - - - @@ -5563,14 +4837,6 @@ name="ValidateWhetherFolderGivenPathContainsNode"> - - - - @@ -5586,10 +4852,6 @@ id="1aba46dd-8388-42d3-b912-793a7c698590" name="ExpandAllRowItemsInPropertiesPanel"> - - - - - - - - - - Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script12.rxtst =================================================================== diff -u -r35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4 -rf89fcbd32dd12eefe591e15cb6d9a9a0886acddc --- System tests/AutomatedSystemTests/AutomatedSystemTests/Script12.rxtst (.../Script12.rxtst) (revision 35e1f5d8cc279c74a0d63d6cfb8916fe5d132ef4) +++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script12.rxtst (.../Script12.rxtst) (revision f89fcbd32dd12eefe591e15cb6d9a9a0886acddc) @@ -69,32 +69,80 @@ - + ' + name of structure to select]]> + + + + + + + + + + + + + + + + - - - - - - - - - - - - - @@ -202,6 +221,54 @@ variableid="5bab9acc-5817-4baf-921f-3345ba8f8ec3" variablename="string2"> + + + + + + + + + + + + + + + + + + + ' with '-' in struc. folder + struc. name + '.csv']]> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -353,6 +497,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -480,6 +698,54 @@ variableid="5bab9acc-5817-4baf-921f-3345ba8f8ec3" variablename="string2"> + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + dataname="fullPathReferenceCSVFile" + datasourceid="0c825a3d-0e34-4176-95ff-e1f84fe64361" + variableid="2dfc00fd-73b9-4da3-8f6e-bb765817601f" + variablename="filePath1"> + dataname="fullPathToOutputCsvFile" + datasourceid="e0a1cfdf-f728-4497-ace8-7228e120d2a6" + variableid="4b82dd79-7c11-425a-9f41-b9795be8d16b" + variablename="filePath2"> - - + dataname="csvFileName" + datasourceid="3ddd79e4-a99e-40f0-b120-763a595ad464" + variableid="4b82dd79-7c11-425a-9f41-b9795be8d16b" + variablename="filePath2"> + dataname="nameConfigurationFileToSave" + datasourceid="9a85db2e-f039-49e7-bed7-f36c802ad6c2" + variableid="2dfc00fd-73b9-4da3-8f6e-bb765817601f" + variablename="filePath1"> - - - - - + ' with '-' in struc. folder + struc. name + '.csv']]> - - - - - - - - - + datasourceid="90223a5e-5cb5-4236-9312-8a11c8d09863" + variableid="22c872ab-6375-41c9-b6a0-aafb1460c90f" + variablename="string3"> + dataname="extensionCSV" + datasourceid="ff639c1e-93bf-48b9-9a07-77753b9cc919" + variableid="58f41f8d-e2cb-4ebe-9653-958a0586c5a5" + variablename="string4"> - - + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="3e20cd2e-b0b9-4552-aa14-212a8c9693dc" + variablename="string5"> - - - - - - - + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="aef0abd0-9b13-4f16-a245-f7f7be97b0d2" + variablename="string6"> + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="ef20b2eb-ff3a-4087-9fbe-116461e1fd42" + variablename="string7"> - - + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="654df330-d33d-4ec2-ace8-87d684f928fc" + variablename="string8"> + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="ee7be37b-8468-4cd6-9f9e-b1c3da26aed7" + variablename="string9"> - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1451,40 +1472,88 @@ - - - + + + + + + + + + + + + + + + + + + + @@ -1503,6 +1572,28 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - ' to path to folder]]> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - @@ -1915,41 +1965,113 @@ + + + + + + + + + + + + - + + dataname="pathSeparator" + datasourceid="7187131b-01cb-4c31-a3f2-45b8b30c5d9a" + variableid="5bab9acc-5817-4baf-921f-3345ba8f8ec3" + variablename="string2"> + variableid="22c872ab-6375-41c9-b6a0-aafb1460c90f" + variablename="string3"> - - + dataname="pathToSchematizationItem" + datasourceid="7187131b-01cb-4c31-a3f2-45b8b30c5d9a" + variableid="4296aff0-7ef3-4132-ab64-c24e27efab2e" + variablename="concatenatedString"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - ' to path of structures folder]]> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -2687,67 +2849,98 @@ id="cd2681e5-d2b2-42db-9cfc-a40fc11930ab" name="MakeAllItemsInPropertiesPanelVisible"> + + + + + + + + + + ' with '-' in struc. folder + struc. name + '.csv']]> + + dataname="substituteSubstring" + datasourceid="034cef18-be74-4384-a15a-b1f5b09ab175" + variableid="5bab9acc-5817-4baf-921f-3345ba8f8ec3" + variablename="string2"> + datasourceid="00d753e2-44a8-454e-a738-2c4ccf324e17" + variableid="22c872ab-6375-41c9-b6a0-aafb1460c90f" + variablename="string3"> - - + dataname="extensionCSV" + datasourceid="034cef18-be74-4384-a15a-b1f5b09ab175" + variableid="58f41f8d-e2cb-4ebe-9653-958a0586c5a5" + variablename="string4"> + dataname="dummyString" + datasourceid="aff63240-5ef8-40dd-921e-4b9e7a92d94b" + variableid="3e20cd2e-b0b9-4552-aa14-212a8c9693dc" + variablename="string5"> - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + @@ -2819,6 +3044,83 @@ name="MakeAllItemsInPropertiesPanelVisible"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="d9c3b50c-dd2e-47ef-8ba4-65d4d4b7492e" + name="NewProjectUsingKeyboard"> + + + + - - @@ -3206,22 +3512,14 @@ name="ReplaceSubstring"> - - - - @@ -3282,14 +3580,10 @@ id="a9b00ec7-4ff3-4927-bba1-a0a2351f683f" name="ValidateItemNameInProjectExplorer"> - - @@ -3318,22 +3612,14 @@ name="ReplaceSubstring"> - - - - @@ -3404,14 +3690,10 @@ name="ValidateWhetherFolderGivenPathContainsNode"> - - @@ -3440,22 +3722,14 @@ name="ReplaceSubstring"> - - - - @@ -3516,11 +3790,19 @@ id="b8f54954-9772-41a9-b812-aaf87cdb3546" name="AddNewTrajectNotAppropriateForStructures"> + id="a15e619d-2030-4044-8cf2-485d82c1d32d" + name="NewProjectUsingKeyboard"> + + + + + stateCalculations + + norm @@ -3656,6 +3941,9 @@ trajectToAdd + stateCalculations + + norm @@ -3700,6 +3988,9 @@ 36-2 + Sterkte + + Signal @@ -3744,6 +4035,9 @@ 34-1 + Sterkte + + Signal @@ -3787,6 +4081,9 @@ 44-2 + Sterkte + + Signal @@ -4182,6 +4479,9 @@ id="763cbd9f-b9f5-48ce-93ac-140e87a89119"> + + + +