@sapui5/sap.fe.test 1.109.0 → 1.110.0

package/src/sap/fe/test/api/DialogMessageAssertions.js

@@ -1,87 +1,90 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
-sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/Utils"], function(
-	DialogAssertions,
-	OpaBuilder,
-	FEBuilder,
-	Utils
-) {
-	"use strict";
+sap.ui.define(
+	["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/Utils"],
+	function (DialogAssertions, OpaBuilder, FEBuilder, Utils) {
+		"use strict";
 
-	/**
-	 * Constructs a new DialogMessageActions instance.
-	 *
-	 * @param {sap.fe.test.builder.DialogBuilder} oDialogBuilder The {@link sap.fe.test.builder.DialogBuilder} instance used to interact with the UI
-	 * @param {string} [vDialogDescription] Description (optional) of the dialog to be used for logging messages
-	 * @returns {sap.fe.test.api.DialogMessageAssertions} The new instance
-	 * @extends sap.fe.test.api.DialogAssertions
-	 * @alias sap.fe.test.api.DialogMessageAssertions
-	 * @class
-	 * @hideconstructor
-	 * @public
-	 */
-	var DialogMessageAssertions = function(oDialogBuilder, vDialogDescription) {
-		return DialogAssertions.call(this, oDialogBuilder, vDialogDescription, 0);
-	};
-	DialogMessageAssertions.prototype = Object.create(DialogAssertions.prototype);
-	DialogMessageAssertions.prototype.constructor = DialogMessageAssertions;
-	DialogMessageAssertions.prototype.isAction = false;
+		/**
+		 * Constructs a new DialogMessageActions instance.
+		 *
+		 * @param {sap.fe.test.builder.DialogBuilder} oDialogBuilder The {@link sap.fe.test.builder.DialogBuilder} instance used to interact with the UI
+		 * @param {string} [vDialogDescription] Description (optional) of the dialog to be used for logging messages
+		 * @returns {sap.fe.test.api.DialogMessageAssertions} The new instance
+		 * @extends sap.fe.test.api.DialogAssertions
+		 * @alias sap.fe.test.api.DialogMessageAssertions
+		 * @class
+		 * @hideconstructor
+		 * @public
+		 */
+		var DialogMessageAssertions = function (oDialogBuilder, vDialogDescription) {
+			return DialogAssertions.call(this, oDialogBuilder, vDialogDescription, 0);
+		};
+		DialogMessageAssertions.prototype = Object.create(DialogAssertions.prototype);
+		DialogMessageAssertions.prototype.constructor = DialogMessageAssertions;
+		DialogMessageAssertions.prototype.isAction = false;
 
-	/**
-	 * Checks the <code>Back</code> action on the message dialog.
-	 *
-	 * @param {object} [mState] Defines the expected state of the button
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageAssertions.prototype.iCheckBack = function(mState) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasHeaderButton(OpaBuilder.Matchers.properties({ icon: "sap-icon://nav-back" }), mState)
-				.description(
-					Utils.formatMessage("Checking that dialog '{0}' has a back button with state '{1}'", this.getIdentifier(), mState)
-				)
-				.execute()
-		);
-	};
+		/**
+		 * Checks the <code>Back</code> action on the message dialog.
+		 *
+		 * @param {object} [mState] Defines the expected state of the button
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageAssertions.prototype.iCheckBack = function (mState) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasHeaderButton(OpaBuilder.Matchers.properties({ icon: "sap-icon://nav-back" }), mState)
+					.description(
+						Utils.formatMessage("Checking that dialog '{0}' has a back button with state '{1}'", this.getIdentifier(), mState)
+					)
+					.execute()
+			);
+		};
 
-	/**
-	 * Checks the <code>Refresh</code> action on the dialog.
-	 *
-	 * @param {object} [mState] Defines the expected state of the button
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageAssertions.prototype.iCheckRefresh = function(mState) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_COMMON_SAPFE_REFRESH"), mState)
-				.description(
-					Utils.formatMessage("Checking that dialog '{0}' has a refresh button with state '{1}'", this.getIdentifier(), mState)
-				)
-				.execute()
-		);
-	};
+		/**
+		 * Checks the <code>Refresh</code> action on the dialog.
+		 *
+		 * @param {object} [mState] Defines the expected state of the button
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageAssertions.prototype.iCheckRefresh = function (mState) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_COMMON_SAPFE_REFRESH"), mState)
+					.description(
+						Utils.formatMessage(
+							"Checking that dialog '{0}' has a refresh button with state '{1}'",
+							this.getIdentifier(),
+							mState
+						)
+					)
+					.execute()
+			);
+		};
 
-	/**
-	 * Checks whether a certain message is shown in the dialog.
-	 *
-	 * @param {object} [oMessage] Defines the expected state of the message, e.g. <code>{ title: "My message" }</code>
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageAssertions.prototype.iCheckMessage = function(oMessage) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasContent(FEBuilder.Matchers.states({ controlType: "sap.m.MessageView" }), true)
-				.hasAggregation("items", OpaBuilder.Matchers.properties(oMessage))
-				.description(Utils.formatMessage("Checking dialog '{0}' having a message '{1}' ", this.getIdentifier(), oMessage))
-				.execute()
-		);
-	};
+		/**
+		 * Checks whether a certain message is shown in the dialog.
+		 *
+		 * @param {object} [oMessage] Defines the expected state of the message, e.g. <code>{ title: "My message" }</code>
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageAssertions.prototype.iCheckMessage = function (oMessage) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasContent(FEBuilder.Matchers.states({ controlType: "sap.m.MessageView" }), true)
+					.hasAggregation("items", OpaBuilder.Matchers.properties(oMessage))
+					.description(Utils.formatMessage("Checking dialog '{0}' having a message '{1}' ", this.getIdentifier(), oMessage))
+					.execute()
+			);
+		};
 
-	return DialogMessageAssertions;
-});
+		return DialogMessageAssertions;
+	}
+);

package/src/sap/fe/test/api/DialogType.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[],

package/src/sap/fe/test/api/DialogValueHelpActions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/DialogValueHelpAssertions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/EditState.js

@@ -1,11 +1,12 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	["sap/fe/macros/filter/DraftEditState"],
-	function(EditState) {
+	function (EditState) {
 		"use strict";
 
 		/**

package/src/sap/fe/test/api/FilterBarAPI.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/FilterBarActions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/FilterBarAssertions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/FooterAPI.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[
@@ -11,7 +12,7 @@ sap.ui.define(
 		"sap/ui/test/OpaBuilder",
 		"sap/fe/test/builder/FEBuilder"
 	],
-	function(BaseAPI, Utils, OverflowToolbarBuilder, OpaBuilder, FEBuilder) {
+	function (BaseAPI, Utils, OverflowToolbarBuilder, OpaBuilder, FEBuilder) {
 		"use strict";
 
 		/**
@@ -23,7 +24,7 @@ sap.ui.define(
 		 * @class
 		 * @private
 		 */
-		var FooterAPI = function(oOverflowToolbarBuilder, vFooterDescription) {
+		var FooterAPI = function (oOverflowToolbarBuilder, vFooterDescription) {
 			if (!Utils.isOfType(oOverflowToolbarBuilder, OverflowToolbarBuilder)) {
 				throw new Error("oOverflowToolbarBuilder parameter must be a OverflowToolbarBuilder instance");
 			}

package/src/sap/fe/test/api/FooterActionsBase.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(["./FooterAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function (FooterAPI, Utils, OpaBuilder) {
 	"use strict";

package/src/sap/fe/test/api/FooterActionsOP.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(["./FooterActionsBase", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function (FooterActionsBase, Utils, OpaBuilder) {
 	"use strict";

package/src/sap/fe/test/api/FooterAssertionsBase.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(["./FooterAPI", "sap/fe/test/Utils"], function (FooterAPI, Utils) {
 	"use strict";

package/src/sap/fe/test/api/FooterAssertionsOP.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(["./FooterAssertionsBase", "sap/fe/test/Utils", "sap/m/library"], function (FooterAssertionsBase, Utils, mLibrary) {
 	"use strict";

package/src/sap/fe/test/api/FormAPI.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/FormActions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/FormAssertions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	["./FormAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/builder/MacroFieldBuilder"],

package/src/sap/fe/test/api/HeaderAPI.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/HeaderActions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	["./HeaderAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "./APIHelper"],

package/src/sap/fe/test/api/HeaderActionsLR.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	["./HeaderLR", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "./APIHelper"],

package/src/sap/fe/test/api/HeaderAssertions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/HeaderAssertionsLR.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/HeaderLR.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[

package/src/sap/fe/test/api/KPICardAPI.js

@@ -1,9 +1,10 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
-sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/fe/test/builder/KPIBuilder"], function(BaseAPI, Utils, KPIBuilder) {
+sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/fe/test/builder/KPIBuilder"], function (BaseAPI, Utils, KPIBuilder) {
 	"use strict";
 
 	/**
@@ -16,7 +17,7 @@ sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/fe/test/builder/KPIBuilder
 	 * @hideconstructor
 	 * @public
 	 */
-	var KPICardAPI = function(oKPIBuilder) {
+	var KPICardAPI = function (oKPIBuilder) {
 		if (!Utils.isOfType(oKPIBuilder, KPIBuilder)) {
 			throw new Error("oKPIBuilder parameter must be an KPIBuilder instance");
 		}

package/src/sap/fe/test/api/KPICardActions.js

@@ -1,9 +1,10 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
-sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuilder"], function(KPICardAPI, Utils, FEBuilder) {
+sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuilder"], function (KPICardAPI, Utils, FEBuilder) {
 	"use strict";
 
 	/**
@@ -16,7 +17,7 @@ sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuild
 	 * @hideconstructor
 	 * @public
 	 */
-	var KPICardActions = function(oBuilderInstance) {
+	var KPICardActions = function (oBuilderInstance) {
 		return KPICardAPI.call(this, oBuilderInstance);
 	};
 	KPICardActions.prototype = Object.create(KPICardAPI.prototype);
@@ -28,15 +29,10 @@ sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuild
 	 *
 	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 	 */
-	KPICardActions.prototype.iClickHeader = function() {
+	KPICardActions.prototype.iClickHeader = function () {
 		var oKPIBuilder = this.getBuilder();
 
-		return this.prepareResult(
-			oKPIBuilder
-				.doClickKPICardHeader()
-				.description("Clicking KPI card header")
-				.execute()
-		);
+		return this.prepareResult(oKPIBuilder.doClickKPICardHeader().description("Clicking KPI card header").execute());
 	};
 
 	return KPICardActions;

package/src/sap/fe/test/api/KPICardAssertions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuilder"], function (KPICardAPI, Utils, FEBuilder) {
 	"use strict";

package/src/sap/fe/test/api/TableAPI.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[
@@ -47,7 +48,7 @@ sap.ui.define(
 		TableAPI.prototype = Object.create(BaseAPI.prototype);
 		TableAPI.prototype.constructor = TableAPI;
 
-		TableAPI.createRowMatchers = function (vRowValues, mRowState, vAdditionalMatchers, vEmptyCells) {
+		TableAPI.createRowMatchers = function (vRowValues, mRowState, vAdditionalMatchers, vHiddenCells) {
 			var aArguments = Utils.parseArguments([[Object, Number], Object, [Array, Function], Array], arguments),
 				aRowMatchers = [];
 			if (Utils.isOfType(aArguments[0], Object)) {
@@ -65,7 +66,7 @@ sap.ui.define(
 				aRowMatchers.push(TableBuilder.Row.Matchers.states(aArguments[1]));
 			}
 			if (!Utils.isOfType(aArguments[3], [null, undefined])) {
-				aRowMatchers.push(TableBuilder.Row.Matchers.emptyCells(aArguments[3]));
+				aRowMatchers.push(TableBuilder.Row.Matchers.hiddenCells(aArguments[3]));
 			}
 			if (!Utils.isOfType(aArguments[2], [null, undefined])) {
 				aRowMatchers = aRowMatchers.concat(aArguments[2]);

package/src/sap/fe/test/api/TableActions.js

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[
@@ -727,17 +728,22 @@ sap.ui.define(
 		 * Sorts the table entries by the specified column.
 		 *
 		 * @param {string | sap.fe.test.api.ColumnIdentifier | number} vColumnIdentifier The identifier of the column field, its label or index
-		 * @param {string} [sFieldLabel] The target field to sort by in case of a complex property
-		 * @param {boolean} bDescending
+		 * @param {string} [sFieldLabel] The target field for sorting in case the field label differs from the column label or in case of a complex property
+		 * @param {boolean} [bDescending] Sorting (true=descending, false=ascending (default))
+		 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set sortings (default), otherwise all previously set sorting fields will be kept.
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 * @public
 		 */
-		Actions.prototype.iSortByColumn = function (vColumnIdentifier, sFieldLabel, bDescending) {
+		Actions.prototype.iSortByColumn = function (vColumnIdentifier, sFieldLabel, bDescending, bClearFirst) {
 			var oTableBuilder = this.getBuilder(),
-				vColumn = Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier;
+				vColumn = Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier,
+				bClear = bClearFirst || bClearFirst === undefined,
+				sFieldName = !sFieldLabel ? vColumn : sFieldLabel,
+				sSorting = bDescending ? SortOrder.Descending : SortOrder.Ascending;
+
 			return this.prepareResult(
 				oTableBuilder
-					.doSortByColumn(vColumn, sFieldLabel, bDescending)
+					.doSortByColumn(vColumn, sFieldName, sSorting, bClear)
 					.description(
 						Utils.formatMessage(
 							"Sorting column '{1}{2}' of table '{0}'",
@@ -754,13 +760,14 @@ sap.ui.define(
 		 * Groups the table entries by the specified column.
 		 *
 		 * @param {string | sap.fe.test.api.ColumnIdentifier | number} vColumnIdentifier The identifier of the column field, its label or index
-		 * @param {string} [sFieldLabel] The target field to group on in case of a complex property
+		 * @param {string} [sFieldLabel] The target field for grouping. If undefined, parameter vColumnIdentifier is used as label to identify the toggle button.
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 * @public
 		 */
 		Actions.prototype.iGroupByColumn = function (vColumnIdentifier, sFieldLabel) {
 			var oTableBuilder = this.getBuilder(),
 				vColumn = Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier;
+
 			return this.prepareResult(
 				oTableBuilder
 					.doGroupByColumn(vColumn, sFieldLabel)
@@ -780,7 +787,7 @@ sap.ui.define(
 		 * Aggregates the table entries by the specified column.
 		 *
 		 * @param {string | sap.fe.test.api.ColumnIdentifier | number} vColumnIdentifier The identifier of the column field, its label or index
-		 * @param {string} [sFieldLabel] The target field to group on in case of a complex property
+		 * @param {string} [sFieldLabel] The target field to group on. If undefined, parameter vColumnIdentifier is used as label to identify the toggle button.
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 * @public
 		 */