@sapui5/sap.fe.test 1.143.0 → 1.145.0

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

@@ -47,28 +47,45 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 		createMenuAndListActionMatcher: function (vAction, bReturnAction) {
 			var vActionMatcher;
 			if (Utils.isOfType(vAction, String)) {
-				vAction = { text: vAction };
+				vAction = { text: vAction, title: vAction };
 			}
-			if (Utils.isOfType(vAction, Object)) {
-				if (vAction.visible === false) {
-					var mStatesWOVisible = Object.assign(vAction);
-					delete mStatesWOVisible.visible;
-					vActionMatcher = OpaBuilder.Matchers.some(
-						// either button is visible=false ...
-						OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(vAction)),
-						// ... or it wasn't rendered at all (no match in the aggregation)
-						OpaBuilder.Matchers.not(
-							OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(mStatesWOVisible))
-						)
-					);
-				} else {
-					vActionMatcher = bReturnAction
-						? [OpaBuilder.Matchers.aggregation("items", FEBuilder.Matchers.states(vAction)), FEBuilder.Matchers.atIndex(0)]
-						: OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(vAction));
-				}
-			} else {
+			if (!Utils.isOfType(vAction, Object)) {
 				throw new Error("vAction parameter must be a string or object");
 			}
+			if (vAction.text && !vAction.title) {
+				vAction = Object.assign({}, vAction, { title: vAction.text });
+			}
+
+			var mText = Object.assign({}, vAction);
+			var mTitle = Object.assign({}, vAction);
+
+			delete mText.title;
+			delete mTitle.text;
+
+			var itemStateMatcher = OpaBuilder.Matchers.some(FEBuilder.Matchers.states(mText), FEBuilder.Matchers.states(mTitle));
+
+			if (vAction.visible === false) {
+				var mTextNoVis = Object.assign({}, mText);
+				delete mTextNoVis.visible;
+
+				var mTitleNoVis = Object.assign({}, mTitle);
+				delete mTitleNoVis.visible;
+
+				var itemStateMatcherNoVis = OpaBuilder.Matchers.some(
+					FEBuilder.Matchers.states(mTextNoVis),
+					FEBuilder.Matchers.states(mTitleNoVis)
+				);
+				vActionMatcher = OpaBuilder.Matchers.some(
+					// either it is visible=false...
+					OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcher),
+					// ...or it wasn't rendered at all
+					OpaBuilder.Matchers.not(OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcherNoVis))
+				);
+			} else {
+				vActionMatcher = bReturnAction
+					? [OpaBuilder.Matchers.aggregation("items", itemStateMatcher), FEBuilder.Matchers.atIndex(0)]
+					: OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcher);
+			}
 			return vActionMatcher;
 		},
 
@@ -103,11 +120,11 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 			}
 
 			return FEBuilder.create()
-				.hasType("sap.m.SelectList")
+				.hasType("sap.m.List")
 				.isDialogElement(true)
 				.has(APIHelper.createMenuAndListActionMatcher(vAction, true))
 				.doPress()
-				.description(Utils.formatMessage("Executing action '{0}' from currently open selection list", vAction));
+				.description(Utils.formatMessage("Executing action '{0}' from currently open list", vAction));
 		}
 	};
 

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

@@ -117,7 +117,7 @@ sap.ui.define(
 
 		/**
 		 * Gets a new builder instance based on the given one.
-		 * @returns {sap.ui.test.OpaBuilder} An OpaBuilder instance
+		 * @returns {module:sap/ui/test/OpaBuilder} An OpaBuilder instance
 		 * @public
 		 * @ui5-restricted
 		 */

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

@@ -4,134 +4,158 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
 	
  */
-sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function (DialogAPI, Utils) {
-	"use strict";
+sap.ui.define(
+	["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"],
+	function (DialogAPI, Utils, OpaBuilder, FEBuilder) {
+		"use strict";
 
-	/**
-	 * Constructs a new DialogAssertions 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 {number} [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.DialogAssertions} The new instance
-	 * @alias sap.fe.test.api.DialogAssertions
-	 * @class
-	 * @hideconstructor
-	 * @public
-	 */
-	var DialogAssertions = function (oDialogBuilder, vDialogDescription, iConfirmButtonIndex) {
-		return DialogAPI.call(this, oDialogBuilder, vDialogDescription, iConfirmButtonIndex);
-	};
-	DialogAssertions.prototype = Object.create(DialogAPI.prototype);
-	DialogAssertions.prototype.constructor = DialogAssertions;
-	DialogAssertions.prototype.isAction = false;
+		/**
+		 * Constructs a new DialogAssertions 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 {number} [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.DialogAssertions} The new instance
+		 * @alias sap.fe.test.api.DialogAssertions
+		 * @class
+		 * @hideconstructor
+		 * @public
+		 */
+		var DialogAssertions = function (oDialogBuilder, vDialogDescription, iConfirmButtonIndex) {
+			return DialogAPI.call(this, oDialogBuilder, vDialogDescription, iConfirmButtonIndex);
+		};
+		DialogAssertions.prototype = Object.create(DialogAPI.prototype);
+		DialogAssertions.prototype.constructor = DialogAssertions;
+		DialogAssertions.prototype.isAction = false;
 
-	/**
-	 * Checks the dialog.
-	 * @param {object} [mDialogState] Defines the expected state of the dialog
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogAssertions.prototype.iCheckState = function (mDialogState) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasState(mDialogState)
-				.description(Utils.formatMessage("Checking dialog '{0}' in state '{1}'", this.getIdentifier(), mDialogState))
-				.execute()
-		);
-	};
+		/**
+		 * Checks the dialog.
+		 * @param {object} [mDialogState] Defines the expected state of the dialog
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogAssertions.prototype.iCheckState = function (mDialogState) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasState(mDialogState)
+					.description(Utils.formatMessage("Checking dialog '{0}' in state '{1}'", this.getIdentifier(), mDialogState))
+					.execute()
+			);
+		};
 
-	/**
-	 * Checks the confirmation button of the dialog.
-	 * @param {object} [mButtonState] 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
-	 */
-	DialogAssertions.prototype.iCheckConfirm = function (mButtonState) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasFooterButton(this._getConfirmButtonMatcher(), mButtonState)
-				.description(
-					Utils.formatMessage(
-						"Checking dialog '{0}' having confirmation button with state '{1}'",
-						this.getIdentifier(),
-						mButtonState
+		/**
+		 * Checks the confirmation button of the dialog.
+		 * @param {object} [mButtonState] 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
+		 */
+		DialogAssertions.prototype.iCheckConfirm = function (mButtonState) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasFooterButton(this._getConfirmButtonMatcher(), mButtonState)
+					.description(
+						Utils.formatMessage(
+							"Checking dialog '{0}' having confirmation button with state '{1}'",
+							this.getIdentifier(),
+							mButtonState
+						)
 					)
-				)
-				.execute()
-		);
-	};
+					.execute()
+			);
+		};
 
-	/**
-	 * Checks the cancellation button of the dialog.
-	 * @param {object} [mButtonState] 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
-	 */
-	DialogAssertions.prototype.iCheckCancel = function (mButtonState) {
-		return this.prepareResult(
-			this.getBuilder()
-				.hasFooterButton(this._getCancelButtonMatcher(), mButtonState)
-				.description(
-					Utils.formatMessage(
-						"Checking dialog '{0}' having cancellation button with state '{1}'",
-						this.getIdentifier(),
-						mButtonState
+		/**
+		 * Checks the cancellation button of the dialog.
+		 * @param {object} [mButtonState] 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
+		 */
+		DialogAssertions.prototype.iCheckCancel = function (mButtonState) {
+			return this.prepareResult(
+				this.getBuilder()
+					.hasFooterButton(this._getCancelButtonMatcher(), mButtonState)
+					.description(
+						Utils.formatMessage(
+							"Checking dialog '{0}' having cancellation button with state '{1}'",
+							this.getIdentifier(),
+							mButtonState
+						)
 					)
-				)
-				.execute()
-		);
-	};
+					.execute()
+			);
+		};
 
-	/**
-	 * 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]
+		/**
+		 * 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()
-		);
-	};
+					.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);
-	};
+		/**
+		 * 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;
-});
+		/**
+		 * Checks a Contact popup dialog.
+		 * @param {object} [mState] The expected state of dialog elements
+		 * Example: { controlType: "sap.m.Title", text: "Domestic HK Customer 1" }
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogAssertions.prototype.iCheckContactDialog = function (mState) {
+			var contactLinkMatcher = OpaBuilder.Matchers.children(FEBuilder.Matchers.states(mState)),
+				oContactPopoverBuilder = FEBuilder.createPopoverBuilder(this.getOpaInstance(), contactLinkMatcher);
+
+			return this.prepareResult(
+				oContactPopoverBuilder
+					.check(function (oPopover) {
+						return oPopover[0].length === 1;
+					})
+					.description(Utils.formatMessage("Checking contact dialog having state '{0}'", mState))
+					.execute()
+			);
+		};
+
+		return DialogAssertions;
+	}
+);

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

@@ -125,6 +125,23 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Clicks a link for a contact-field within a form.
+		 * @param {string} linkContent The content of the link to be clicked
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		FormActions.prototype.iClickContactLink = function (linkContent) {
+			return this.prepareResult(
+				OpaBuilder.create(this)
+					.hasType("sap.m.Link")
+					.hasProperties({ text: linkContent })
+					.doPress()
+					.description("Clicking link with content '" + linkContent + "'")
+					.execute()
+			);
+		};
+
 		FormActions.prototype.iClickObjectStatus = function (vFieldIdentifier) {
 			return this.prepareResult(
 				this.createFieldBuilder(vFieldIdentifier)

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

@@ -206,11 +206,9 @@ sap.ui.define(
 
 		/**
 		 * Clicks a link within the object page header.
-		 *
-		 * TODO this function will not made public as it is, it needs some refactoring to behave similar to the FormActions#iClickLink function.
-		 * @param {string} vLinkIdentifier The label of the link to be clicked (TODO it actually must be the link text with the current implementation)
+		 * @param {string} vLinkIdentifier The content of the link to be clicked. It currently has to be the link text itself, not the label of the field.
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-		 * @ui5-restricted
+		 * @public
 		 */
 		HeaderActions.prototype.iClickLink = function (vLinkIdentifier) {
 			// TODO this function needs to aligned with onForm().iClickLink - for now vLinkIdentifier must be the link text!

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

@@ -198,6 +198,165 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Checks a progress indicator data point in the object page header.
+		 * @param {string} Title The title of the progress indicator
+		 * @param {number} PercentValue The expected value of the progress indicator
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		HeaderAssertions.prototype.iCheckProgressIndicator = function (Title, PercentValue) {
+			var oHeaderContentBuilder = this.getObjectPageDynamicHeaderContentBuilder(this._sHeaderContentId);
+
+			return this.prepareResult(
+				oHeaderContentBuilder
+					.has(
+						OpaBuilder.Matchers.childrenMatcher(
+							OpaBuilder.create(this)
+								.hasType("sap.m.ProgressIndicator")
+								.check(function (aObjects) {
+									for (let i = 0; i < aObjects.length; i++) {
+										const oProgressIndicator = aObjects[i];
+										const currentValue = oProgressIndicator.getProperty("percentValue");
+
+										if (currentValue === PercentValue) {
+											//return true;
+
+											const aParentContent = oProgressIndicator.getParent().getParent().getItems();
+											for (let j = 0; j < aParentContent.length; j++) {
+												const oItem = aParentContent[j];
+												if (oItem.getMetadata().getName() === "sap.m.Title") {
+													if (oItem.getContent().getProperty("text") === Title) {
+														return true;
+													}
+												}
+											}
+										}
+									}
+									return false;
+								})
+								.execute()
+						)
+					)
+					.description(
+						Utils.formatMessage("Seeing header data point progress indicator '{0}' with value '{1}'", Title, PercentValue)
+					)
+					.execute()
+			);
+		};
+		/**
+		 * Checks a rating indicator data point in the object page header.
+		 * @param {string} Title The title of the rating indicator
+		 * @param {number} Value The expected value of the rating indicator
+		 * @param {number} MaxValue The expected maximum value of the rating indicator
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		HeaderAssertions.prototype.iCheckRatingIndicator = function (Title, Value, MaxValue) {
+			var oHeaderContentBuilder = this.getObjectPageDynamicHeaderContentBuilder(this._sHeaderContentId);
+
+			return this.prepareResult(
+				oHeaderContentBuilder
+					.has(
+						OpaBuilder.Matchers.childrenMatcher(
+							OpaBuilder.create(this)
+								.hasType("sap.m.RatingIndicator")
+								.check(function (aObjects) {
+									for (let i = 0; i < aObjects.length; i++) {
+										const oRatingIndicator = aObjects[i];
+										const currentValue = oRatingIndicator.getProperty("value");
+										const currentMaxValue = oRatingIndicator.getProperty("maxValue");
+
+										if (currentValue === Value && currentMaxValue === MaxValue) {
+											//return true;
+
+											const aParentContent = oRatingIndicator.getParent().getParent().getItems();
+											for (let j = 0; j < aParentContent.length; j++) {
+												const oItem = aParentContent[j];
+												if (oItem.getMetadata().getName() === "sap.m.Title") {
+													if (oItem.getContent().getProperty("text") === Title) {
+														return true;
+													}
+												}
+											}
+										}
+									}
+									return false;
+								})
+								.execute()
+						)
+					)
+					.description(
+						Utils.formatMessage(
+							"Seeing header data point rating indicator '{0}' with value '{1}' and max value '{2}'",
+							Title,
+							Value,
+							MaxValue
+						)
+					)
+					.execute()
+			);
+		};
+		/**
+		 * Checks a data point of type ObjectNumberin the object page header.
+		 * @param {string} Title The title of the data point
+		 * @param {string} Value The expected value of the data point
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @ui5-restricted
+		 */
+		HeaderAssertions.prototype.iCheckDataPointObjectNumber = function (Title, Value) {
+			var oHeaderContentBuilder = this.getObjectPageDynamicHeaderContentBuilder(this._sHeaderContentId);
+
+			return this.prepareResult(
+				oHeaderContentBuilder
+					.has(
+						OpaBuilder.Matchers.childrenMatcher(
+							OpaBuilder.create(this)
+								.hasType("sap.m.ObjectNumber")
+								.hasProperties({ number: Value })
+								.has(function (oObjectNumber) {
+									return oObjectNumber.getParent().getParent();
+								})
+								.hasAggregationProperties("items", { text: Title })
+								.execute()
+						)
+					)
+					.description(Utils.formatMessage("Seeing header data point object number '{0}' with value '{1}'", Title, Value))
+					.execute()
+			);
+		};
+		/**
+		 * Checks a data point of type ObjectStatus in the object page header.
+		 * @param {string} Title The title of the data point
+		 * @param {string} Value The expected value of the data point
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @ui5-restricted
+		 */
+		HeaderAssertions.prototype.iCheckDataPointObjectStatus = function (Title, Value) {
+			var oHeaderContentBuilder = this.getObjectPageDynamicHeaderContentBuilder(this._sHeaderContentId);
+
+			return this.prepareResult(
+				oHeaderContentBuilder
+					.has(
+						OpaBuilder.Matchers.childrenMatcher(
+							OpaBuilder.create(this)
+								.hasType("sap.m.Title")
+								.hasProperties({ text: Title })
+								.has(function (myObject) {
+									return myObject.getParent();
+								})
+								.hasChildren(OpaBuilder.create(this).hasType("sap.m.ObjectStatus").execute())
+								.check(function (aObject) {
+									return aObject[0].getItems()[1].getContent().getProperty("text") === Value;
+								})
+								.execute()
+						)
+					)
+					.description(Utils.formatMessage("Seeing header data point object status '{0}' with value '{1}'", Title, Value))
+					.execute()
+			);
+		};
+
 		/**
 		 * Checks a data point in the object page header.
 		 * @param {string} sTitle The title of the data point
@@ -217,16 +376,18 @@ sap.ui.define(
 									.hasType("sap.m.ObjectNumber")
 									.hasProperties({ number: sValue })
 									.has(function (oObjectNumber) {
-										return oObjectNumber.getParent();
+										return oObjectNumber.getParent().getParent();
 									})
-									.hasAggregationProperties("items", { text: sTitle }),
+									.hasAggregationProperties("items", { text: sTitle })
+									.execute(),
 								OpaBuilder.create(this)
 									.hasType("sap.m.ObjectStatus")
 									.hasProperties({ text: sValue })
 									.has(function (oObjectNumber) {
-										return oObjectNumber.getParent();
+										return oObjectNumber.getParent().getParent();
 									})
 									.hasAggregationProperties("items", { text: sTitle })
+									.execute()
 							])
 						)
 					)
@@ -305,12 +466,10 @@ sap.ui.define(
 
 		/**
 		 * Checks a MicroChart shown in the header of an object page.
-		 *
-		 * TODO this function will not be public yet: Its signature doesn't fit the framework.
 		 * @param {object|string} vMicroChartIdentifier Id/Type or Title of MicroChart
 		 * @param {string} sUoMLabel UoM label of the MicroChart
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-		 * @ui5-restricted
+		 * @public
 		 */
 		HeaderAssertions.prototype.iCheckMicroChart = function (vMicroChartIdentifier, sUoMLabel) {
 			var oOpaBuilder = OpaBuilder.create(this.getOpaInstance());

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

@@ -255,7 +255,7 @@ sap.ui.define(
 		 * </pre></code>
 		 * @param {Function|Array|sap.ui.test.actions.Action} [vActions] The actions to be executed on found field
 		 * @param {string} sDescription The description of the check or adaptation
-		 * @param {sap.ui.test.OpaBuilder} oDialogBuilder The dialog builder
+		 * @param {module:sap/ui/test/OpaBuilder} oDialogBuilder The dialog builder
 		 * @param {Function} fnOpenDialog A callback for opening the dialog
 		 * @param {Function} fnCloseDialog A callback for closing the dialog
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
@@ -344,7 +344,7 @@ sap.ui.define(
 		 * </pre></code>
 		 * @param {Function|Array|sap.ui.test.actions.Action} [vActions] The actions to be executed on found field
 		 * @param {string} sDescription The description of the check or adaptation
-		 * @param {sap.ui.test.OpaBuilder} oDialogBuilder The dialog builder
+		 * @param {module:sap/ui/test/OpaBuilder} oDialogBuilder The dialog builder
 		 * @param {Function} fnOpenDialog A callback for opening the dialog
 		 * @param {Function} fnCloseDialog A callback for closing the dialog
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements

package/src/sap/fe/test/builder/FEBuilder.js

@@ -117,7 +117,7 @@ sap.ui.define(
 					 * Remark: Currently there is no official API to retrieve this button; an alternative way to achieve the same
 					 * result might be to check oMenuButton.getButtonMode() === "Split" && oMenuButton.getUseDefaultActionOnly()
 					 * first, and then call oMenuButton.fireDefaultAction(), but the interface parameter vContentAction expects
-					 * a sap.m.button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
+					 * a sap.m.Button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
 					 */
 					return oMenuButton.getAggregation("_button")
 						? oMenuButton.getAggregation("_button").getAggregation("_textButton")

package/src/sap/fe/test/builder/MacroFieldBuilder.js

@@ -89,6 +89,7 @@ sap.ui.define(
 				oContent.isA("sap.m.ObjectStatus") ||
 				oContent.isA("sap.m.InputBase") ||
 				oContent.isA("sap.m.Avatar") ||
+				oContent.isA("sap.fe.macros.controls.Avatar") ||
 				oContent.isA("sap.m.ObjectIdentifier") ||
 				oContent.isA("sap.m.RatingIndicator") ||
 				oContent.isA("sap.m.ProgressIndicator") ||
@@ -105,6 +106,7 @@ sap.ui.define(
 							FEBuilder.Matchers.state("controlType", "sap.m.ObjectStatus"),
 							FEBuilder.Matchers.state("controlType", "sap.m.InputBase"),
 							FEBuilder.Matchers.state("controlType", "sap.m.Avatar"),
+							FEBuilder.Matchers.state("controlType", "sap.fe.macros.controls.Avatar"),
 							FEBuilder.Matchers.state("controlType", "sap.m.ObjectIdentifier"),
 							FEBuilder.Matchers.state("controlType", "sap.m.RatingIndicator"),
 							FEBuilder.Matchers.state("controlType", "sap.m.ProgressIndicator")