@sapui5/sap.fe.test 1.101.1 → 1.102.0

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

@@ -14,7 +14,7 @@ sap.ui.define(
 		"sap/ui/core/SortOrder",
 		"./APIHelper"
 	],
-	function(TableAPI, Utils, OpaBuilder, FEBuilder, TableBuilder, FilterFieldBuilder, SortOrder, APIHelper) {
+	function (TableAPI, Utils, OpaBuilder, FEBuilder, TableBuilder, FilterFieldBuilder, SortOrder, APIHelper) {
 		"use strict";
 
 		/**
@@ -29,7 +29,7 @@ sap.ui.define(
 		 * @hideconstructor
 		 * @public
 		 */
-		var TableAssertions = function(oBuilderInstance, vTableDescription) {
+		var TableAssertions = function (oBuilderInstance, vTableDescription) {
 			return TableAPI.call(this, oBuilderInstance, vTableDescription);
 		};
 		TableAssertions.prototype = Object.create(TableAPI.prototype);
@@ -44,7 +44,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckState = function(mState) {
+		TableAssertions.prototype.iCheckState = function (mState) {
 			var oTableBuilder = this.getBuilder();
 			return this.prepareResult(
 				oTableBuilder
@@ -74,7 +74,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckRows = function(mRowValues, iExpectedNumberOfRows, mState, vEmptyColumns) {
+		TableAssertions.prototype.iCheckRows = function (mRowValues, iExpectedNumberOfRows, mState, vEmptyColumns) {
 			var aArguments = Utils.parseArguments([Object, Number, Object, Array], arguments),
 				iNumberOfRows = aArguments[1],
 				aRowMatcher = TableAPI.createRowMatchers(aArguments[0], aArguments[2], undefined, aArguments[3]),
@@ -83,7 +83,7 @@ sap.ui.define(
 			// the order of the matchers matters here
 			if (aRowMatcher.length) {
 				// if matchers are defined, first match rows, then check number of results
-				oTableBuilder.hasRows(aRowMatcher, true).has(function(aRows) {
+				oTableBuilder.hasRows(aRowMatcher, true).has(function (aRows) {
 					return Utils.isOfType(iNumberOfRows, Number) ? aRows.length === iNumberOfRows : aRows.length > 0;
 				});
 			} else {
@@ -124,7 +124,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckCreationRow = function(mRowValues, mState) {
+		TableAssertions.prototype.iCheckCreationRow = function (mRowValues, mState) {
 			var oTableBuilder = this.getBuilder();
 			return this.prepareResult(
 				oTableBuilder
@@ -156,7 +156,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckQuickFilterItems = function(iExpectedNumberOfItems) {
+		TableAssertions.prototype.iCheckQuickFilterItems = function (iExpectedNumberOfItems) {
 			return this.prepareResult(
 				this.getBuilder()
 					.hasQuickFilterItems(iExpectedNumberOfItems)
@@ -183,7 +183,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckColumns = function(iExpectedNumberOfColumns, mColumnStateMap) {
+		TableAssertions.prototype.iCheckColumns = function (iExpectedNumberOfColumns, mColumnStateMap) {
 			var aArguments = Utils.parseArguments([Number, Object], arguments),
 				mColumns = aArguments[1],
 				iNumberOfColumns = aArguments[0],
@@ -232,7 +232,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckCells = function(vRowValues, mColumnStateMap) {
+		TableAssertions.prototype.iCheckCells = function (vRowValues, mColumnStateMap) {
 			var mRows = arguments.length > 1 ? arguments[0] : undefined,
 				mColumns = arguments.length > 1 ? arguments[1] : arguments[0],
 				aRowMatcher = TableAPI.createRowMatchers(mRows, TableBuilder.Row.Matchers.cellProperties(mColumns)),
@@ -262,7 +262,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckAction = function(vActionIdentifier, mState) {
+		TableAssertions.prototype.iCheckAction = function (vActionIdentifier, mState) {
 			var oTableBuilder = this.getBuilder(),
 				vActionMatcher = this.createActionMatcher(vActionIdentifier),
 				vAggregationMatcher = FEBuilder.Matchers.deepAggregationMatcher("actions/action", [
@@ -301,7 +301,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckMenuAction = function(vAction) {
+		TableAssertions.prototype.iCheckMenuAction = function (vAction) {
 			return this.prepareResult(APIHelper.createMenuActionCheckBuilder(vAction).execute());
 		};
 
@@ -313,7 +313,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckDelete = function(mState) {
+		TableAssertions.prototype.iCheckDelete = function (mState) {
 			return this.iCheckAction({ service: "StandardAction", action: "Delete", unbound: true }, mState);
 		};
 
@@ -326,7 +326,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckSearchField = function(sSearchText, mState) {
+		TableAssertions.prototype.iCheckSearchField = function (sSearchText, mState) {
 			var aArguments = Utils.parseArguments([String, Object], arguments),
 				oTableBuilder = this.getBuilder();
 			return this.prepareResult(
@@ -352,7 +352,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckCreate = function(mState) {
+		TableAssertions.prototype.iCheckCreate = function (mState) {
 			return this.iCheckAction({ service: "StandardAction", action: "Create", unbound: true }, mState);
 		};
 
@@ -363,7 +363,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckPaste = function() {
+		TableAssertions.prototype.iCheckPaste = function () {
 			return this._iCheckTableProvidedAction("Paste");
 		};
 
@@ -375,11 +375,11 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckFullScreen = function(mState) {
+		TableAssertions.prototype.iCheckFullScreen = function (mState) {
 			return this.iCheckAction({ service: "StandardAction", action: "FullScreen", unbound: true }, mState);
 		};
 
-		TableAssertions.prototype._iCheckTableProvidedAction = function(sProvidedAction) {
+		TableAssertions.prototype._iCheckTableProvidedAction = function (sProvidedAction) {
 			var oTableBuilder = this.getBuilder();
 			return this.prepareResult(
 				oTableBuilder["has" + sProvidedAction]()
@@ -397,7 +397,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckColumnAdaptation = function() {
+		TableAssertions.prototype.iCheckColumnAdaptation = function () {
 			return this._iCheckTableProvidedAction("ColumnAdaptation");
 		};
 
@@ -408,7 +408,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckColumnSorting = function() {
+		TableAssertions.prototype.iCheckColumnSorting = function () {
 			this.iOpenColumnSorting();
 			TableBuilder.createSortingDialogBuilder(this.getOpaInstance()).execute();
 			return this.iConfirmColumnSorting();
@@ -421,7 +421,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckColumnFiltering = function() {
+		TableAssertions.prototype.iCheckColumnFiltering = function () {
 			this.iOpenFilterDialog();
 			TableBuilder.createFilteringDialogBuilder(this.getOpaInstance()).execute();
 			return this.iConfirmFilterDialog();
@@ -435,7 +435,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckExport = function() {
+		TableAssertions.prototype.iCheckExport = function () {
 			return this._iCheckTableProvidedAction("ColumnExport");
 		};
 
@@ -447,7 +447,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckQuickFilter = function(mState) {
+		TableAssertions.prototype.iCheckQuickFilter = function (mState) {
 			var oTableBuilder = this.getBuilder();
 			return this.prepareResult(
 				oTableBuilder
@@ -470,7 +470,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckColumnAdaptationDialog = function() {
+		TableAssertions.prototype.iCheckColumnAdaptationDialog = function () {
 			var oAdaptationDialogBuilder = TableBuilder.createAdaptationDialogBuilder(this.getOpaInstance());
 			return this.prepareResult(
 				oAdaptationDialogBuilder
@@ -488,7 +488,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckAdaptationColumn = function(vColumnIdentifier, mState) {
+		TableAssertions.prototype.iCheckAdaptationColumn = function (vColumnIdentifier, mState) {
 			return this.columnAdaptation(
 				vColumnIdentifier,
 				mState,
@@ -512,7 +512,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckSortOrder = function(vColumnIdentifier, sSortOrder, bCheckPersonalization) {
+		TableAssertions.prototype.iCheckSortOrder = function (vColumnIdentifier, sSortOrder, bCheckPersonalization) {
 			var aArguments = Utils.parseArguments([[String, Object], String, Boolean], arguments);
 			sSortOrder = aArguments[1] || SortOrder.Ascending;
 			bCheckPersonalization = aArguments[2];
@@ -536,12 +536,7 @@ sap.ui.define(
 			mColumnDefinition[Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier] = {
 				sortOrder: sSortOrder
 			};
-			return this.prepareResult(
-				this.getBuilder()
-					.hasColumns(mColumnDefinition)
-					.description(sDescription)
-					.execute()
-			);
+			return this.prepareResult(this.getBuilder().hasColumns(mColumnDefinition).description(sDescription).execute());
 		};
 
 		/**
@@ -553,7 +548,7 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckFilterField = function(vColumnIdentifier, mState) {
+		TableAssertions.prototype.iCheckFilterField = function (vColumnIdentifier, mState) {
 			var oFilterFieldBuilder = FilterFieldBuilder.create(this.getOpaInstance())
 					.isDialogElement()
 					.hasType("sap.ui.mdc.FilterField")
@@ -574,9 +569,9 @@ sap.ui.define(
 				fnCloseDialog = this.iConfirmFilterDialog.bind(this);
 
 			if (bCheckForNotVisible) {
-				oFilterFieldBuilder.check(function(aFoundFilterFields) {
+				oFilterFieldBuilder.check(function (aFoundFilterFields) {
 					// every field should not match name/fieldPath
-					return aFoundFilterFields.every(function(oFilterField) {
+					return aFoundFilterFields.every(function (oFilterField) {
 						return OpaBuilder.Matchers.not(oFilterFieldMatcher)(oFilterField);
 					});
 				});
@@ -589,7 +584,7 @@ sap.ui.define(
 
 			return this.prepareResult(
 				FEBuilder.create(this.getOpaInstance())
-					.success(function() {
+					.success(function () {
 						bDialogOpen = FEBuilder.controlsExist(oFilterFieldBuilder);
 						if (!bDialogOpen) {
 							fnOpenDialog();
@@ -608,17 +603,11 @@ sap.ui.define(
 		 *
 		 * @public
 		 */
-		TableAssertions.prototype.iCheckMessageStrip = function(mProperty) {
+		TableAssertions.prototype.iCheckMessageStrip = function (mProperty) {
 			var oTableBuilder = this.getBuilder();
 			return this.prepareResult(
 				oTableBuilder
-					.has(
-						OpaBuilder.Matchers.childrenMatcher(
-							FEBuilder.create(this)
-								.hasType("sap.m.MessageStrip")
-								.hasProperties(mProperty)
-						)
-					)
+					.has(OpaBuilder.Matchers.childrenMatcher(FEBuilder.create(this).hasType("sap.m.MessageStrip").hasProperties(mProperty)))
 					.description(
 						Utils.formatMessage(
 							"Checking table '{0}' having a MessageStrip with text ='{1}' and type ='{2}'",
@@ -631,6 +620,22 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Checks if the focus is on a table.
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 *
+		 * @public
+		 */
+		TableAssertions.prototype.iSeeFocusOnHeader = function () {
+			var oTableBuilder = this.getBuilder();
+			return this.prepareResult(
+				oTableBuilder
+					.hasHeaderFocused()
+					.description(Utils.formatMessage("Checking focus on table '{0}' ", this.getIdentifier()))
+					.execute()
+			);
+		};
+
 		/**
 		 * Checks if a given column supports grouping.
 		 * If <code>iExpectedNumber</code> and <code>sFieldLabel</code> are not provided, we just check that the column header has a group icon.
@@ -642,7 +647,7 @@ sap.ui.define(
 		 * @param {string} sFieldLabel The target field to group on in case of a complex property
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 */
-		TableAssertions.prototype.iCheckGroupByColumn = function(vColumnIdentifier, iExpectedNumber, sFieldLabel) {
+		TableAssertions.prototype.iCheckGroupByColumn = function (vColumnIdentifier, iExpectedNumber, sFieldLabel) {
 			var oTableBuilder = this.getBuilder(),
 				vColumn = Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier;
 			return this.prepareResult(
@@ -672,7 +677,7 @@ sap.ui.define(
 		 * @param {string} sFieldLabel The target field to aggregate on in case of a complex property
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 */
-		TableAssertions.prototype.iCheckAggregationColumn = function(vColumnIdentifier, iExpectedNumber, sFieldLabel) {
+		TableAssertions.prototype.iCheckAggregationColumn = function (vColumnIdentifier, iExpectedNumber, sFieldLabel) {
 			var oTableBuilder = this.getBuilder(),
 				vColumn = Utils.isOfType(vColumnIdentifier, Object) ? vColumnIdentifier.name : vColumnIdentifier;
 			return this.prepareResult(
@@ -691,7 +696,7 @@ sap.ui.define(
 			);
 		};
 
-		TableAssertions.prototype.iCheckTitle = function(sTitle) {
+		TableAssertions.prototype.iCheckTitle = function (sTitle) {
 			var oTableBuilder = this.getBuilder();
 
 			return this.prepareResult(

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

@@ -3,177 +3,182 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FEBuilder", "./MdcFieldBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], function(
-	FEBuilder,
-	FieldBuilder,
-	OpaBuilder,
-	Utils
-) {
-	"use strict";
+sap.ui.define(
+	["./FEBuilder", "./MdcFieldBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"],
+	function (FEBuilder, FieldBuilder, OpaBuilder, Utils) {
+		"use strict";
 
-	function _getValueMatcher(oControl, vExpectedValue) {
-		if (oControl.isA("sap.ui.mdc.Field")) {
-			return FieldBuilder.Matchers.value(vExpectedValue);
-		}
-		if (oControl.isA("sap.ui.unified.Currency")) {
-			return OpaBuilder.Matchers.properties({ stringValue: vExpectedValue.stringValue, currency: vExpectedValue.description });
-		}
-		var sExpectedValue = vExpectedValue;
-		// we should avoid using the value description syntax when using non MDC controls but this is a workaround to have it working
-		if (vExpectedValue.value) {
-			sExpectedValue = vExpectedValue.description
-				? vExpectedValue.description + " (" + vExpectedValue.value + ")"
-				: vExpectedValue.value;
-		}
-		if (oControl.isA("sap.m.InputBase")) {
-			return OpaBuilder.Matchers.properties({ value: sExpectedValue });
-		}
-		if (oControl.isA("sap.m.ObjectIdentifier")) {
-			return OpaBuilder.Matchers.properties({ title: sExpectedValue });
+		function _getValueMatcher(oControl, vExpectedValue) {
+			if (oControl.isA("sap.ui.mdc.Field")) {
+				return FieldBuilder.Matchers.value(vExpectedValue);
+			}
+			if (oControl.isA("sap.ui.unified.Currency")) {
+				return OpaBuilder.Matchers.properties({ stringValue: vExpectedValue.stringValue, currency: vExpectedValue.description });
+			}
+			var sExpectedValue = vExpectedValue;
+			// we should avoid using the value description syntax when using non MDC controls but this is a workaround to have it working
+			if (vExpectedValue.value) {
+				sExpectedValue = vExpectedValue.description
+					? vExpectedValue.description + " (" + vExpectedValue.value + ")"
+					: vExpectedValue.value;
+			}
+			if (oControl.isA("sap.m.InputBase")) {
+				return OpaBuilder.Matchers.properties({ value: sExpectedValue });
+			}
+			if (oControl.isA("sap.m.ObjectIdentifier")) {
+				return OpaBuilder.Matchers.properties({ title: sExpectedValue });
+			}
+			return OpaBuilder.Matchers.properties({ text: sExpectedValue });
 		}
-		return OpaBuilder.Matchers.properties({ text: sExpectedValue });
-	}
 
-	function _getStateMatcher(oControl, sName, vValue) {
-		if (oControl.isA("sap.ui.mdc.Field")) {
-			return FieldBuilder.Matchers.state(sName, vValue);
+		function _getStateMatcher(oControl, sName, vValue) {
+			if (oControl.isA("sap.ui.mdc.Field")) {
+				return FieldBuilder.Matchers.state(sName, vValue);
+			} else if (sName === "lockedBy") {
+				return function (oControl) {
+					var oMatcher = OpaBuilder.Matchers.childrenMatcher(
+						FEBuilder.create(this).hasType("sap.m.Avatar").hasProperties({ initials: vValue })
+					);
+					return FEBuilder.Matchers.match(oMatcher)(oControl);
+				};
+			}
+			return FEBuilder.Matchers.state(sName, vValue);
 		}
-		return FEBuilder.Matchers.state(sName, vValue);
-	}
 
-	function _getMainControls(oContent) {
-		if (oContent.isA("sap.fe.macros.FieldAPI")) {
-			return _getMainControls(oContent.getContent());
-		}
+		function _getMainControls(oContent) {
+			if (oContent.isA("sap.fe.macros.FieldAPI")) {
+				return _getMainControls(oContent.getContent());
+			}
 
-		if (oContent.isA("sap.fe.core.controls.FormElementWrapper")) {
-			// we need to do this to be able to retrieve the child of the FormElementWrapper when its child is not visible
-			return _getMainControls(oContent.getContent());
-		}
-		if (oContent.isA("sap.fe.core.controls.FileWrapper")) {
-			return _getMainControls(oContent.getAvatar());
-		}
-		if (oContent.isA("sap.fe.core.controls.FieldWrapper")) {
-			if (oContent.getEditMode() === "Display") {
-				return _getMainControls(oContent.getContentDisplay());
-			} else {
-				return _getMainControls(oContent.getContentEdit()[0]);
+			if (oContent.isA("sap.fe.core.controls.FormElementWrapper")) {
+				// we need to do this to be able to retrieve the child of the FormElementWrapper when its child is not visible
+				return _getMainControls(oContent.getContent());
 			}
-		}
-		if (oContent.isA("sap.fe.core.controls.ConditionalWrapper")) {
-			var oLink = oContent.getCondition() ? oContent.getContentTrue() : oContent.getContentFalse();
-			return _getMainControls(oLink);
+			if (oContent.isA("sap.fe.core.controls.FileWrapper")) {
+				return _getMainControls(oContent.getAvatar());
+			}
+			if (oContent.isA("sap.fe.core.controls.FieldWrapper")) {
+				if (oContent.getEditMode() === "Display") {
+					return _getMainControls(oContent.getContentDisplay());
+				} else {
+					return _getMainControls(oContent.getContentEdit()[0]);
+				}
+			}
+			if (oContent.isA("sap.fe.core.controls.ConditionalWrapper")) {
+				var oLink = oContent.getCondition() ? oContent.getContentTrue() : oContent.getContentFalse();
+				return _getMainControls(oLink);
+			}
+
+			return oContent.isA("sap.ui.mdc.Field") ||
+				oContent.isA("sap.m.Text") ||
+				oContent.isA("sap.m.ExpandableText") ||
+				oContent.isA("sap.m.Label") ||
+				oContent.isA("sap.m.CheckBox") ||
+				oContent.isA("sap.m.Link") ||
+				oContent.isA("sap.m.ObjectStatus") ||
+				oContent.isA("sap.m.InputBase") ||
+				oContent.isA("sap.m.Avatar") ||
+				oContent.isA("sap.ui.unified.Currency") ||
+				oContent.isA("sap.m.ObjectIdentifier") ||
+				oContent.isA("sap.m.RatingIndicator") ||
+				oContent.isA("sap.m.ProgressIndicator")
+				? [oContent]
+				: OpaBuilder.Matchers.children(
+						OpaBuilder.create().hasSome(
+							FEBuilder.Matchers.state("controlType", "sap.ui.mdc.Field"),
+							FEBuilder.Matchers.state("controlType", "sap.m.Text"),
+							FEBuilder.Matchers.state("controlType", "sap.m.ExpandableText"),
+							FEBuilder.Matchers.state("controlType", "sap.m.Label"),
+							FEBuilder.Matchers.state("controlType", "sap.m.Link"),
+							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.ui.unified.Currency"),
+							FEBuilder.Matchers.state("controlType", "sap.m.ObjectIdentifier"),
+							FEBuilder.Matchers.state("controlType", "sap.m.RatingIndicator"),
+							FEBuilder.Matchers.state("controlType", "sap.m.ProgressIndicator")
+						)
+				  )(oContent);
 		}
 
-		return oContent.isA("sap.ui.mdc.Field") ||
-			oContent.isA("sap.m.Text") ||
-			oContent.isA("sap.m.ExpandableText") ||
-			oContent.isA("sap.m.Label") ||
-			oContent.isA("sap.m.CheckBox") ||
-			oContent.isA("sap.m.Link") ||
-			oContent.isA("sap.m.ObjectStatus") ||
-			oContent.isA("sap.m.InputBase") ||
-			oContent.isA("sap.m.Avatar") ||
-			oContent.isA("sap.ui.unified.Currency") ||
-			oContent.isA("sap.m.ObjectIdentifier") ||
-			oContent.isA("sap.m.RatingIndicator") ||
-			oContent.isA("sap.m.ProgressIndicator")
-			? [oContent]
-			: OpaBuilder.Matchers.children(
-					OpaBuilder.create().hasSome(
-						FEBuilder.Matchers.state("controlType", "sap.ui.mdc.Field"),
-						FEBuilder.Matchers.state("controlType", "sap.m.Text"),
-						FEBuilder.Matchers.state("controlType", "sap.m.ExpandableText"),
-						FEBuilder.Matchers.state("controlType", "sap.m.Label"),
-						FEBuilder.Matchers.state("controlType", "sap.m.Link"),
-						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.ui.unified.Currency"),
-						FEBuilder.Matchers.state("controlType", "sap.m.ObjectIdentifier"),
-						FEBuilder.Matchers.state("controlType", "sap.m.RatingIndicator"),
-						FEBuilder.Matchers.state("controlType", "sap.m.ProgressIndicator")
-					)
-			  )(oContent);
-	}
+		var MacroFieldBuilder = function () {
+			return FEBuilder.apply(this, arguments);
+		};
 
-	var MacroFieldBuilder = function() {
-		return FEBuilder.apply(this, arguments);
-	};
+		MacroFieldBuilder.create = function (oOpaInstance) {
+			return new MacroFieldBuilder(oOpaInstance);
+		};
 
-	MacroFieldBuilder.create = function(oOpaInstance) {
-		return new MacroFieldBuilder(oOpaInstance);
-	};
+		MacroFieldBuilder.prototype = Object.create(FEBuilder.prototype);
+		MacroFieldBuilder.prototype.constructor = MacroFieldBuilder;
 
-	MacroFieldBuilder.prototype = Object.create(FEBuilder.prototype);
-	MacroFieldBuilder.prototype.constructor = MacroFieldBuilder;
+		/**
+		 * Returns the state matcher for the MdcField control.
+		 * @param mState
+		 * @returns {*}
+		 * @protected
+		 */
+		MacroFieldBuilder.prototype.getStatesMatcher = function (mState) {
+			return MacroFieldBuilder.Matchers.states(mState);
+		};
 
-	/**
-	 * Returns the state matcher for the MdcField control.
-	 * @param mState
-	 * @returns {*}
-	 * @protected
-	 */
-	MacroFieldBuilder.prototype.getStatesMatcher = function(mState) {
-		return MacroFieldBuilder.Matchers.states(mState);
-	};
+		MacroFieldBuilder.prototype.hasValue = function (vValue) {
+			// silently ignore undefined argument for convenience
+			if (vValue === undefined) {
+				return this;
+			}
+			return this.has(MacroFieldBuilder.Matchers.value(vValue));
+		};
 
-	MacroFieldBuilder.prototype.hasValue = function(vValue) {
-		// silently ignore undefined argument for convenience
-		if (vValue === undefined) {
-			return this;
-		}
-		return this.has(MacroFieldBuilder.Matchers.value(vValue));
-	};
+		MacroFieldBuilder.prototype.do = function (vAction) {
+			// whenever an action is performed on a MacroField we want it to be perform on its main control
+			this.has(function (vControls) {
+				if (!vControls) {
+					return null;
+				}
+				if (!Array.isArray(vControls)) {
+					vControls = [vControls];
+				}
+				return vControls.reduce(function (aMainControls, vControl) {
+					return aMainControls.concat(_getMainControls(vControl));
+				}, []);
+			});
+			return FEBuilder.prototype.do.call(this, OpaBuilder.Actions.executor(vAction));
+		};
 
-	MacroFieldBuilder.prototype.do = function(vAction) {
-		// whenever an action is performed on a MacroField we want it to be perform on its main control
-		this.has(function(vControls) {
-			if (!vControls) {
-				return null;
-			}
-			if (!Array.isArray(vControls)) {
-				vControls = [vControls];
-			}
-			return vControls.reduce(function(aMainControls, vControl) {
-				return aMainControls.concat(_getMainControls(vControl));
-			}, []);
-		});
-		return FEBuilder.prototype.do.call(this, OpaBuilder.Actions.executor(vAction));
-	};
+		MacroFieldBuilder.prototype.doOpenValueHelp = function () {
+			return this.do(function (oControl) {
+				if (oControl.isA("sap.ui.mdc.Field")) {
+					FEBuilder.Actions.keyboardShortcut("F4", "input")(oControl);
+				}
+			});
+		};
 
-	MacroFieldBuilder.prototype.doOpenValueHelp = function() {
-		return this.do(function(oControl) {
-			if (oControl.isA("sap.ui.mdc.Field")) {
-				FEBuilder.Actions.keyboardShortcut("F4", "input")(oControl);
+		MacroFieldBuilder.Matchers = {
+			value: function (vExpectedValue) {
+				return function (oControl) {
+					var aMainControls = _getMainControls(oControl);
+					return aMainControls.some(function (oMainControl) {
+						return OpaBuilder.Matchers.match(_getValueMatcher(oMainControl, vExpectedValue))(oMainControl);
+					});
+				};
+			},
+			empty: function (oControl) {
+				return oControl.getVisible() === false;
+			},
+			state: function (sName, vValue) {
+				return function (oControl) {
+					var aMainControls = [oControl].concat(_getMainControls(oControl));
+					return aMainControls.some(function (oMainControl) {
+						return OpaBuilder.Matchers.match(_getStateMatcher(oMainControl, sName, vValue))(oMainControl);
+					});
+				};
+			},
+			states: function (mStateMap) {
+				return FEBuilder.Matchers.states(mStateMap, MacroFieldBuilder.Matchers.state);
 			}
-		});
-	};
-
-	MacroFieldBuilder.Matchers = {
-		value: function(vExpectedValue) {
-			return function(oControl) {
-				var aMainControls = _getMainControls(oControl);
-				return aMainControls.some(function(oMainControl) {
-					return OpaBuilder.Matchers.match(_getValueMatcher(oMainControl, vExpectedValue))(oMainControl);
-				});
-			};
-		},
-		empty: function(oControl) {
-			return oControl.getVisible() === false;
-		},
-		state: function(sName, vValue) {
-			return function(oControl) {
-				var aMainControls = [oControl].concat(_getMainControls(oControl));
-				return aMainControls.some(function(oMainControl) {
-					return OpaBuilder.Matchers.match(_getStateMatcher(oMainControl, sName, vValue))(oMainControl);
-				});
-			};
-		},
-		states: function(mStateMap) {
-			return FEBuilder.Matchers.states(mStateMap, MacroFieldBuilder.Matchers.state);
-		}
-	};
+		};
 
-	return MacroFieldBuilder;
-});
+		return MacroFieldBuilder;
+	}
+);