@sapui5/sap.fe.test 1.102.2 → 1.104.1

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

@@ -3,110 +3,108 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FEBuilder", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/DialogBuilder"], function(
-	FEBuilder,
-	Utils,
-	OpaBuilder,
-	DialogBuilder
-) {
-	"use strict";
-
-	var FilterBarBuilder = function() {
-		return FEBuilder.apply(this, arguments);
-	};
-
-	FilterBarBuilder.create = function(oOpaInstance) {
-		return new FilterBarBuilder(oOpaInstance);
-	};
-
-	FilterBarBuilder.prototype = Object.create(FEBuilder.prototype);
-	FilterBarBuilder.prototype.constructor = FilterBarBuilder;
-
-	FilterBarBuilder.createAdaptationDialogBuilder = function(oOpaInstance) {
-		return DialogBuilder.create(oOpaInstance).hasAggregation("customHeader");
-	};
-
-	FilterBarBuilder.prototype.hasField = function(vFieldMatcher, mState, bReturnField) {
-		var aArguments = Utils.parseArguments([[Array, Object, Function], Object, Boolean], arguments);
-		vFieldMatcher = aArguments[0];
-		mState = aArguments[1];
-		bReturnField = aArguments[2];
-
-		if (mState) {
-			var vStatesMatcher = this.getStatesMatcher(mState);
-			if (mState.visible === false) {
-				// when checking for not visible, the either no field exists or existing field is not visible (like the provided state)
-				return this.hasSome(
-					OpaBuilder.Matchers.not(OpaBuilder.Matchers.aggregationMatcher("filterItems", vFieldMatcher)),
-					OpaBuilder.Matchers.aggregationMatcher("filterItems", [vStatesMatcher].concat(vFieldMatcher || []))
-				);
+sap.ui.define(
+	["./FEBuilder", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/DialogBuilder"],
+	function (FEBuilder, Utils, OpaBuilder, DialogBuilder) {
+		"use strict";
+
+		var FilterBarBuilder = function () {
+			return FEBuilder.apply(this, arguments);
+		};
+
+		FilterBarBuilder.create = function (oOpaInstance) {
+			return new FilterBarBuilder(oOpaInstance);
+		};
+
+		FilterBarBuilder.prototype = Object.create(FEBuilder.prototype);
+		FilterBarBuilder.prototype.constructor = FilterBarBuilder;
+
+		FilterBarBuilder.createAdaptationDialogBuilder = function (oOpaInstance) {
+			return DialogBuilder.create(oOpaInstance).hasAggregation("customHeader");
+		};
+
+		FilterBarBuilder.prototype.hasField = function (vFieldMatcher, mState, bReturnField) {
+			var aArguments = Utils.parseArguments([[Array, Object, Function], Object, Boolean], arguments);
+			vFieldMatcher = aArguments[0];
+			mState = aArguments[1];
+			bReturnField = aArguments[2];
+
+			if (mState) {
+				var vStatesMatcher = this.getStatesMatcher(mState);
+				if (mState.visible === false) {
+					// when checking for not visible, the either no field exists or existing field is not visible (like the provided state)
+					return this.hasSome(
+						OpaBuilder.Matchers.not(OpaBuilder.Matchers.aggregationMatcher("filterItems", vFieldMatcher)),
+						OpaBuilder.Matchers.aggregationMatcher("filterItems", [vStatesMatcher].concat(vFieldMatcher || []))
+					);
+				}
+				vFieldMatcher = [vStatesMatcher].concat(vFieldMatcher || []);
 			}
-			vFieldMatcher = [vStatesMatcher].concat(vFieldMatcher || []);
-		}
-
-		return bReturnField
-			? this.has(OpaBuilder.Matchers.aggregation("filterItems", vFieldMatcher)).has(FEBuilder.Matchers.atIndex(0))
-			: this.has(OpaBuilder.Matchers.aggregationMatcher("filterItems", vFieldMatcher));
-	};
-
-	FilterBarBuilder.prototype.hasEditingStatus = function(oEditState, mState) {
-		var fnEditStateMatcher = OpaBuilder.Matchers.resourceBundle("label", "sap.fe.macros", "M_COMMON_FILTERBAR_EDITING_STATUS");
-		if (mState && "visible" in mState && mState.visible === false) {
-			return this.has(function(oFilterBar) {
-				return !oFilterBar.getFilterItems().some(FEBuilder.Matchers.match(fnEditStateMatcher));
-			});
-		}
-
-		var aFilterItemsMatchers = [fnEditStateMatcher];
-		if (oEditState) {
-			aFilterItemsMatchers.push(
-				OpaBuilder.Matchers.hasAggregation("contentEdit", OpaBuilder.Matchers.properties("selectedKey", oEditState.id))
-			);
-		}
-		if (mState && Object.keys(mState).length) {
-			aFilterItemsMatchers.push(FEBuilder.Matchers.states(mState));
-		}
-
-		return this.hasAggregation("filterItems", aFilterItemsMatchers);
-	};
-
-	FilterBarBuilder.prototype.hasSearchField = function(sSearchText, mState) {
-		var aMatchers = [];
-		if (mState) {
-			if (mState.visible === false) {
-				return this.has(function(oFilterBar) {
-					return !oFilterBar.getBasicSearchField();
+
+			return bReturnField
+				? this.has(OpaBuilder.Matchers.aggregation("filterItems", vFieldMatcher)).has(FEBuilder.Matchers.atIndex(0))
+				: this.has(OpaBuilder.Matchers.aggregationMatcher("filterItems", vFieldMatcher));
+		};
+
+		FilterBarBuilder.prototype.hasEditingStatus = function (oEditState, mState) {
+			var fnEditStateMatcher = OpaBuilder.Matchers.resourceBundle("label", "sap.fe.macros", "FILTERBAR_EDITING_STATUS");
+			if (mState && "visible" in mState && mState.visible === false) {
+				return this.has(function (oFilterBar) {
+					return !oFilterBar.getFilterItems().some(FEBuilder.Matchers.match(fnEditStateMatcher));
 				});
 			}
-			aMatchers.push(FEBuilder.Matchers.states(mState));
-		}
-		if (sSearchText) {
-			aMatchers.push(OpaBuilder.Matchers.properties({ value: sSearchText }));
-		}
-
-		return this.hasAggregation("basicSearchField", aMatchers);
-	};
-
-	FilterBarBuilder.prototype.doChangeEditingStatus = function(vEditState) {
-		var fnEditStateMatcher = OpaBuilder.Matchers.resourceBundle("label", "sap.fe.macros", "M_COMMON_FILTERBAR_EDITING_STATUS");
-		return this.doOnAggregation("filterItems", fnEditStateMatcher, OpaBuilder.Actions.enterText(vEditState.display));
-	};
-
-	FilterBarBuilder.prototype.doChangeSearch = function(sSearchText) {
-		return this.doOnAggregation("basicSearchField", OpaBuilder.Actions.enterText(sSearchText || ""));
-	};
-
-	FilterBarBuilder.prototype.doResetSearch = function() {
-		return this.doOnAggregation("basicSearchField", OpaBuilder.Actions.press("inner-reset"));
-	};
-
-	FilterBarBuilder.prototype.doSearch = function() {
-		return this.doPress("btnSearch");
-	};
-
-	FilterBarBuilder.prototype.doOpenSettings = function() {
-		return this.doPress("btnAdapt");
-	};
-
-	return FilterBarBuilder;
-});
+
+			var aFilterItemsMatchers = [fnEditStateMatcher];
+			if (oEditState) {
+				aFilterItemsMatchers.push(
+					OpaBuilder.Matchers.hasAggregation("contentEdit", OpaBuilder.Matchers.properties("selectedKey", oEditState.id))
+				);
+			}
+			if (mState && Object.keys(mState).length) {
+				aFilterItemsMatchers.push(FEBuilder.Matchers.states(mState));
+			}
+
+			return this.hasAggregation("filterItems", aFilterItemsMatchers);
+		};
+
+		FilterBarBuilder.prototype.hasSearchField = function (sSearchText, mState) {
+			var aMatchers = [];
+			if (mState) {
+				if (mState.visible === false) {
+					return this.has(function (oFilterBar) {
+						return !oFilterBar.getBasicSearchField();
+					});
+				}
+				aMatchers.push(FEBuilder.Matchers.states(mState));
+			}
+			if (sSearchText) {
+				aMatchers.push(OpaBuilder.Matchers.properties({ value: sSearchText }));
+			}
+
+			return this.hasAggregation("basicSearchField", aMatchers);
+		};
+
+		FilterBarBuilder.prototype.doChangeEditingStatus = function (vEditState) {
+			var fnEditStateMatcher = OpaBuilder.Matchers.resourceBundle("label", "sap.fe.macros", "FILTERBAR_EDITING_STATUS");
+			return this.doOnAggregation("filterItems", fnEditStateMatcher, OpaBuilder.Actions.enterText(vEditState.display));
+		};
+
+		FilterBarBuilder.prototype.doChangeSearch = function (sSearchText) {
+			return this.doOnAggregation("basicSearchField", OpaBuilder.Actions.enterText(sSearchText || ""));
+		};
+
+		FilterBarBuilder.prototype.doResetSearch = function () {
+			return this.doOnAggregation("basicSearchField", OpaBuilder.Actions.press("inner-reset"));
+		};
+
+		FilterBarBuilder.prototype.doSearch = function () {
+			return this.doPress("btnSearch");
+		};
+
+		FilterBarBuilder.prototype.doOpenSettings = function () {
+			return this.doPress("btnAdapt");
+		};
+
+		return FilterBarBuilder;
+	}
+);

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

@@ -3,14 +3,14 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MdcFieldBuilder", "sap/fe/test/Utils"], function(FieldBuilder, Utils) {
+sap.ui.define(["./MdcFieldBuilder", "sap/fe/test/Utils"], function (FieldBuilder, Utils) {
 	"use strict";
 
-	var FilterFieldBuilder = function() {
+	var FilterFieldBuilder = function () {
 		return FieldBuilder.apply(this, arguments);
 	};
 
-	FilterFieldBuilder.create = function(oOpaInstance) {
+	FilterFieldBuilder.create = function (oOpaInstance) {
 		return new FilterFieldBuilder(oOpaInstance);
 	};
 
@@ -19,27 +19,29 @@ sap.ui.define(["./MdcFieldBuilder", "sap/fe/test/Utils"], function(FieldBuilder,
 
 	/**
 	 * Checks for certain condition value(s).
+	 *
 	 * @param {string|Array} [vValue] The expected value(s)
 	 * @param {string} [sOperator] The expected operator
 	 * @returns {sap.fe.test.builder.FilterFieldBuilder} `this`
 	 * @public
 	 * @ui5-restricted
 	 */
-	FilterFieldBuilder.prototype.hasValue = function(vValue, sOperator) {
+	FilterFieldBuilder.prototype.hasValue = function (vValue, sOperator) {
 		return FieldBuilder.prototype.hasConditionValues.apply(this, arguments);
 	};
 
 	/**
 	 * Changes the value of the filter field.
+	 *
 	 * @param {string} vValue The new value
-	 * @param bClearFirst
+	 * @param {boolean} bClearFirst
 	 * @returns {sap.fe.test.builder.FilterFieldBuilder} `this`
 	 * @public
 	 * @ui5-restricted
 	 */
-	FilterFieldBuilder.prototype.doChangeValue = function(vValue, bClearFirst) {
+	FilterFieldBuilder.prototype.doChangeValue = function (vValue, bClearFirst) {
 		if (bClearFirst) {
-			this.do(function(oFilterField) {
+			this.do(function (oFilterField) {
 				oFilterField.setConditions([]);
 			});
 		}

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

@@ -36,23 +36,30 @@ sap.ui.define(
 		var RowActionType = {
 			/**
 			 * Custom defined Row Action.
+			 *
 			 * @public
 			 */
 			Custom: "Custom",
 
 			/**
 			 * Navigation Row Action.
+			 *
 			 * @public
 			 */
 			Navigation: "Navigation",
 
 			/**
 			 * Delete Row Action.
+			 *
 			 * @public
 			 */
 			Delete: "Delete"
 		};
 
+		var TableBuilder = function () {
+			return FEBuilder.apply(this, arguments).hasType("sap.ui.mdc.Table");
+		};
+
 		function _isGridTable(oMdcTable) {
 			return oMdcTable.getType().isA("sap.ui.mdc.table.GridTableType");
 		}
@@ -264,9 +271,6 @@ sap.ui.define(
 					.execute()
 			);
 		}
-		var TableBuilder = function () {
-			return FEBuilder.apply(this, arguments).hasType("sap.ui.mdc.Table");
-		};
 
 		TableBuilder.create = function (oOpaInstance) {
 			return new TableBuilder(oOpaInstance);
@@ -929,7 +933,7 @@ sap.ui.define(
 							oMdcTable = oTable.getParent(),
 							bIsGridTable = _isGridTable(oMdcTable),
 							bRowIsSelected = bIsGridTable
-								? oTable.getSelectedIndices.includes(oTable.indexOfRow(oRow))
+								? oMdcTable.getSelectedContexts().includes(oRow.getBindingContext())
 								: oRow.getSelected();
 
 						return bSelected ? bRowIsSelected : !bRowIsSelected;

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

@@ -3,14 +3,14 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], function(FEBuilder, OpaBuilder, Utils) {
+sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], function (FEBuilder, OpaBuilder, Utils) {
 	"use strict";
 
-	var VMBuilder = function() {
+	var VMBuilder = function () {
 		return FEBuilder.apply(this, arguments);
 	};
 
-	VMBuilder.create = function(oOpaInstance) {
+	VMBuilder.create = function (oOpaInstance) {
 		return new VMBuilder(oOpaInstance);
 	};
 
@@ -19,28 +19,29 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 
 	/**
 	 * Saves a variant under given name.
+	 *
 	 * @param {string} sVariantName The name of the new variant
-	 * @param bSetAsDefault
-	 * @param bApplyAutomatically
+	 * @param {boolean} bSetAsDefault
+	 * @param {boolean} bApplyAutomatically
 	 * @returns {sap.fe.test.builder.VMBuilder} This instance
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doSaveAs = function(sVariantName, bSetAsDefault, bApplyAutomatically) {
+	VMBuilder.prototype.doSaveAs = function (sVariantName, bSetAsDefault, bApplyAutomatically) {
 		var vGivenDescription = Utils.formatMessage("Save as variant '{0}'", sVariantName);
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 
 		return this.doPress().success(
-			function(oVMControl) {
+			function (oVMControl) {
 				return FEBuilder.create(this)
 					.hasId(oVMControl.getId())
-					.doPress("saveas")
+					.doPress("vm-saveas")
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-savedialog")
+							.hasId(oVMControl.getId() + "-vm-savedialog")
 							.doOnChildren(
 								FEBuilder.create(this)
 									.hasId(/-name$/)
@@ -76,24 +77,19 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	 * Saves the current variant.
 	 *
 	 * @returns {sap.fe.test.builder.VMBuilder} This instance
-	 *
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doSave = function() {
+	VMBuilder.prototype.doSave = function () {
 		var vGivenDescription = "Save variant";
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 
 		return this.doPress().success(
-			function(oVMControl) {
-				return FEBuilder.create(this)
-					.hasId(oVMControl.getId())
-					.doPress("mainsave")
-					.description(vGivenDescription)
-					.execute();
+			function (oVMControl) {
+				return FEBuilder.create(this).hasId(oVMControl.getId()).doPress("vm-mainsave").description(vGivenDescription).execute();
 			}.bind(this)
 		);
 	};
@@ -103,20 +99,19 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	 *
 	 * @param {string} sVariantName The name of the variant to select
 	 * @returns {sap.fe.test.builder.VMBuilder} This instance
-	 *
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doSelectVariant = function(sVariantName) {
+	VMBuilder.prototype.doSelectVariant = function (sVariantName) {
 		var vGivenDescription = Utils.formatMessage("Selecting variant '{0}'", sVariantName);
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 		return this.doPress().success(
-			function(oVMControl) {
+			function (oVMControl) {
 				return FEBuilder.create(this)
-					.hasId(oVMControl.getId() + "-list")
+					.hasId(oVMControl.getId() + "-vm-list")
 					.doOnAggregation("items", OpaBuilder.Matchers.properties({ text: sVariantName }), OpaBuilder.Actions.press())
 					.description(vGivenDescription)
 					.execute();
@@ -129,24 +124,23 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	 *
 	 * @param {string} sVariantName The name of the variant to remove
 	 * @returns {sap.fe.test.builder.VMBuilder} This instance
-	 *
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doRemoveVariant = function(sVariantName) {
+	VMBuilder.prototype.doRemoveVariant = function (sVariantName) {
 		var vGivenDescription = Utils.formatMessage("Removing variant '{0}'", sVariantName);
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 		return this.doPress().success(
-			function(oVMControl) {
+			function (oVMControl) {
 				return FEBuilder.create(this)
 					.hasId(oVMControl.getId())
-					.doPress("manage")
+					.doPress("vm-manage")
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-managementTable")
+							.hasId(oVMControl.getId() + "-vm-managementTable")
 							.doOnChildren(
 								FEBuilder.create(this)
 									.hasType("sap.m.ColumnListItem")
@@ -162,7 +156,7 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 							)
 							.doOnChildren(
 								FEBuilder.create(this)
-									.hasId(/-managementsave$/)
+									.hasId(/-vm-managementsave$/)
 									.hasType("sap.m.Button")
 									.doPress()
 							)
@@ -178,39 +172,34 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	 *
 	 * @param {string} sVariantName The name of the variant to be set as default
 	 * @returns {sap.fe.test.builder.VMBuilder} `this` instance
-	 *
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doSetVariantAsDefault = function(sVariantName) {
+	VMBuilder.prototype.doSetVariantAsDefault = function (sVariantName) {
 		var vGivenDescription = Utils.formatMessage("Setting variant '{0}' as default", sVariantName);
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 		return this.doPress().success(
-			function(oVMControl) {
+			function (oVMControl) {
 				return FEBuilder.create(this)
 					.hasId(oVMControl.getId())
-					.doPress("manage")
+					.doPress("vm-manage")
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-managementTable")
+							.hasId(oVMControl.getId() + "-vm-managementTable")
 							.doOnChildren(
 								FEBuilder.create(this)
 									.hasType("sap.m.ColumnListItem")
 									.hasAggregationProperties("cells", { value: sVariantName })
-									.doOnChildren(
-										FEBuilder.create(this)
-											.hasType("sap.m.RadioButton")
-											.doPress()
-									)
+									.doOnChildren(FEBuilder.create(this).hasType("sap.m.RadioButton").doPress())
 							)
 							.description(vGivenDescription)
 					)
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-managementsave")
+							.hasId(oVMControl.getId() + "-vm-managementsave")
 							.hasType("sap.m.Button")
 							.doPress()
 					)
@@ -223,39 +212,34 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	 * Resets the default variant to Standard.
 	 *
 	 * @returns {sap.fe.test.builder.VMBuilder} `this` instance
-	 *
 	 * @public
 	 * @ui5-restricted
 	 */
-	VMBuilder.prototype.doResetDefaultVariant = function() {
+	VMBuilder.prototype.doResetDefaultVariant = function () {
 		var vGivenDescription = Utils.formatMessage("Resetting default variant ");
-		this.description = function(vDescription) {
+		this.description = function (vDescription) {
 			vGivenDescription = vDescription;
 			return this;
 		}.bind(this);
 		return this.doPress().success(
-			function(oVMControl) {
+			function (oVMControl) {
 				return FEBuilder.create(this)
 					.hasId(oVMControl.getId())
-					.doPress("manage")
+					.doPress("vm-manage")
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-managementTable")
+							.hasId(oVMControl.getId() + "-vm-managementTable")
 							.doOnChildren(
 								FEBuilder.create(this)
 									.hasType("sap.m.ColumnListItem")
 									.hasAggregationProperties("cells", { text: "SAP" })
-									.doOnChildren(
-										FEBuilder.create(this)
-											.hasType("sap.m.RadioButton")
-											.doPress()
-									)
+									.doOnChildren(FEBuilder.create(this).hasType("sap.m.RadioButton").doPress())
 							)
 							.description(vGivenDescription)
 					)
 					.success(
 						FEBuilder.create(this)
-							.hasId(oVMControl.getId() + "-managementsave")
+							.hasId(oVMControl.getId() + "-vm-managementsave")
 							.hasType("sap.m.Button")
 							.doPress()
 					)