@sapui5/sap.fe.test 1.93.3 → 1.97.0

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

@@ -42,7 +42,11 @@ sap.ui.define(
 					if (sSingleDeltaManifest.indexOf("/") !== 0) {
 						sSingleDeltaManifest = sComponentName + "/" + sSingleDeltaManifest;
 					}
-					oTargetManifest = mergeObjects({}, oTargetManifest, LoaderExtensions.loadResource(sSingleDeltaManifest));
+					try {
+						oTargetManifest = mergeObjects({}, oTargetManifest, LoaderExtensions.loadResource(sSingleDeltaManifest));
+					} catch (ignore) {
+						// not always an error, e.g. when navigating to a different app that does not have the delta manifest
+					}
 				});
 			}
 

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

@@ -68,6 +68,37 @@ sap.ui.define(
 		 * @public
 		 */
 
+		/**
+		 * An action parameter dialog field identifier
+		 *
+		 * @typedef {object} ActionDialogFieldIdentifier
+		 * @property {string} property The name of the field
+		 *
+		 * @name sap.fe.test.api.ActionDialogFieldIdentifier
+		 * @public
+		 */
+
+		/**
+		 * An dialog field identifier
+		 *
+		 * @typedef {object} DialogFieldIdentifier
+		 * @property {string} property The name of the field
+		 * In case of an action parameter dialog, this is the fieldname only
+		 * <code><pre>
+		 * {
+		 *     property: <fieldname>
+		 * }
+		 * </pre></code>
+		 * In case of a create dialog, the concatenation of the entity and fieldname has to be provided
+		 * <code><pre>
+		 * {
+		 *     property: <entity>::<fieldname>
+		 * }
+		 * </pre></code>
+		 * @name sap.fe.test.api.DialogFieldIdentifier
+		 * @public
+		 */
+
 		function _findParentChainFunction(oResult, sChainKeyword) {
 			var oAnd = oResult.and;
 			if (sChainKeyword in oAnd) {

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

@@ -115,5 +115,16 @@ sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/
 			.execute();
 	};
 
+	Actions.prototype.iExecuteActionWithText = function(sText) {
+		return OpaBuilder.create(this)
+			.hasType("sap.m.Button")
+			.hasProperties({
+				text: sText
+			})
+			.doPress()
+			.description("Clicked on button" + sText)
+			.execute();
+	};
+
 	return Actions;
 });

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

@@ -25,11 +25,26 @@ sap.ui.define(
 		ChartAssertions.prototype.constructor = ChartAssertions;
 		ChartAssertions.prototype.isAction = false;
 
-		ChartAssertions.prototype.iCheckItems = function(iNumberOfItems) {
+		ChartAssertions.prototype.iCheckItems = function(iNumberOfItems, sTab) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.Chart")
-				.check(function(oChart) {
-					var aContexts = oChart[0].getBinding("data").getContexts();
+				.hasType("sap.ui.mdc.ChartNew")
+				.check(function(aCharts) {
+					var oChart;
+					if (sTab && aCharts && aCharts.length > 1) {
+						for (var i = 0; i < aCharts.length; i++) {
+							if (aCharts[i].getId().indexOf("fe::Chart::" + sTab) > -1) {
+								oChart = aCharts[i];
+								break;
+							}
+						}
+					} else {
+						oChart = aCharts[0];
+					}
+					var aContexts = oChart
+						.getControlDelegate()
+						._getChart(oChart)
+						.getBinding("data")
+						.getContexts();
 					return (
 						(aContexts && (iNumberOfItems === undefined ? aContexts.length !== 0 : aContexts.length === iNumberOfItems)) ||
 						(!aContexts && iNumberOfItems === 0)
@@ -41,7 +56,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iSeeChartType = function(sChartType) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.Chart")
+				.hasType("sap.ui.mdc.ChartNew")
 				.check(function(oChart) {
 					return sChartType === oChart[0].getChartType();
 				}, true)
@@ -51,7 +66,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iSeeChartVisible = function() {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.Chart")
+				.hasType("sap.ui.mdc.ChartNew")
 				.check(function(oChart) {
 					return oChart[0].getVisible() === true;
 				}, true)
@@ -88,13 +103,26 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iCheckChartNoDataText = function(sNoDataText) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.Chart")
+				.hasType("sap.ui.mdc.ChartNew")
 				.check(function(oChart) {
 					return sNoDataText === oChart[0].getNoDataText();
 				})
 				.description("No Data text is " + sNoDataText)
 				.execute();
 		};
+
+		ChartAssertions.prototype.iCheckButtonWithText = function(sText) {
+			return OpaBuilder.create(this)
+				.hasType("sap.m.Button")
+				.hasProperties({ text: sText })
+				.description("Seeing Button with text '" + sText + "'")
+				.execute();
+		};
+
+		ChartAssertions.prototype.iCheckMessageToastWithText = function(sText) {
+			return FEBuilder.createMessageToastBuilder(sText).execute(this);
+		};
+
 		return ChartAssertions;
 	}
 );

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

@@ -2,46 +2,95 @@
  * ! SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */
-sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/fe/test/builder/DialogBuilder"], function(BaseAPI, Utils, DialogBuilder) {
-	"use strict";
+sap.ui.define(
+	[
+		"./BaseAPI",
+		"sap/fe/test/Utils",
+		"sap/fe/test/builder/FEBuilder",
+		"sap/fe/test/builder/MdcFieldBuilder",
+		"sap/fe/test/builder/DialogBuilder"
+	],
+	function(BaseAPI, Utils, FEBuilder, MdcFieldBuilder, DialogBuilder) {
+		"use strict";
 
-	/**
-	 * Constructs a new DialogAPI 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
-	 * @param {int} [iConfirmButtonIndex] Index of the 'confirm' button in the button aggregation; the default setting is 0 (first button from the left)
-	 * @returns {sap.fe.test.api.DialogAPI} The new instance
-	 * @class
-	 * @private
-	 */
-	var DialogAPI = function(oDialogBuilder, vDialogDescription, iConfirmButtonIndex) {
-		if (!Utils.isOfType(oDialogBuilder, DialogBuilder)) {
-			throw new Error("oDialogBuilder parameter must be a DialogBuilder instance");
-		}
-		this._iConfirmButtonIndex = iConfirmButtonIndex || 0;
-		return BaseAPI.call(this, oDialogBuilder, vDialogDescription);
-	};
-	DialogAPI.prototype = Object.create(BaseAPI.prototype);
-	DialogAPI.prototype.constructor = DialogAPI;
+		/**
+		 * Constructs a new DialogAPI 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
+		 * @param {int} [iConfirmButtonIndex] Index of the 'confirm' button in the button aggregation; the default setting is 0 (first button from the left)
+		 * @returns {sap.fe.test.api.DialogAPI} The new instance
+		 * @class
+		 * @private
+		 */
+		var DialogAPI = function(oDialogBuilder, vDialogDescription, iConfirmButtonIndex) {
+			if (!Utils.isOfType(oDialogBuilder, DialogBuilder)) {
+				throw new Error("oDialogBuilder parameter must be a DialogBuilder instance");
+			}
+			this._iConfirmButtonIndex = iConfirmButtonIndex || 0;
+			return BaseAPI.call(this, oDialogBuilder, vDialogDescription);
+		};
+		DialogAPI.prototype = Object.create(BaseAPI.prototype);
+		DialogAPI.prototype.constructor = DialogAPI;
+
+		/**
+		 * Creates a matcher for fields within create and action dialogs.
+		 *
+		 * @param {sap.fe.test.api.FieldIdentifier | string} vFieldIdentifier Identifier to be used for the matcher
+		 * @param {object} oDialogIdentifier Identifier for the dialog (create/action)
+		 *
+		 * @returns {object} A matcher
+		 *
+		 * @private
+		 */
+		DialogAPI.prototype._createFieldMatcher = function(vFieldIdentifier, oDialogIdentifier) {
+			var vMatcher, sFieldId;
+			if (!Utils.isOfType(vFieldIdentifier, String)) {
+				if (typeof vFieldIdentifier.property === "string") {
+					sFieldId =
+						oDialogIdentifier && oDialogIdentifier.type === "Create"
+							? "CreateDialog::" + vFieldIdentifier.property.replaceAll("/", "::")
+							: "APD_::" + vFieldIdentifier.property.replaceAll("/", "::");
+				} else {
+					throw new Error(
+						"The 'property' parameter for creating a control ID for a field in an action dialog is not supported: " +
+							vFieldIdentifier.property
+					);
+				}
+				vMatcher = FEBuilder.Matchers.id(new RegExp(Utils.formatMessage("{0}", sFieldId)));
+			} else {
+				// identify a field by its label
+				//vMatcher = FEBuilder.Matchers.label(vFieldIdentifier);
+			}
+			return vMatcher;
+		};
+
+		DialogAPI.prototype._createFieldBuilder = function(vFieldIdentifier, oDialogIdentifier) {
+			var oMdcFieldBuilder = new MdcFieldBuilder(this.getOpaInstance());
+			return oMdcFieldBuilder
+				.isDialogElement()
+				.hasType("sap.ui.mdc.Field")
+				.has(this._createFieldMatcher(vFieldIdentifier, oDialogIdentifier));
+		};
 
-	DialogAPI.prototype._getConfirmButtonMatcher = function() {
-		var iConfirmButtonIndex = this._iConfirmButtonIndex;
-		return function(oButton) {
-			var aButtons = oButton.getParent().getButtons();
-			// Confirm is (usually) the first button
-			return aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex);
+		DialogAPI.prototype._getConfirmButtonMatcher = function() {
+			var iConfirmButtonIndex = this._iConfirmButtonIndex;
+			return function(oButton) {
+				var aButtons = oButton.getParent().getButtons();
+				// Confirm is (usually) the first button
+				return aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex);
+			};
 		};
-	};
 
-	DialogAPI.prototype._getCancelButtonMatcher = function() {
-		var iConfirmButtonIndex = this._iConfirmButtonIndex;
-		return function(oButton) {
-			var aButtons = oButton.getParent().getButtons();
-			// Cancel is (usually) right next to the first (confirm) button
-			return aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex + 1);
+		DialogAPI.prototype._getCancelButtonMatcher = function() {
+			var iConfirmButtonIndex = this._iConfirmButtonIndex;
+			return function(oButton) {
+				var aButtons = oButton.getParent().getButtons();
+				// Cancel is (usually) right next to the first (confirm) button
+				return aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex + 1);
+			};
 		};
-	};
 
-	return DialogAPI;
-});
+		return DialogAPI;
+	}
+);

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

@@ -69,5 +69,45 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 		);
 	};
 
+	/**
+	 * Changes the content of a field in a dialog.
+	 *
+	 * @param {sap.fe.test.api.DialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string} [vValue] The new target value.
+	 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set filters, otherwise all previously set values will be kept
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
+	 * @public
+	 */
+	DialogActions.prototype.iChangeDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
+		var aArguments = Utils.parseArguments([Object, String, Boolean], arguments);
+		return this.prepareResult(
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
+				.doChangeValue(aArguments[1], aArguments[2])
+				.description(
+					Utils.formatMessage(
+						"Changing the field '{1}' of dialog '{0}' by adding '{2}' (was cleared first: {3})",
+						this.getIdentifier(),
+						aArguments[0],
+						aArguments[1],
+						!!aArguments[2]
+					)
+				)
+				.execute()
+		);
+	};
+
+	/**
+	 * Changes the content of a field in an action parameter dialog.
+	 *
+	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string} [vValue] The new target value.
+	 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set filters, otherwise all previously set values will be kept
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
+	 * @public
+	 */
+	DialogActions.prototype.iChangeActionParameterDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
+		return this.iChangeDialogField(vFieldIdentifier, vValue, bClearFirst);
+	};
+
 	return DialogActions;
 });

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

@@ -85,5 +85,58 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 		);
 	};
 
+	/**
+	 * Checks the content and state of a field in a dialog.
+	 *
+	 * @param {sap.fe.test.api.DialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string | Array | object} [vValue] Expected value(s) of the field.
+	 * if passed as an object, the following pattern will be considered:
+	 * <code><pre>
+	 * {
+	 *     value: <string>, 		// optional
+	 * }
+	 * </pre></code>
+	 * @param {object} [mState] Defines the expected state of the field
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+	 * @public
+	 */
+	DialogAssertions.prototype.iCheckDialogField = function(vFieldIdentifier, vValue, mState) {
+		var aArguments = Utils.parseArguments([Object, [String, Array, Object], Object], arguments);
+		return this.prepareResult(
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
+				.hasValue(aArguments[1])
+				.hasState(aArguments[2])
+				.description(
+					Utils.formatMessage(
+						"Checking field '{1}' of dialog '{0}' with content '{2}' and state '{3}'",
+						this.getIdentifier(),
+						aArguments[0],
+						aArguments[1],
+						aArguments[2]
+					)
+				)
+				.execute()
+		);
+	};
+
+	/**
+	 * Checks the content and state of a field in an action parameter dialog.
+	 *
+	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string | Array | object} [vValue] Expected value(s) of the field.
+	 * if passed as an object, the following pattern will be considered:
+	 * <code><pre>
+	 * {
+	 *     value: <string>, 		// optional
+	 * }
+	 * </pre></code>
+	 * @param {object} [mState] Defines the expected state of the field
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+	 * @public
+	 */
+	DialogAssertions.prototype.iCheckActionParameterDialogField = function(vFieldIdentifier, vValue, mState) {
+		return this.iCheckDialogField(vFieldIdentifier, vValue, mState);
+	};
+
 	return DialogAssertions;
 });

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

@@ -33,7 +33,9 @@ sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"]
 	DialogCreateActions.prototype.iExecuteCreate = function() {
 		return this.prepareResult(
 			this.getBuilder()
-				.doPressFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"))
+				.doPressFooterButton(
+					OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON")
+				)
 				.description(Utils.formatMessage("Pressing create button on dialog '{0}'", this.getIdentifier()))
 				.execute()
 		);

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

@@ -40,7 +40,7 @@ sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/buil
 		return this.prepareResult(
 			this.getBuilder()
 				.hasFooterButton(
-					OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"),
+					OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON"),
 					mState
 				)
 				.description(

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

@@ -32,6 +32,15 @@ sap.ui.define(
 			 * @type {string}
 			 * @public
 			 */
+			AllHidingDrafts: EditState.ALL_HIDING_DRAFTS.id,
+			/**
+			 * All (Hiding Drafts)
+			 *
+			 * @name sap.fe.test.api.EditState.AllHidingDrafts
+			 * @constant
+			 * @type {string}
+			 * @public
+			 */
 			Unchanged: EditState.UNCHANGED.id,
 			/**
 			 * Own Draft

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

@@ -234,18 +234,28 @@ sap.ui.define(
 		/**
 		 * Saves a variant under the given name, or overwrites the current variant.
 		 *
-		 * @param {string} [sVariantName] The name of the new variant. If omitted, the current variant will be overwritten.
+		 * @param {string} [sVariantName] The name of the new variant. If no new variant name is defined, the current variant will be overwritten.
+		 * @param {string} [bSetAsDefault] Saves the new variant with option "Set as Default".
+		 * @param {string} [bApplyAutomatically] Saves the new variant with option "Apply Automatically".
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 *
 		 * @public
 		 */
-		FilterBarActions.prototype.iSaveVariant = function(sVariantName) {
+		FilterBarActions.prototype.iSaveVariant = function(sVariantName, bSetAsDefault, bApplyAutomatically) {
 			var fnSuccessFunction = Utils.isOfType(sVariantName, String)
 				? function(oFilterBar) {
 						return VMBuilder.create(this)
 							.hasId(oFilterBar.getId() + "::VariantManagement")
-							.doSaveAs(sVariantName)
-							.description(Utils.formatMessage("Saving variant for '{0}' as '{1}'", this.getIdentifier(), sVariantName))
+							.doSaveAs(sVariantName, bSetAsDefault, bApplyAutomatically)
+							.description(
+								Utils.formatMessage(
+									"Saving variant for '{0}' as '{1}' with default='{2}' and applyAutomatically='{3}'",
+									this.getIdentifier(),
+									sVariantName,
+									!!bSetAsDefault,
+									!!bApplyAutomatically
+								)
+							)
 							.execute();
 				  }
 				: function(oFilterBar) {
@@ -263,24 +273,38 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Selects the chosen variant.
+		 *
+		 * @param {string} sVariantName The name of the variant to be selected
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 *
+		 * @public
+		 */
+		FilterBarActions.prototype.iSelectVariant = function(sVariantName) {
+			return this.prepareResult(
+				this.getBuilder()
+					.success(
+						function(oFilterBar) {
+							return VMBuilder.create(this)
+								.hasId(oFilterBar.getId() + "::VariantManagement")
+								.doSelectVariant(sVariantName)
+								.description(Utils.formatMessage("Selecting variant '{1}' from '{0}'", this.getIdentifier(), sVariantName))
+								.execute();
+						}.bind(this)
+					)
+					.execute()
+			);
+		};
+
 		FilterBarActions.prototype.iSelectVisualFilter = function(sVisualFilterIdentifier, sLabelValue, bIsSelected) {
 			// var that = this;
 			return this.prepareResult(
 				OpaBuilder.create(this)
 					.hasType("sap.fe.core.controls.filterbar.VisualFilter")
-					.check(function(aVisualFilters) {
-						var oVisualFilter;
-						for (var i = 0; i < aVisualFilters.length; i++) {
-							if (
-								aVisualFilters[i]
-									.getParent()
-									.getId()
-									.indexOf("FilterField::" + sVisualFilterIdentifier) > -1
-							) {
-								oVisualFilter = aVisualFilters[i];
-								break;
-							}
-						}
+					.hasId(new RegExp(sVisualFilterIdentifier, "i"))
+					.success(function(aVisualFilter) {
+						var oVisualFilter = aVisualFilter[0];
 						var selectItem;
 						var oInteractiveChart = oVisualFilter.getItems()[1].getItems()[0];
 						var aItems =
@@ -309,12 +333,28 @@ sap.ui.define(
 								selected: bIsSelected
 							});
 						}
-					}, true)
+					})
 					.description("Selecting an item in " + sVisualFilterIdentifier + " VisualFilter")
 					.execute()
 			);
 		};
-
+		FilterBarActions.prototype.iOpenVisualFilterValueHelp = function(sVisualFilterIdentifier) {
+			return this.prepareResult(
+				OpaBuilder.create(this)
+					.hasType("sap.fe.core.controls.filterbar.VisualFilter")
+					.hasId(new RegExp(sVisualFilterIdentifier, "i"))
+					.success(function(aVisualFilter) {
+						var sVFId = aVisualFilter[0].getId();
+						OpaBuilder.create(this)
+							.hasType("sap.m.Button")
+							.hasId(sVFId + "::VisualFilterValueHelpButton")
+							.doPress()
+							.execute();
+					})
+					.description("Open ValueHelp Dialog " + sVisualFilterIdentifier + " VisualFilter")
+					.execute()
+			);
+		};
 		return FilterBarActions;
 	}
 );

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

@@ -270,9 +270,11 @@ sap.ui.define(
 							.getItems()[0]
 							.getItems()[0]
 							.getContent()[1];
+						var sScaleUOMTitleText = sScaleUOMTitle ? sScaleUOMTitle.getText() : " | ";
 						return (
 							sTitle ===
-								sMeasureDimensionTitle.getText() + (sScaleUOMTitle.getText() === " | " ? "" : sScaleUOMTitle.getText()) &&
+								sMeasureDimensionTitle.getText() +
+									(sScaleUOMTitleText === " " || sScaleUOMTitleText === " | " ? "" : sScaleUOMTitle.getText()) &&
 							sToolTip === sMeasureDimensionTitle.getTooltip()
 						);
 					})
@@ -281,6 +283,35 @@ sap.ui.define(
 			);
 		};
 
+		FilterBarAssertions.prototype.iCheckVisualFilterValueHelp = function(sVisualFilterIdentifier, iCount) {
+			return this.prepareResult(
+				OpaBuilder.create(this)
+					.hasType("sap.fe.core.controls.filterbar.VisualFilter")
+					.check(function(aVisualFilters) {
+						var oVisualFilter;
+						for (var i = 0; i < aVisualFilters.length; i++) {
+							if (
+								aVisualFilters[i]
+									.getParent()
+									.getId()
+									.indexOf("FilterField::" + sVisualFilterIdentifier) > -1
+							) {
+								oVisualFilter = aVisualFilters[i];
+								break;
+							}
+						}
+						var sValueHelp = oVisualFilter
+							.getItems()[0]
+							.getItems()[0]
+							.getContent()[3];
+						var sValueHelpCount = sValueHelp ? sValueHelp.getText() : undefined;
+						return sValueHelp && sValueHelpCount === iCount;
+					})
+					.description("Checking Value Help and its count of " + sVisualFilterIdentifier + " VisualFilter")
+					.execute()
+			);
+		};
+
 		FilterBarAssertions.prototype.iCheckVisualFilterCriticality = function(sVisualFilterIdentifier, sLabelValue, sCriticality) {
 			return this.prepareResult(
 				OpaBuilder.create(this)
@@ -350,7 +381,7 @@ sap.ui.define(
 			);
 		};
 
-		FilterBarAssertions.prototype.iCheckVisualFilterOverlayText = function(sVisualFilterIdentifier, sOverlayText) {
+		FilterBarAssertions.prototype.iCheckErrorMessageAndTitle = function(sVisualFilterIdentifier, sErrorMessage, sErrorMessageTitle) {
 			return this.prepareResult(
 				OpaBuilder.create(this)
 					.hasType("sap.fe.core.controls.filterbar.VisualFilter")
@@ -367,11 +398,12 @@ sap.ui.define(
 								break;
 							}
 						}
-						var oVBox = oVisualFilter.getItems()[1].getItems()[1];
-						var sText = oVBox.getItems()[0].getText();
-						return sText === sOverlayText;
+						var oInteractiveChart = oVisualFilter.getItems()[1].getItems()[0];
+						var sText = oInteractiveChart.getErrorMessage();
+						var sTitle = oInteractiveChart.getErrorMessageTitle();
+						return sText === sErrorMessage && sTitle === sErrorMessageTitle;
 					})
-					.description("Checking NoData Text of " + sVisualFilterIdentifier + " VisualFilter")
+					.description("Checking error message and title of " + sVisualFilterIdentifier + " VisualFilter")
 					.execute()
 			);
 		};

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

@@ -3,8 +3,15 @@
  * (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"],
-	function(FormAPI, Utils, OpaBuilder, FEBuilder, MacroFieldBuilder) {
+	[
+		"./FormAPI",
+		"sap/fe/test/Utils",
+		"sap/ui/test/OpaBuilder",
+		"sap/fe/test/builder/FEBuilder",
+		"sap/fe/test/builder/MacroFieldBuilder",
+		"sap/fe/test/builder/OverflowToolbarBuilder"
+	],
+	function(FormAPI, Utils, OpaBuilder, FEBuilder, MacroFieldBuilder, OverflowToolbarBuilder) {
 		"use strict";
 
 		/**
@@ -59,13 +66,30 @@ sap.ui.define(
 		 * @public
 		 */
 		FormActions.prototype.iExecuteAction = function(vActionIdentifier) {
-			var oFormBuilder = this.getBuilder();
-			return this.prepareResult(
-				oFormBuilder
-					.doOnAggregation("actions", this.createActionMatcher(vActionIdentifier), OpaBuilder.Actions.press())
-					.description(Utils.formatMessage("Pressing action '{1}' on form '{0}'", this.getIdentifier(), vActionIdentifier))
-					.execute()
-			);
+			var oFormBuilder = this.getBuilder(),
+				vFormDescription = this.getIdentifier(),
+				sFormContainerId;
+			if (vFormDescription.fieldGroupId === undefined) {
+				// Action Button in Section Header
+				return this.prepareResult(
+					oFormBuilder
+						.doOnAggregation("actions", this.createActionMatcher(vActionIdentifier), OpaBuilder.Actions.press())
+						.description(Utils.formatMessage("Pressing action '{1}' on form '{0}'", this.getIdentifier(), vActionIdentifier))
+						.execute()
+				);
+			} else {
+				// Action Button in Form Container Toolbar ("Inline Action")
+				sFormContainerId =
+					vFormDescription.fullSubSectionId.substring(0, vFormDescription.fullSubSectionId.indexOf("--")) +
+					"--" +
+					vFormDescription.fieldGroupId;
+				return this.prepareResult(
+					OverflowToolbarBuilder.create(this)
+						.hasId(sFormContainerId + "::FormActionsToolbar")
+						.doOnContent(this.createActionMatcher(vActionIdentifier))
+						.execute()
+				);
+			}
 		};
 
 		/**