@sapui5/sap.fe.test 1.95.0 → 1.98.0

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -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
+					}
 				});
 			}
 
@@ -283,18 +287,6 @@ sap.ui.define(
 			return vTarget;
 		};
 
-		Utils.getParametersArray = function(iStartIndex, aArguments) {
-			var aArguments = Array.prototype.slice.call(arguments, 1);
-			if (aArguments.length === 1 && Utils.isArguments(aArguments[0])) {
-				aArguments = Array.prototype.slice.call(aArguments[0], 0);
-			}
-			var aParameters = aArguments[iStartIndex];
-			if (aArguments.length > iStartIndex || (aParameters && !Array.isArray(aParameters))) {
-				aParameters = Array.prototype.slice.call(aArguments, iStartIndex);
-			}
-			return aParameters;
-		};
-
 		return Utils;
 	}
 );

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"], function(Utils, OpaBuilder, FEBuilder) {
 	"use strict";

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

@@ -1,15 +1,9 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
-	[
-		"sap/fe/test/Utils",
-		"sap/ui/test/Opa5",
-		"sap/ui/test/OpaBuilder",
-		"sap/fe/test/builder/FEBuilder",
-		"sap/ui/mdc/p13n/panels/BasePanel"
-	],
+	["sap/fe/test/Utils", "sap/ui/test/Opa5", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/m/p13n/BasePanel"],
 	function(Utils, Opa5, OpaBuilder, FEBuilder, MdcP13nBasePanel) {
 		"use strict";
 
@@ -78,6 +72,27 @@ sap.ui.define(
 		 * @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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"], function(
 	BaseAPI,

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["./BaseAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/ui/core/SortOrder"],
@@ -40,7 +40,11 @@ sap.ui.define(
 					} else {
 						oChart = aCharts[0];
 					}
-					var aContexts = oChart.getBinding("data").getContexts();
+					var aContexts = oChart
+						.getControlDelegate()
+						._getChart(oChart)
+						.getBinding("data")
+						.getContexts();
 					return (
 						(aContexts && (iNumberOfItems === undefined ? aContexts.length !== 0 : aContexts.length === iNumberOfItems)) ||
 						(!aContexts && iNumberOfItems === 0)

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -34,19 +34,23 @@ sap.ui.define(
 		DialogAPI.prototype.constructor = DialogAPI;
 
 		/**
-		 * Creates a matcher for fields within action dialogs.
+		 * 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) {
+		DialogAPI.prototype._createFieldMatcher = function(vFieldIdentifier, oDialogIdentifier) {
 			var vMatcher, sFieldId;
 			if (!Utils.isOfType(vFieldIdentifier, String)) {
 				if (typeof vFieldIdentifier.property === "string") {
-					sFieldId = "APD_::" + vFieldIdentifier.property.replaceAll("/", "::");
+					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: " +
@@ -61,12 +65,12 @@ sap.ui.define(
 			return vMatcher;
 		};
 
-		DialogAPI.prototype._createFieldBuilder = function(vFieldIdentifier) {
+		DialogAPI.prototype._createFieldBuilder = function(vFieldIdentifier, oDialogIdentifier) {
 			var oMdcFieldBuilder = new MdcFieldBuilder(this.getOpaInstance());
 			return oMdcFieldBuilder
 				.isDialogElement()
 				.hasType("sap.ui.mdc.Field")
-				.has(this._createFieldMatcher(vFieldIdentifier));
+				.has(this._createFieldMatcher(vFieldIdentifier, oDialogIdentifier));
 		};
 
 		DialogAPI.prototype._getConfirmButtonMatcher = function() {

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogAPI, Utils, OpaBuilder) {
 	"use strict";
@@ -70,22 +70,22 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 	};
 
 	/**
-	 * Changes the content of a field in an action parameter dialog.
+	 * Changes the content of a field in a dialog.
 	 *
-	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @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.iChangeActionParameterDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
+	DialogActions.prototype.iChangeDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
 		var aArguments = Utils.parseArguments([Object, String, Boolean], arguments);
 		return this.prepareResult(
-			this._createFieldBuilder(vFieldIdentifier)
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
 				.doChangeValue(aArguments[1], aArguments[2])
 				.description(
 					Utils.formatMessage(
-						"Changing the field '{1}' of action parameter dialog '{0}' by adding '{2}' (was cleared first: {3})",
+						"Changing the field '{1}' of dialog '{0}' by adding '{2}' (was cleared first: {3})",
 						this.getIdentifier(),
 						aArguments[0],
 						aArguments[1],
@@ -96,5 +96,18 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 		);
 	};
 
+	/**
+	 * 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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	"use strict";
@@ -86,9 +86,9 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	};
 
 	/**
-	 * Checks the content and state of a field in an action parameter dialog.
+	 * Checks the content and state of a field in a dialog.
 	 *
-	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @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>
@@ -100,15 +100,16 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	 * @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) {
+	DialogAssertions.prototype.iCheckDialogField = function(vFieldIdentifier, vValue, mState) {
 		var aArguments = Utils.parseArguments([Object, [String, Array, Object], Object], arguments);
 		return this.prepareResult(
-			this._createFieldBuilder(vFieldIdentifier)
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
 				.hasValue(aArguments[1])
 				.hasState(aArguments[2])
 				.description(
 					Utils.formatMessage(
-						"Checking field '{0}' with content '{1}' and state '{2}'",
+						"Checking field '{1}' of dialog '{0}' with content '{2}' and state '{3}'",
+						this.getIdentifier(),
 						aArguments[0],
 						aArguments[1],
 						aArguments[2]
@@ -118,5 +119,24 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 		);
 	};
 
+	/**
+	 * 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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogActions, Utils, OpaBuilder) {
 	"use strict";

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/Utils"], function(
 	DialogAssertions,

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogActions, Utils, OpaBuilder) {
 	"use strict";

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/Utils"], function(
 	DialogAssertions,

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[],

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/macros/filter/DraftEditState"],
@@ -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/FilterBarAPI.js

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -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,6 +273,30 @@ 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(

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 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"],
@@ -171,10 +171,39 @@ sap.ui.define(
 			return this.iCheckField(aArguments[0], aArguments[1], Utils.mergeObjects({ controlType: "sap.m.Link" }, aArguments[2]));
 		};
 
-		FormAssertions.prototype.iCheckElement = function(sId, oProperties) {
-			return OpaBuilder.create(this)
-				.hasId(sId)
-				.hasProperties(oProperties);
+		FormAssertions.prototype.iCheckFormContainersElementCount = function(sFormContainer, iCount, mState) {
+			var aArguments = Utils.parseArguments([String, Number, Object], arguments),
+				fullSubSectionId = this.getIdentifier().fullSubSectionId,
+				mFormState = aArguments[2],
+				sView = fullSubSectionId.split("--")[0],
+				sForm = fullSubSectionId.split("--")[1].split("::")[2],
+				sFormContainerId = sView + "--" + "fe::FormContainer::" + aArguments[0];
+			return this.prepareResult(
+				this.getBuilder()
+					.hasId(sFormContainerId)
+					.has(function(oFormContainer) {
+						var oMatchingFormContainers;
+						if (Object.keys(mFormState).length) {
+							oMatchingFormContainers = oFormContainer.getFormElements().filter(function(oFormElement) {
+								return Object.keys(mFormState).every(function(sFormElementKey) {
+									return mFormState[sFormElementKey] === oFormElement.getProperty(sFormElementKey);
+								});
+							});
+						} else {
+							oMatchingFormContainers = oFormContainer.getFormElements();
+						}
+						return oMatchingFormContainers.length === iCount;
+					})
+					.description(
+						Utils.formatMessage(
+							"Form Container '{0}' on Form '{1}' has '{2}' Form Elements.",
+							aArguments[0],
+							sForm,
+							aArguments[1]
+						)
+					)
+					.execute()
+			);
 		};
 		return FormAssertions;
 	}

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./HeaderAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "./APIHelper"], function(
 	HeaderAPI,

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./HeaderLR", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "./APIHelper"], function(
 	HeaderLR,

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["./BaseAPI", "sap/fe/test/Utils", "sap/fe/test/builder/KPIBuilder"], function(BaseAPI, Utils, KPIBuilder) {
 	"use strict";