@sapui5/sap.fe.test 1.99.0 → 1.101.1

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

@@ -3,21 +3,21 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"], function(Utils, OpaBuilder, FEBuilder) {
+sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"], function (Utils, OpaBuilder, FEBuilder) {
 	"use strict";
 
 	var APIHelper = {
-		createSaveAsTileBuilder: function() {
+		createSaveAsTileBuilder: function () {
 			return new FEBuilder().isDialogElement().hasType("sap.ushell.ui.footerbar.AddBookmarkButton");
 		},
 
-		createSaveAsTileCheckBuilder: function(mState) {
+		createSaveAsTileCheckBuilder: function (mState) {
 			return APIHelper.createSaveAsTileBuilder()
 				.hasState(mState)
 				.description(Utils.formatMessage("Checking 'Save as Tile' action in state '{0}'", mState));
 		},
 
-		createSaveAsTileExecutorBuilder: function(sBookmarkTitle) {
+		createSaveAsTileExecutorBuilder: function (sBookmarkTitle) {
 			return APIHelper.createSaveAsTileBuilder()
 				.doPress()
 				.description("Executing 'Save as Tile' action")
@@ -39,7 +39,7 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 				);
 		},
 
-		createSendEmailBuilder: function() {
+		createSendEmailBuilder: function () {
 			return new FEBuilder()
 				.isDialogElement()
 				.hasType("sap.m.Button")
@@ -47,19 +47,17 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 				.has(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "T_SEMANTIC_CONTROL_SEND_EMAIL"));
 		},
 
-		createSendEmailCheckBuilder: function(mState) {
+		createSendEmailCheckBuilder: function (mState) {
 			return APIHelper.createSendEmailBuilder()
 				.hasState(mState)
 				.description(Utils.formatMessage("Checking 'Send Email' action in state '{0}'", mState));
 		},
 
-		createSendEmailExecutorBuilder: function() {
-			return APIHelper.createSendEmailBuilder()
-				.doPress()
-				.description("Executing 'Send Email' action");
+		createSendEmailExecutorBuilder: function () {
+			return APIHelper.createSendEmailBuilder().doPress().description("Executing 'Send Email' action");
 		},
 
-		createMenuActionMatcher: function(vAction, bReturnAction) {
+		createMenuAndListActionMatcher: function (vAction, bReturnAction) {
 			var vActionMatcher;
 			if (Utils.isOfType(vAction, String)) {
 				vAction = { text: vAction };
@@ -87,7 +85,7 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 			return vActionMatcher;
 		},
 
-		createMenuActionExecutorBuilder: function(vAction) {
+		createMenuActionExecutorBuilder: function (vAction) {
 			if (!vAction) {
 				throw new Error("vAction parameter missing");
 			}
@@ -95,12 +93,12 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 			return FEBuilder.create()
 				.hasType("sap.ui.unified.Menu")
 				.isDialogElement(true)
-				.has(APIHelper.createMenuActionMatcher(vAction, true))
+				.has(APIHelper.createMenuAndListActionMatcher(vAction, true))
 				.doPress()
 				.description(Utils.formatMessage("Executing action '{0}' from currently open action menu", vAction));
 		},
 
-		createMenuActionCheckBuilder: function(vAction) {
+		createMenuActionCheckBuilder: function (vAction) {
 			if (!vAction) {
 				throw new Error("vAction parameter missing");
 			}
@@ -108,8 +106,21 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 			return FEBuilder.create()
 				.hasType("sap.ui.unified.Menu")
 				.isDialogElement(true)
-				.has(APIHelper.createMenuActionMatcher(vAction))
+				.has(APIHelper.createMenuAndListActionMatcher(vAction))
 				.description(Utils.formatMessage("Checking currently open action menu having action '{0}'", vAction));
+		},
+
+		createSelectListActionExecutorBuilder: function (vAction) {
+			if (!vAction) {
+				throw new Error("vAction parameter missing");
+			}
+
+			return FEBuilder.create()
+				.hasType("sap.m.SelectList")
+				.isDialogElement(true)
+				.has(APIHelper.createMenuAndListActionMatcher(vAction, true))
+				.doPress()
+				.description(Utils.formatMessage("Executing action '{0}' from currently open selection list", vAction));
 		}
 	};
 

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

@@ -100,11 +100,13 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 	/**
 	 * Changes the content of a field in an action parameter dialog.
 	 *
+	 * Deprecated: Please use dialog action iChangeDialogField.
+	 *
 	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
 	 * @param {string} [vValue] The new target value.
 	 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set filters, otherwise all previously set values will be kept
 	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
-	 * @public
+	 * @ui5-restricted
 	 */
 	DialogActions.prototype.iChangeActionParameterDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
 		return this.iChangeDialogField(vFieldIdentifier, vValue, bClearFirst);

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

@@ -3,72 +3,86 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogActions, Utils, OpaBuilder) {
-	"use strict";
+sap.ui.define(
+	["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"],
+	function (DialogActions, Utils, OpaBuilder, FEBuilder) {
+		"use strict";
 
-	/**
-	 * Constructs a new DialogMessageActions 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
-	 * @returns {sap.fe.test.api.DialogMessageActions} The new instance
-	 * @extends sap.fe.test.api.DialogActions
-	 * @alias sap.fe.test.api.DialogMessageActions
-	 * @class
-	 * @hideconstructor
-	 * @public
-	 */
-	var DialogMessageActions = function(oDialogBuilder, vDialogDescription) {
-		return DialogActions.call(this, oDialogBuilder, vDialogDescription, 0);
-	};
-	DialogMessageActions.prototype = Object.create(DialogActions.prototype);
-	DialogMessageActions.prototype.constructor = DialogMessageActions;
-	DialogMessageActions.prototype.isAction = true;
+		/**
+		 * Constructs a new DialogMessageActions 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
+		 * @returns {sap.fe.test.api.DialogMessageActions} The new instance
+		 * @extends sap.fe.test.api.DialogActions
+		 * @alias sap.fe.test.api.DialogMessageActions
+		 * @class
+		 * @hideconstructor
+		 * @public
+		 */
+		var DialogMessageActions = function (oDialogBuilder, vDialogDescription) {
+			return DialogActions.call(this, oDialogBuilder, vDialogDescription, 0);
+		};
+		DialogMessageActions.prototype = Object.create(DialogActions.prototype);
+		DialogMessageActions.prototype.constructor = DialogMessageActions;
+		DialogMessageActions.prototype.isAction = true;
 
-	/**
-	 * Executes the <code>Back</code> action on the message dialog.
-	 *
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageActions.prototype.iExecuteBack = function() {
-		return this.prepareResult(
-			this.getBuilder()
-				.doPressHeaderButton(OpaBuilder.Matchers.properties({ icon: "sap-icon://nav-back" }))
-				.description(Utils.formatMessage("Pressing back button on dialog '{0}'", this.getIdentifier()))
-				.execute()
-		);
-	};
+		/**
+		 * Executes the <code>Back</code> action on the message dialog.
+		 *
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageActions.prototype.iExecuteBack = function () {
+			return this.prepareResult(
+				this.getBuilder()
+					.doPressHeaderButton(OpaBuilder.Matchers.properties({ icon: "sap-icon://nav-back" }))
+					.description(Utils.formatMessage("Pressing back button on dialog '{0}'", this.getIdentifier()))
+					.execute()
+			);
+		};
 
-	/**
-	 * Executes the <code>Refresh</code> action on the message dialog.
-	 *
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageActions.prototype.iExecuteRefresh = function() {
-		return this.prepareResult(
-			this.getBuilder()
-				.doPressFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_COMMON_SAPFE_REFRESH"))
-				.description(Utils.formatMessage("Pressing refresh button on dialog '{0}'", this.getIdentifier()))
-				.execute()
-		);
-	};
+		/**
+		 * Executes the <code>Refresh</code> action on the message dialog.
+		 *
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageActions.prototype.iExecuteRefresh = function () {
+			return this.prepareResult(
+				this.getBuilder()
+					.doPressFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "C_COMMON_SAPFE_REFRESH"))
+					.description(Utils.formatMessage("Pressing refresh button on dialog '{0}'", this.getIdentifier()))
+					.execute()
+			);
+		};
 
-	/**
-	 * Confirms the draft message with Discard Draft when navigating back to the list-report.
-	 *
-	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-	 * @public
-	 */
-	DialogMessageActions.prototype.iConfirmDiscardDraft = function() {
-		return this.prepareResult(
-			this.getBuilder()
-				.doPressFooterButton(this._getConfirmDiscardDraftButtonMatcher())
-				.description(Utils.formatMessage("Confirming dialog '{0}' with Discard Draft", this.getIdentifier()))
-				.execute()
-		);
-	};
+		/**
+		 * Selects the specified entry in the draft data loss popup
+		 *
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+		DialogMessageActions.prototype.iSelectDraftDataLossOption = function (optionKey) {
+			// The logic below uses customData for identifying the entry in list in the dialog
+			// which needs to be pressed
+			// The dialog's XML fragment for the custom data and the used keys
+			return this.prepareResult(
+				FEBuilder.create()
+					.hasType("sap.m.List")
+					.isDialogElement(true)
+					.has(OpaBuilder.Matchers.aggregation("items"))
+					.has(function (oItem) {
+						return oItem.find(function (element) {
+							return element.data("itemKey") === optionKey;
+						});
+					})
+					.doPress()
+					.description("Selecting option with key {0} in draft data loss popup")
+					.execute()
+			);
+		};
 
-	return DialogMessageActions;
-});
+		return DialogMessageActions;
+	}
+);

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

@@ -151,7 +151,15 @@ sap.ui.define(
 			}
 
 			mState = aArguments[1];
-			var bCheckForNotVisible = mState && mState.visible === false;
+			if (mState.visible !== undefined) {
+				mState.exists = mState.visible;
+				delete mState.visible;
+			}
+			if (mState.selected !== undefined) {
+				mState.visible = mState.selected;
+				delete mState.selected;
+			}
+			var bCheckForNotVisible = mState && mState.exists === false;
 			if (!bCheckForNotVisible && !Utils.isOfType(mState, [null, undefined])) {
 				oAdaptColumnBuilder.has(OpaBuilder.Matchers.bindingProperties(BaseAPI.MDC_P13N_MODEL, mState));
 			}