@sapui5/sap.fe.test 1.101.1 → 1.102.2

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;
+	}
+);

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

@@ -12,6 +12,7 @@ sap.ui.define(
 		"./OverflowToolbarBuilder",
 		"./DialogBuilder",
 		"sap/fe/test/Utils",
+		"sap/fe/test/api/APIHelper",
 		"sap/ui/test/matchers/Interactable",
 		"sap/ui/core/SortOrder",
 		"sap/ui/test/actions/EnterText"
@@ -24,6 +25,7 @@ sap.ui.define(
 		OverflowToolbarBuilder,
 		DialogBuilder,
 		Utils,
+		APIHelper,
 		Interactable,
 		SortOrder,
 		EnterText
@@ -203,6 +205,65 @@ sap.ui.define(
 			return oWrapper;
 		}
 
+		function _showHideDetailsOnTableToolbar(bShowDetails) {
+			var sStateToPress;
+			if (bShowDetails !== undefined) {
+				sStateToPress = bShowDetails ? "showDetails" : "hideDetails";
+			}
+			OpaBuilder.create()
+				.hasType("sap.m.SegmentedButton")
+				.hasId(/-showHideDetails$/)
+				.check(function (oSegmentedButton) {
+					if (bShowDetails === undefined) {
+						sStateToPress = oSegmentedButton[0].getSelectedKey() === "showDetails" ? "hideDetails" : "showDetails";
+					}
+					return true;
+				})
+				.success(function (oSegmButtonControl) {
+					return FEBuilder.create()
+						.hasType("sap.m.SegmentedButton")
+						.hasId(/-showHideDetails$/)
+						.doOnAggregation("items", OpaBuilder.Matchers.properties({ key: sStateToPress }), OpaBuilder.Actions.press())
+						.execute();
+				})
+				.execute();
+		}
+		function _showHideDetailsOnOverflow(bShowDetails) {
+			var oRb = Opa5.getWindow().sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc"),
+				sExpectedText;
+			if (bShowDetails !== undefined) {
+				sExpectedText = bShowDetails ? oRb.getText("table.SHOWDETAILS_TEXT") : oRb.getText("table.HIDEDETAILS_TEXT");
+			}
+			return (
+				OpaBuilder.create()
+					.hasType("sap.m.Select")
+					.hasId(/-showHideDetails-select$/)
+					// .has(OpaBuilder.Matchers.ancestor(oMdcTable))
+					.check(function (oSelectItem) {
+						if (bShowDetails === undefined) {
+							sExpectedText =
+								oSelectItem[0].getSelectedItem().getText() === oRb.getText("table.SHOWDETAILS_TEXT")
+									? oRb.getText("table.HIDEDETAILS_TEXT")
+									: oRb.getText("table.SHOWDETAILS_TEXT");
+						}
+						return true;
+					})
+					.doPress()
+					.success(function (oSegmButtonControl) {
+						return FEBuilder.create()
+							.hasType("sap.m.SelectList")
+							.isDialogElement(true)
+							.has(function (oSelectListItem) {
+								return true;
+							})
+							.has(APIHelper.createMenuAndListActionMatcher(sExpectedText, true))
+							.doPress()
+							.description(Utils.formatMessage("Executing action '{0}' from currently open selection list", sExpectedText))
+							.execute();
+					})
+					.execute()
+			);
+		}
 		var TableBuilder = function () {
 			return FEBuilder.apply(this, arguments).hasType("sap.ui.mdc.Table");
 		};
@@ -529,6 +590,19 @@ sap.ui.define(
 			});
 		};
 
+		TableBuilder.prototype.hasHeaderFocused = function () {
+			return this.has(function (oTable) {
+				var oTestCore = Opa5.getWindow().sap.ui.getCore(),
+					sFocusedEltId = oTestCore.getCurrentFocusedControlId(),
+					oInnerTable = _getInnerTable(oTable);
+				if (_isGridTable(oTable)) {
+					return oInnerTable.getColumns()[0].getId() === sFocusedEltId;
+				} else {
+					return oInnerTable.getId() === sFocusedEltId;
+				}
+			});
+		};
+
 		TableBuilder.prototype.hasQuickFilterItems = function (iNumberOfItems) {
 			return this.has(function (oTable) {
 				var oQuickFilter = oTable.getQuickFilter();
@@ -605,19 +679,22 @@ sap.ui.define(
 				if (_isGridTable(oMdcTable)) {
 					return;
 				}
-				var oRb = Opa5.getWindow().sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc"),
-					sExpectedText;
-				if (bShowDetails !== undefined) {
-					sExpectedText = bShowDetails ? oRb.getText("table.SHOWDETAILS_TEXT") : oRb.getText("table.HIDEDETAILS_TEXT");
-				}
-				return OpaBuilder.create()
-					.hasType("sap.m.Button")
+				OpaBuilder.create()
+					.hasType("sap.m.SegmentedButton")
 					.hasId(/-showHideDetails$/)
-					.has(OpaBuilder.Matchers.ancestor(oMdcTable))
-					.doConditional(function (oButton) {
-						// only press button if currently in expected state
-						return !sExpectedText || oButton.getText() === sExpectedText;
-					}, OpaBuilder.Actions.press())
+					.doConditional(
+						OpaBuilder.Matchers.childrenMatcher(OpaBuilder.create(this).hasType("sap.m.Select"), true),
+						function (oItem) {
+							// in the overflow
+							_showHideDetailsOnOverflow(bShowDetails);
+							return true;
+						},
+						function (oItem) {
+							// on the table toolbar
+							_showHideDetailsOnTableToolbar(bShowDetails);
+							return true;
+						}
+					)
 					.execute();
 			});
 		};

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

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Core", "sap/ui/core/library"], function (Core, _libr
     interfaces: [],
     controls: [],
     elements: [],
-    version: "1.101.1",
+    version: "1.102.2",
     noLibraryCSS: true
   });
   return thisLib;

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

@@ -1,62 +0,0 @@
-/*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
-        (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
- */
-sap.ui.define(
-	[],
-	function() {
-		"use strict";
-
-		var MassEditRuntime = {
-			handleMassEditChange: function(oSource, value) {
-				var aParams = oSource && oSource.getSelectedKey() && oSource.getSelectedKey().split("/");
-				var oDialog =
-					oSource &&
-					oSource
-						.getParent()
-						.getParent()
-						.getParent()
-						.getParent();
-				var oFieldsInfoData = oDialog && oDialog.getModel("fieldsInfo").getData();
-				var oDataObject;
-				if (aParams[0] === "Default") {
-					oDataObject = { keyValue: aParams[1], value: aParams[0] };
-				} else if (aParams[0] === "ClearFieldValue") {
-					oDataObject = { keyValue: aParams[1], value: "" };
-				} else if (!aParams) {
-					var sPropertyName = oSource.getId().substring(oSource.getId().lastIndexOf(":") + 1);
-					oDataObject = {
-						keyValue: sPropertyName,
-						value: value
-					};
-				} else {
-					var aRelatedField =
-						aParams[0] &&
-						oFieldsInfoData.values &&
-						oFieldsInfoData.values[aParams[0]].filter(function(oFieldData) {
-							return oFieldData.text === oSource.getValue();
-						});
-					oDataObject =
-						aRelatedField && aRelatedField[0] && aRelatedField[0].textInfo
-							? { keyValue: aParams[0], value: aRelatedField[0].textInfo.value }
-							: { keyValue: aParams[0], value: oSource.getValue() };
-				}
-				var bExistingElementindex = false;
-				for (var i = 0; i < oFieldsInfoData.results.length; i++) {
-					if (oFieldsInfoData.results[i].keyValue === oDataObject.keyValue) {
-						bExistingElementindex = i;
-					}
-				}
-				if (bExistingElementindex !== false) {
-					oFieldsInfoData.results[bExistingElementindex] = oDataObject;
-				} else {
-					oFieldsInfoData.results.push(oDataObject);
-				}
-			}
-		};
-
-		return MassEditRuntime;
-	},
-	/* bExport= */ true
-);