@sapui5/sap.fe.test 1.102.2 → 1.104.1

package/src/sap/fe/test/JourneyRunner.js

@@ -17,7 +17,7 @@ sap.ui.define(
 		"sap/base/Log",
 		"sap/base/util/ObjectPath"
 	],
-	function(BaseObject, Opa5, Utils, BaseArrangements, BaseActions, BaseAssertions, Shell, opaQunit, Log, ObjectPath) {
+	function (BaseObject, Opa5, Utils, BaseArrangements, BaseActions, BaseAssertions, Shell, opaQunit, Log, ObjectPath) {
 		"use strict";
 
 		/**
@@ -34,19 +34,17 @@ sap.ui.define(
 		 * Constructs a new JourneyRunner instance.
 		 *
 		 * @class A JourneyRunner for executing integration tests with given settings.
-		 *
 		 * @param {object} [mSettings] The settings object
 		 * @param {object} [mSettings.pages] The available Opa pages
 		 * @param {object} [mSettings.opaConfig] The Opa configuration applied via {@link sap.ui.test.Opa5#sap.ui.test.Opa5.extendConfig}
 		 * @param {string} [mSettings.launchUrl] The URL to the launching page (usually a FLP.html)
 		 * @param {object} [mSettings.launchParameters] The URL launch parameters
 		 * @param {boolean} [mSettings.async] If false (default), only one JourneyRunner is executed at a time
-		 *
 		 * @alias sap.fe.test.JourneyRunner
 		 * @public
 		 */
 		var JourneyRunner = BaseObject.extend("sap.fe.test.JourneyRunner", {
-			constructor: function(mSettings) {
+			constructor: function (mSettings) {
 				BaseObject.apply(this);
 				// store a copy of the settings object
 				this._mInstanceSettings = Utils.mergeObjects(
@@ -72,15 +70,14 @@ sap.ui.define(
 			 * @param {boolean} [mSettings.async] If false (default), only one JourneyRunner is executed at a time
 			 * @param {Function[] | string[]} vJourneys The journeys to be executed. If a journey is represented as a string, it will be interpreted
 			 * as a module path to the file that should be loaded. Else it is expected to be a function.
-			 * Alternatively, instead of being wrapped in an array, the journeys can also be given as separate parameters: 
+			 * Alternatively, instead of being wrapped in an array, the journeys can also be given as separate parameters:
 			 * <pre>.run(mSettings, Journey1, Journey2, ...)</pre>
 			 * @returns {object} A <code>Promise</code> that is resolved after all tests have been executed
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#run
 			 * @public
 			 */
-			run: function(mSettings, vJourneys) {
+			run: function (mSettings, vJourneys) {
 				var iJourneyParameterIndex = 1;
 				if (!Utils.isOfType(mSettings, Object)) {
 					iJourneyParameterIndex = 0;
@@ -90,7 +87,8 @@ sap.ui.define(
 				}
 
 				var aJourneys = Array.prototype.slice.call(arguments, iJourneyParameterIndex); // journey-related parameter(s) as array
-				if (aJourneys && aJourneys.length && Array.isArray(aJourneys[0])) { // if the first journey parameter is an array...
+				if (aJourneys && aJourneys.length && Array.isArray(aJourneys[0])) {
+					// if the first journey parameter is an array...
 					aJourneys = aJourneys[0]; // ...then unwrap it, to use this array itself
 				}
 				var bAsync = mSettings.async,
@@ -106,7 +104,7 @@ sap.ui.define(
 					.then(this._preRunActions.bind(this, mSettings))
 					.then(this._runActions.bind(this, aJourneys))
 					.then(this._postRunActions.bind(this, mSettings))
-					.catch(function(oError) {
+					.catch(function (oError) {
 						Log.error("JourneyRunner.run failed", oError);
 					});
 
@@ -127,12 +125,11 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base actions
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseActions
 			 * @protected
 			 */
-			getBaseActions: function(mSettings) {
+			getBaseActions: function (mSettings) {
 				return new BaseActions();
 			},
 
@@ -146,12 +143,11 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base assertions
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseAssertions
 			 * @protected
 			 */
-			getBaseAssertions: function(mSettings) {
+			getBaseAssertions: function (mSettings) {
 				return new BaseAssertions();
 			},
 
@@ -165,83 +161,83 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base arrangements
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseArrangements
 			 * @protected
 			 */
-			getBaseArrangements: function(mSettings) {
+			getBaseArrangements: function (mSettings) {
 				return new BaseArrangements(mSettings);
 			},
 
-			_preRunActions: function(mSettings) {
+			_preRunActions: function (mSettings) {
 				Opa5.extendConfig(this._getOpaConfig(mSettings));
 				Opa5.createPageObjects(mSettings.pages);
 			},
 
-			_runActions: function(aJourneys) {
+			_runActions: function (aJourneys) {
 				var that = this,
 					pPromiseChain = Promise.resolve(),
 					fnRunnerResolve,
-					pRunnerEnds = new Promise(function(resolve) {
+					pRunnerEnds = new Promise(function (resolve) {
 						fnRunnerResolve = resolve;
 					});
 
 				Log.info("JourneyRunner started");
 
-				QUnit.done(function() {
+				QUnit.done(function () {
 					Log.info("JourneyRunner ended");
 					fnRunnerResolve();
 				});
 
-				aJourneys.forEach(function(vJourney) {
+				aJourneys.forEach(function (vJourney) {
 					if (Utils.isOfType(vJourney, String)) {
-						pPromiseChain = pPromiseChain.then(function() {
-							return new Promise(function(resolve, reject) {
-								sap.ui.require([vJourney], function(oJourney) {
+						pPromiseChain = pPromiseChain.then(function () {
+							return new Promise(function (resolve, reject) {
+								sap.ui.require([vJourney], function (oJourney) {
 									resolve(oJourney);
 								});
 							});
 						});
 					} else {
-						pPromiseChain = pPromiseChain.then(function() {
+						pPromiseChain = pPromiseChain.then(function () {
 							return vJourney;
 						});
 					}
 					pPromiseChain = pPromiseChain.then(that._runJourney);
 				});
-				return pPromiseChain.then(function() {
+				return pPromiseChain.then(function () {
 					return pRunnerEnds;
 				});
 			},
 
-			_runJourney: function(vJourney) {
+			_runJourney: function (vJourney) {
 				if (Utils.isOfType(vJourney, Function)) {
 					vJourney.call();
 				}
 			},
 
-			_postRunActions: function(mSettings) {
+			_postRunActions: function (mSettings) {
 				this._removePages(mSettings.pages);
 				Opa5.resetConfig();
 			},
 
-			_removePages: function(mPages) {
+			_removePages: function (mPages) {
 				var that = this;
-				mPages &&
-					Object.keys(mPages).forEach(function(sPageName) {
+				if (mPages) {
+					Object.keys(mPages).forEach(function (sPageName) {
 						var mPage = mPages[sPageName],
 							sClassName = that._createClassName(mPage.namespace || "sap.ui.test.opa.pageObject", sPageName);
 						// remove path entry to avoid error log flooding from OPA5 - it is newly created anyways
 						ObjectPath.set(sClassName, undefined);
 					});
+				}
 			},
 
-			_createClassName: function(sNameSpace, sName) {
+			_createClassName: function (sNameSpace, sName) {
 				return sNameSpace + "." + sName;
 			},
 
-			_getOpaConfig: function(mSettings) {
+			_getOpaConfig: function (mSettings) {
 				var oConfig = Object.assign(
 					{
 						viewNamespace: "sap.fe.templates",
@@ -272,12 +268,11 @@ sap.ui.define(
 		 * Gets the global journey runner instance.
 		 *
 		 * @returns {object} The global default {@link sap.fe.test.JourneyRunner} instance
-		 *
 		 * @function
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.getDefaultRunner = function() {
+		JourneyRunner.getDefaultRunner = function () {
 			if (!_oDefaultRunner) {
 				_oDefaultRunner = new JourneyRunner();
 			}
@@ -288,12 +283,11 @@ sap.ui.define(
 		 * Sets the global journey runner instance.
 		 *
 		 * @param {sap.fe.test.JourneyRunner} oDefaultRunner Defines the global default {@link sap.fe.test.JourneyRunner} instance
-		 *
 		 * @function
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.setDefaultRunner = function(oDefaultRunner) {
+		JourneyRunner.setDefaultRunner = function (oDefaultRunner) {
 			if (_oDefaultRunner) {
 				_oDefaultRunner.destroy();
 			}
@@ -309,7 +303,7 @@ sap.ui.define(
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.run = function() {
+		JourneyRunner.run = function () {
 			var oRunner = JourneyRunner.getDefaultRunner();
 			oRunner.run.apply(oRunner, arguments);
 		};

package/src/sap/fe/test/ListReport.js

@@ -61,19 +61,18 @@ sap.ui.define(
 		 * <code><pre>
 		 * var oListReportDefinition = new ListReport({ appId: "MyApp", componentId: "MyListReportId", entitySet: "MyEntitySet" });
 		 * </pre></code>
-		 *
 		 * @param {object} oPageDefinition The required parameters
 		 * @param {string} oPageDefinition.appId The app id (defined in the manifest root)
 		 * @param {string} oPageDefinition.componentId The component id (defined in the target section for the list report within the manifest)
 		 * @param {string} oPageDefinition.entitySet The entitySet (optional)(defined in the settings of the corresponding target component within the manifest)
 		 * @param {string} oPageDefinition.contextPath The contextPath (optional)(defined in the settings of the corresponding target component within the manifest)
-		 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
+		 * @param {...object} [aInAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.ListReport} A list report page definition
 		 * @name sap.fe.test.ListReport
 		 * @extends sap.fe.test.TemplatePage
 		 * @public
 		 */
-		function ListReport(oPageDefinition, aAdditionalPageDefinitions) {
+		function ListReport(oPageDefinition, aInAdditionalPageDefinitions) {
 			var sAppId = oPageDefinition.appId,
 				sComponentId = oPageDefinition.componentId,
 				sContextPath = oPageDefinition.contextPath,
@@ -164,7 +163,6 @@ sap.ui.define(
 							 *
 							 * @param {boolean} [bCollapse] Defines whether the header should be collapsed, else it is expanded (default)
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-							 *
 							 * @function
 							 * @name sap.fe.test.ListReport.actions#iCollapseExpandPageHeader
 							 * @public
@@ -422,9 +420,7 @@ sap.ui.define(
 									.execute();
 							},
 							iSeeDeleteConfirmation: function () {
-								return this._iSeeTheMessageToast(
-									oResourceBundleCore.getText("C_TRANSACTION_HELPER_OBJECT_PAGE_DELETE_TOAST_SINGULAR")
-								);
+								return this._iSeeTheMessageToast(oResourceBundleCore.getText("C_TRANSACTION_HELPER_DELETE_TOAST_SINGULAR"));
 							},
 							iSeePageTitle: function (sTitle) {
 								return OpaBuilder.create(this)
@@ -436,7 +432,7 @@ sap.ui.define(
 							iSeeVariantTitle: function (sTitle) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId("fe::PageVariantManagement-text")
+									.hasId("fe::PageVariantManagement-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -444,7 +440,7 @@ sap.ui.define(
 							iSeeControlVMFilterBarTitle: function (sTitle) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId(FilterBarId + "::VariantManagement-text")
+									.hasId(FilterBarId + "::VariantManagement-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -453,7 +449,7 @@ sap.ui.define(
 								var sTableId = sIconTabProperty ? getTableId(sIconTabProperty) : SingleTableId;
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId(sTableId + "::VM-text")
+									.hasId(sTableId + "::VM-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -461,15 +457,15 @@ sap.ui.define(
 							iSeeVariantModified: function (bIsModified, bControl) {
 								var sLabelId;
 								if (bControl) {
-									sLabelId = FilterBarId + "::VariantManagement-modified";
+									sLabelId = FilterBarId + "::VariantManagement-vm-modified";
 								} else {
-									sLabelId = "fe::PageVariantManagement-modified";
+									sLabelId = "fe::PageVariantManagement-vm-modified";
 								}
 
 								bIsModified = bIsModified === undefined ? true : bIsModified;
 								if (bIsModified) {
 									return OpaBuilder.create(this)
-										.hasType("sap.m.Label")
+										.hasType("sap.m.Text")
 										.hasId(sLabelId)
 										.hasProperties({ text: "*" })
 										.description("Seeing variant state as 'modified'")

package/src/sap/fe/test/ObjectPage.js

@@ -125,7 +125,6 @@ sap.ui.define(
 		 * <code><pre>
 		 * var oObjectPageDefinition = new ObjectPage({ appId: "MyApp", componentId: "MyObjectPageId", entitySet: "MyEntitySet" });
 		 * </pre></code>
-		 *
 		 * @param {object} oPageDefinition The required parameters
 		 * @param {string} oPageDefinition.appId The app id (defined in the manifest root)
 		 * @param {string} oPageDefinition.componentId The component id (defined in the target section for the list report within the manifest)
@@ -154,7 +153,7 @@ sap.ui.define(
 				AnchorBarId = "fe::ObjectPage-anchBar",
 				PaginatorId = "fe::Paginator",
 				EditableHeaderTitleId = "EditableHeaderForm::EditableHeaderTitle",
-				Page_EditMode = {
+				PageEditMode = {
 					DISPLAY: "Display",
 					EDITABLE: "Editable"
 				},
@@ -262,7 +261,6 @@ sap.ui.define(
 							 *
 							 * @param {boolean} [bCollapse] Defines whether header should be collapsed, else it gets expanded (default)
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-							 *
 							 * @function
 							 * @name sap.fe.test.ObjectPage.actions#iCollapseExpandPageHeader
 							 * @public
@@ -309,15 +307,15 @@ sap.ui.define(
 									.execute();
 							},
 							iEnableLink: function (sText) {
-								return (
-									OpaBuilder.create(this)
-										.hasType("sap.m.ColumnListItem")
-										//.hasAggregationProperties("cells", { text: sText })
-										.isDialogElement()
-										.doPress("selectMulti")
-										.description("The CheckBox for link " + sText + " is selected")
-										.execute()
-								);
+								var vAggregationMatcher = FEBuilder.Matchers.deepAggregationMatcher("cells/items/items", [
+									OpaBuilder.Matchers.properties({ text: sText })
+								]);
+								return OpaBuilder.create(this)
+									.hasType("sap.m.ColumnListItem")
+									.has(vAggregationMatcher)
+									.doPress("selectMulti")
+									.description("The CheckBox for link " + sText + " is selected")
+									.execute();
 							},
 							iPressKeyboardShortcutOnSection: function (sShortcut, mProperties) {
 								return this._iPressKeyboardShortcut(undefined, sShortcut, mProperties, "sap.uxap.ObjectPageSection");
@@ -340,7 +338,6 @@ sap.ui.define(
 							 * }
 							 * </pre></code>
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-							 *
 							 * @function
 							 * @name sap.fe.test.ObjectPage.actions#iGoToSection
 							 * @public
@@ -391,7 +388,6 @@ sap.ui.define(
 							 *
 							 * @param {string} sName The name of the section
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-							 *
 							 * @private
 							 */
 							iOpenSectionWithTitle: function (sName) {
@@ -448,6 +444,19 @@ sap.ui.define(
 											.description("Click on the message")
 									)
 									.execute();
+							},
+							iClickBackOnMessageView: function () {
+								return OpaBuilder.create(this)
+									.hasType("sap.m.MessageView")
+									.isDialogElement(true)
+									.doOnChildren(
+										OpaBuilder.create(this)
+											.hasType("sap.m.Button")
+											.hasProperties({ icon: "sap-icon://nav-back" })
+											.doPress()
+											.description("Click on the message view back")
+									)
+									.execute();
 							}
 						},
 						/**
@@ -617,10 +626,10 @@ sap.ui.define(
 									.execute();
 							},
 							iSeeObjectPageInDisplayMode: function () {
-								return this._iSeeObjectPageInMode(Page_EditMode.DISPLAY);
+								return this._iSeeObjectPageInMode(PageEditMode.DISPLAY);
 							},
 							iSeeObjectPageInEditMode: function () {
-								return this._iSeeObjectPageInMode(Page_EditMode.EDITABLE);
+								return this._iSeeObjectPageInMode(PageEditMode.EDITABLE);
 							},
 							_iSeeObjectPageInMode: function (sMode) {
 								return OpaBuilder.create(this)
@@ -708,6 +717,14 @@ sap.ui.define(
 									.description("SimpleForm has label '" + sTitle + "' is present")
 									.execute();
 							},
+							iSeeGridWithLabel: function (sText) {
+								return OpaBuilder.create(this)
+									.hasType("sap.ui.layout.Grid")
+									.isDialogElement(true)
+									.doOnChildren(OpaBuilder.create(this).hasType("sap.m.Label").hasProperties({ text: sText }))
+									.description("Grid Layout has label '" + sText + "' is present")
+									.execute();
+							},
 							iSeeSelectLinksDialog: function () {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
@@ -744,9 +761,7 @@ sap.ui.define(
 								return this._iSeeTheMessageToast(oResourceBundleCore.getText("C_TRANSACTION_HELPER_OBJECT_SAVED"));
 							},
 							iSeeDeleteConfirmation: function () {
-								return this._iSeeTheMessageToast(
-									oResourceBundleCore.getText("C_TRANSACTION_HELPER_OBJECT_PAGE_DELETE_TOAST_SINGULAR")
-								);
+								return this._iSeeTheMessageToast(oResourceBundleCore.getText("C_TRANSACTION_HELPER_DELETE_TOAST_SINGULAR"));
 							},
 							iSeeConfirmMessageBoxWithTitle: function (sTitle) {
 								return OpaBuilder.create(this)
@@ -777,7 +792,7 @@ sap.ui.define(
 							iSeeControlVMTableTitle: function (sTitle, sNavProperty) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId(getTableId(sNavProperty) + "::VM-text")
+									.hasId(getTableId(sNavProperty) + "::VM-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -828,19 +843,6 @@ sap.ui.define(
 									.description("MessageItem is correctly displayed")
 									.execute();
 							},
-							iClickBackOnMessageView: function () {
-								return OpaBuilder.create(this)
-									.hasType("sap.m.MessageView")
-									.isDialogElement(true)
-									.doOnChildren(
-										OpaBuilder.create(this)
-											.hasType("sap.m.Button")
-											.hasProperties({ icon: "sap-icon://nav-back" })
-											.doPress()
-											.description("Click on the message view back")
-									)
-									.execute();
-							},
 							iCheckVisibilityOfButtonWithText: function (sText, bExpectedVisibility) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Button")

package/src/sap/fe/test/Shell.js

@@ -12,7 +12,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 	 * @class Provides a test page definition for the shell.
 	 *
 	 * When using {@link sap.fe.test.JourneyRunner}, this page is made available by default via <code>onTheShell</code>.
-	 *
 	 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 	 * @returns {sap.fe.test.Shell} A shell page definition
 	 * @name sap.fe.test.Shell
@@ -29,7 +28,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 						 * Navigates back via shell back button.
 						 *
 						 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-						 *
 						 * @function
 						 * @name sap.fe.test.Shell#iNavigateBack
 						 * @public
@@ -41,7 +39,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 						 * Navigates to the launch pad via the home button.
 						 *
 						 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-						 *
 						 * @function
 						 * @name sap.fe.test.Shell#iNavigateHome
 						 * @public
@@ -61,7 +58,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 						 * Opens the navigation menu in the shell header.
 						 *
 						 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-						 *
 						 * @function
 						 * @name sap.fe.test.Shell#iOpenNavigationMenu
 						 * @public
@@ -78,7 +74,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 						 *
 						 * @param {string} sItem The label of the navigation item
 						 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-						 *
 						 * @function
 						 * @name sap.fe.test.Shell#iNavigateViaMenu
 						 * @public
@@ -95,7 +90,6 @@ sap.ui.define(["sap/ui/test/OpaBuilder", "sap/ui/test/Opa5", "sap/fe/test/Utils"
 						 *
 						 * @param {string} sTarget The target application (hash)
 						 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-						 *
 						 * @function
 						 * @name sap.fe.test.Shell#iPressTile
 						 * @public

package/src/sap/fe/test/TemplatePage.js

@@ -241,7 +241,6 @@ sap.ui.define(
 
 		/**
 		 * @class Provides a test page definition for a template page with the corresponding parameters.
-		 *
 		 * @param {object | string} vViewId The viewId
 		 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.TemplatePage} A list report page definition
@@ -368,7 +367,6 @@ sap.ui.define(
 								 * Confirms the visibility of the current page.
 								 *
 								 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-								 *
 								 * @function
 								 * @name sap.fe.test.TemplatePage.assertions#iSeeThisPage
 								 * @public

package/src/sap/fe/test/TemplatingTestUtils.js

@@ -12,7 +12,7 @@ sap.ui.define(
 		"sap/fe/core/TemplateModel",
 		"sap/fe/macros/ResourceModel"
 	],
-	function(ODataMetaModel, XMLPreprocessor, XMLTemplateProcessor, macroLibrary, TemplateModel) {
+	function (ODataMetaModel, XMLPreprocessor, XMLTemplateProcessor, macroLibrary, TemplateModel) {
 		"use strict";
 		/**
 		 * Unit Test parts of XML fragments for mocked metadata against expected results.
@@ -48,14 +48,14 @@ sap.ui.define(
 		 * 	]
 		 * @param {boolean} useMacros Enables macros during the test. Typically, a test should only template an indivdual fragement, so
 		 * 							  the macros are switched off. For some special tests they can be enabled with this parameter
-		 * @param mResourceModel Required resource model from which to get the semantic texts
-		 * @param sandbox Sandbox used to stub getText method for semantic key tests
+		 * @param {any} mResourceModel Required resource model from which to get the semantic texts
+		 * @param {any} sandbox Sandbox used to stub getText method for semantic key tests
 		 */
 		function testFragments(QUnit, sTitle, oMetaMockData, aFragmentTests, useMacros, mResourceModel, sandbox) {
 			var sServiceUrl = "./test/",
 				//Mock the requestor for metadata only
 				oRequestor = {
-					read: function() {
+					read: function () {
 						return Promise.resolve(oMetaMockData);
 					},
 					mHeaders: {}
@@ -76,7 +76,7 @@ sap.ui.define(
 				};
 
 				//Inject models and bindingContexts
-				Object.keys(mBindingContexts).forEach(function(sKey) {
+				Object.keys(mBindingContexts).forEach(function (sKey) {
 					var oModel = mModels[sKey] || oMetaModel;
 					if (!(oModel instanceof sap.ui.model.Model) && !(oModel instanceof sap.ui.model.odata.v4.ODataMetaModel)) {
 						oModel = new TemplateModel(oModel, oMetaModel);
@@ -100,12 +100,12 @@ sap.ui.define(
 
 			QUnit.module("Smoke Tests for " + sTitle);
 
-			QUnit.test("Check if metadata is available", function(assert) {
+			QUnit.test("Check if metadata is available", function (assert) {
 				return Promise.all([
-					oMetaModel.requestObject("/").then(function(oEntityContainer) {
+					oMetaModel.requestObject("/").then(function (oEntityContainer) {
 						assert.ok(oEntityContainer, "Entity Container found");
 					}),
-					oMetaModel.requestObject("/$").then(function(oMetadataDocument) {
+					oMetaModel.requestObject("/$").then(function (oMetadataDocument) {
 						assert.ok(oMetadataDocument, "Metadata Document found");
 					})
 				]);
@@ -126,9 +126,9 @@ sap.ui.define(
 						oFragment.sFragmentName +
 						(oFragment.sDescription ? " (" + oFragment.sDescription + ")" : ""),
 					{
-						beforeEach: function() {
+						beforeEach: function () {
 							if (mResourceModel) {
-								mResourceBundleStub = sandbox.stub(mResourceModel, "getText").callsFake(function(sKey) {
+								mResourceBundleStub = sandbox.stub(mResourceModel, "getText").callsFake(function (sKey) {
 									if (sKey === "T_NEW_OBJECT") {
 										return "New Object";
 									} else {
@@ -137,7 +137,7 @@ sap.ui.define(
 								});
 							}
 						},
-						afterEach: function() {
+						afterEach: function () {
 							if (mResourceBundleStub) {
 								mResourceBundleStub.restore();
 							}
@@ -145,14 +145,14 @@ sap.ui.define(
 					}
 				);
 
-				oFragment.tests.forEach(function(oScope, index) {
-					QUnit.test(oScope.description || "Test " + oFragment.fileType + " scope: " + index, function(assert) {
+				oFragment.tests.forEach(function (oScope, index) {
+					QUnit.test(oScope.description || "Test " + oFragment.fileType + " scope: " + index, function (assert) {
 						return oMetaModel
 							.requestObject("/$")
-							.then(function() {
+							.then(function () {
 								return XMLTemplateProcessor.loadTemplatePromise(oFragment.sFragmentName, oFragment.fileType);
 							})
-							.then(function(oDocumentElement) {
+							.then(function (oDocumentElement) {
 								return templateFragment(
 									assert,
 									oDocumentElement,
@@ -160,7 +160,7 @@ sap.ui.define(
 									Object.assign({}, oFragment.mModels, oScope.mModels)
 								);
 							})
-							.then(function(oDocumentElement) {
+							.then(function (oDocumentElement) {
 								var aElements = [].filter.call(
 										oDocumentElement.ownerDocument.querySelectorAll("*"),
 										hasUnitTestIdAttribute
@@ -172,13 +172,13 @@ sap.ui.define(
 									return oElement.getAttribute("unittest:id") !== null;
 								}
 
-								function testAttributes(oElement, oExpectedResults, sTestId) {
+								function testAttributes(oElement, oExpectedResults, sSubTestId) {
 									function testSingleAttribute(sAttributeName) {
 										if (oExpectedResults[sAttributeName] === undefined) {
 											assert.ok(
 												!oElement.hasAttribute(sAttributeName),
 												'unittest:id="' +
-													sTestId +
+													sSubTestId +
 													"\": attribute '" +
 													sAttributeName +
 													"' is expected not to be rendered"
@@ -189,7 +189,7 @@ sap.ui.define(
 												sResult,
 												oExpectedResults[sAttributeName],
 												'unittest:id="' +
-													sTestId +
+													sSubTestId +
 													"\": attribute '" +
 													sAttributeName +
 													"' properly created as " +
@@ -216,7 +216,7 @@ sap.ui.define(
 									"All tests have been executed for this test case"
 								);
 							})
-							.catch(function(vException) {
+							.catch(function (vException) {
 								var sExpectedException = oScope.sExpectedException;
 								if (vException && sExpectedException) {
 									assert.strictEqual(