@sapui5/sap.fe.test 1.92.0 → 1.93.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.test",
-	"version": "1.92.0",
+	"version": "1.93.3",
 	"description": "SAPUI5 Library sap.fe.test",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -19,7 +19,6 @@
 		"@babel/cli": "7.8.4",
 		"@ui5/cli": "^2.10.0",
 		"copyfiles": "2.2.0",
-		"xpath": "0.0.27",
-		"yarn": "1.22.10"
+		"xpath": "0.0.27"
 	}
 }

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

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.92.0</version>
+    <version>1.93.3</version>
 
     <documentation>UI5 library: sap.fe.test</documentation>
 

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

@@ -603,12 +603,12 @@ sap.ui.define(["sap/ui/test/Opa5", "sap/ui/test/OpaBuilder", "sap/ui/qunit/QUnit
 					.execute();
 			},
 
-			iDoNotSeeTheVariantManagementPopover: function() {
-				return this.iDoNotSeeTheButtonByIcon("sap-icon://duplicate", "The Popover");
+			iSeeTheVariantManagementPopover: function() {
+				return this.iSeeTheButtonByIcon("sap-icon://duplicate", "The Popover");
 			},
 
-			iDoNotSeeTheRTAPopover: function() {
-				return this.iDoNotSeeTheButtonByIcon("sap-icon://key-user-settings", "The RTAPopover");
+			iSeeTheRTAPopover: function() {
+				return this.iSeeTheButtonByIcon("sap-icon://key-user-settings", "The RTAPopover");
 			},
 
 			iSeeTheRenameButton: function() {

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

@@ -12,6 +12,7 @@ sap.ui.define(
 		"sap/fe/test/builder/MacroFieldBuilder",
 		"sap/fe/test/builder/VMBuilder",
 		"sap/fe/test/builder/OverflowToolbarBuilder",
+		"sap/fe/test/builder/KPIBuilder",
 		"sap/fe/test/api/FooterActionsBase",
 		"sap/fe/test/api/FooterAssertionsBase",
 		"sap/fe/test/api/HeaderActionsLR",
@@ -26,6 +27,7 @@ sap.ui.define(
 		FieldBuilder,
 		VMBuilder,
 		OverflowToolbarBuilder,
+		KPIBuilder,
 		FooterActionsBase,
 		FooterAssertionsBase,
 		HeaderActionsLR,
@@ -171,6 +173,14 @@ sap.ui.define(
 									.description("Pressing dialog button '" + sText + "'")
 									.execute();
 							},
+							iClickLinkWithText: function(sText) {
+								return OpaBuilder.create(this)
+									.hasType("sap.m.Link")
+									.hasProperties({ text: sText })
+									.doPress()
+									.description("Navigating via link '" + sText + "'")
+									.execute();
+							},
 							iOpenIconTabWithTitle: function(sName) {
 								return OpaBuilder.create(this)
 									.hasId(IconTabBarId)
@@ -319,6 +329,22 @@ sap.ui.define(
 									.description("Seeing link with text '" + sText + "'")
 									.execute();
 							},
+							iSeeQuickViewMoreLinksButton: function() {
+								return OpaBuilder.create(this)
+									.isDialogElement(true)
+									.hasType("sap.m.Button")
+									.has(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "info.POPOVER_DEFINE_LINKS"))
+									.description("The 'More Links' button found")
+									.execute();
+							},
+							iSeeFlpLink: function(sDescription) {
+								return OpaBuilder.create(this)
+									.hasType("sap.ui.mdc.link.PanelListItem")
+									.isDialogElement(true)
+									.hasProperties({ text: sDescription })
+									.description("FLP link with text '" + sDescription + "' is present")
+									.execute();
+							},
 							iSeeHeaderPinnableToggle: function(bVisible) {
 								var sState = bVisible ? "visible" : "hidden";
 								return OpaBuilder.create(this)
@@ -500,6 +526,16 @@ sap.ui.define(
 										Utils.formatMessage("Seeing Create dialog parameter '{0}' with value '{1}'", sFieldId, sValue)
 									)
 									.execute();
+							},
+							iSeeKPI: function(sTitle, oProperties) {
+								var sDescription = "Seeing KPI '" + sTitle + "'";
+								if (oProperties) {
+									sDescription += " with properties " + JSON.stringify(oProperties);
+								}
+								return KPIBuilder.create(this)
+									.checkKPI(sTitle, oProperties)
+									.description(sDescription)
+									.execute();
 							}
 						}
 					}

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

@@ -76,7 +76,10 @@ sap.ui.define(
 
 			if (!Utils.isOfType(vSectionIdentifier, String)) {
 				if (typeof vSectionIdentifier.section === "string" && !vSectionIdentifier.subSection) {
-					sActionId = sOPSectionIdPrefix + "::" + vSectionIdentifier.section + "-anchor";
+					sActionId =
+						vSectionIdentifier.section === "EditableHeaderSection"
+							? "fe::" + vSectionIdentifier.section + "-anchor"
+							: sOPSectionIdPrefix + "::" + vSectionIdentifier.section + "-anchor";
 					vMatcher = OpaBuilder.Matchers.children(FEBuilder.Matchers.id(new RegExp(Utils.formatMessage("{0}$", sActionId))));
 				} else {
 					throw new Error(
@@ -147,7 +150,6 @@ sap.ui.define(
 				BreadCrumbId = ViewId + "--fe::Breadcrumbs",
 				AnchorBarId = "fe::ObjectPage-anchBar",
 				PaginatorId = "fe::Paginator",
-				EditableHeaderSectionId = "fe::EditableHeaderSection",
 				EditableHeaderTitleId = "EditableHeaderForm::EditableHeaderTitle",
 				Page_EditMode = {
 					DISPLAY: "Display",
@@ -317,6 +319,12 @@ sap.ui.define(
 							 *     subSection: <string>
 							 * }
 							 * </pre></code>
+							 * to open the editable header section use pattern:
+							 * <code><pre>
+							 * {
+							 *     section: "EditableHeaderSection"
+							 * }
+							 * </pre></code>
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 							 *
 							 * @function
@@ -333,7 +341,7 @@ sap.ui.define(
 								) {
 									// open sub-section via menu
 									var oMenuButton = { section: vSectionIdentifier.section };
-									oBuilder
+									return oBuilder
 										.has(_createSectionMatcher(oMenuButton, OPSectionIdPrefix))
 										.doOnChildren(
 											OpaBuilder.create(this)
@@ -356,15 +364,13 @@ sap.ui.define(
 										.description("Selecting section " + vSectionIdentifier.section)
 										.execute();
 								} else {
-									// open simple section
-									oBuilder
+									// open section by string (section label) or by object with section parameter
+									return oBuilder
 										.has(_createSectionMatcher(vSectionIdentifier, OPSectionIdPrefix))
 										.doPress()
-										.description("Selecting section " + vSectionIdentifier)
+										.description("Selecting section " + (vSectionIdentifier.section || vSectionIdentifier))
 										.execute();
 								}
-
-								return oBuilder;
 							},
 							/**
 							 * TODO This function is only here for legacy reasons and therefore private. Use iGoToSection instead.
@@ -375,27 +381,7 @@ sap.ui.define(
 							 * @private
 							 */
 							iOpenSectionWithTitle: function(sName) {
-								return OpaBuilder.create(this)
-									.hasId(AnchorBarId)
-									.has(
-										OpaBuilder.Matchers.children(
-											FEBuilder.Matchers.states({
-												controlType: "sap.m.Button",
-												text: sName
-											})
-										)
-									)
-									.doPress()
-									.description("Selecting section " + sName)
-									.execute();
-							},
-
-							iOpenEditableHeaderSection: function(sName) {
-								return OpaBuilder.create(this)
-									.hasId(ObjectPageLayoutId + "-anchBar-" + ViewId + "--" + EditableHeaderSectionId + "-anchor")
-									.doPress()
-									.description("Selecting section " + sName)
-									.execute();
+								return this.iGoToSection(sName);
 							},
 
 							iEnterValueForFieldInEditableHeader: function(sValue) {
@@ -440,6 +426,15 @@ sap.ui.define(
 									.description("Clicked on Message Button")
 									.execute();
 							},
+							iCheckMessageButtonTooltip: function(sText) {
+								return OpaBuilder.create(this)
+									.hasType("sap.fe.common.MessageButton")
+									.check(function(oControl) {
+										return oControl[0].getTooltip() === sText;
+									}, true)
+									.description("Checking tooltip of MessageButton")
+									.execute();
+							},
 							iClickOnMessage: function(oMessageInfo) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.MessageListItem")
@@ -803,7 +798,7 @@ sap.ui.define(
 								return OpaBuilder.create(this)
 									.hasType("sap.m.MessageView")
 									.check(function(oMessageView) {
-										var messages = oMessageView[iMessagePosition].getItems();
+										var messages = oMessageView[0].getItems();
 										return (
 											messages[iMessagePosition].getGroupName() === oBoundMessageInfo.GroupLabel &&
 											messages[iMessagePosition].getTitle() === oBoundMessageInfo.MessageText &&
@@ -836,6 +831,19 @@ sap.ui.define(
 									.hasProperties({ text: sText, visible: bExpectedVisibility })
 									.description("Button '" + sText + "' is " + (bExpectedVisibility ? "visible" : "NOT visible"))
 									.execute();
+							},
+							iCheckFieldVisibilityInMassEditDialog: function(sFieldID, sValue) {
+								return OpaBuilder.create(this)
+									.isDialogElement()
+									.hasType("sap.m.ComboBox")
+									.check(function(aControls) {
+										var bControlExists = aControls.some(function(oControl) {
+											return oControl.getId() === sFieldID;
+										});
+										return bControlExists === sValue;
+									})
+									.description("Checking visibility of field in mass edit dialog")
+									.execute();
 							}
 						}
 					}

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

@@ -124,7 +124,7 @@ sap.ui.define(
 
 		// assertions
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Confirmation })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Confirmation })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogAssertions} The available dialog assertions
 		 * @function
@@ -132,7 +132,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.ValueHelp })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.ValueHelp })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogValueHelpAssertions} The available dialog assertions
 		 * @function
@@ -140,7 +140,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Message })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Message })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogMessageAssertions} The available dialog assertions
 		 * @function
@@ -148,7 +148,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Error })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Error })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogAssertions} The available dialog assertions
 		 * @function
@@ -156,7 +156,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Action })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Action })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogAssertions} The available dialog assertions
 		 * @function
@@ -164,7 +164,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Create })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Create })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogCreateAssertions} The available dialog assertions
 		 * @function
@@ -173,7 +173,7 @@ sap.ui.define(
 		 */
 		// actions
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Confirmation })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Confirmation })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogActions} The available dialog actions
 		 * @function
@@ -181,7 +181,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.ValueHelp })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.ValueHelp })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogValueHelpActions} The available dialog actions
 		 * @function
@@ -189,7 +189,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Message })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Message })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogMessageActions} The available dialog actions
 		 * @function
@@ -197,7 +197,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Error })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Error })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogActions} The available dialog actions
 		 * @function
@@ -205,7 +205,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Action })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Action })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogActions} The available dialog actions
 		 * @function
@@ -213,7 +213,7 @@ sap.ui.define(
 		 * @public
 		 */
 		/**
-		 * Shortcut for <code>&nbsp;onDialog({ type: sap.fe.test.api.DialogType.Create })</code>.
+		 * Shortcut for <code>onDialog({ type: sap.fe.test.api.DialogType.Create })</code>.
 		 *
 		 * @returns {sap.fe.test.api.DialogCreateActions} The available dialog actions
 		 * @function

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

@@ -43,7 +43,7 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 				.isDialogElement()
 				.hasType("sap.m.Button")
 				.hasProperties({ icon: "sap-icon://email" })
-				.has(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.macros", "T_SEMANTIC_CONTROL_SEND_EMAIL"));
+				.has(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "T_SEMANTIC_CONTROL_SEND_EMAIL"));
 		},
 
 		createSendEmailCheckBuilder: function(mState) {

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

@@ -291,6 +291,9 @@ sap.ui.define(
 								selectItem = oItem;
 							}
 						});
+						if (!selectItem) {
+							selectItem = aItems[0];
+						}
 						if (oInteractiveChart.isA("sap.suite.ui.microchart.InteractiveLineChart")) {
 							var aPoints = oInteractiveChart.getSelectedPoints();
 							return oInteractiveChart.fireSelectionChanged({

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

@@ -141,7 +141,7 @@ sap.ui.define(
 		FormActions.prototype.iChangeField = function(vFieldIdentifier, sValue) {
 			return this.prepareResult(
 				this.createFieldBuilder(vFieldIdentifier)
-					.doEnterText(sValue)
+					.doEnterText(sValue, true, false, true)
 					.description(
 						Utils.formatMessage(
 							"Entering value '{1}' into field '{2}' on form '{0}'",

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

@@ -10,9 +10,10 @@ sap.ui.define(
 		"sap/fe/test/builder/MdcTableBuilder",
 		"sap/fe/test/builder/DialogBuilder",
 		"sap/ui/test/OpaBuilder",
-		"sap/ui/test/actions/Action"
+		"sap/ui/test/actions/Action",
+		"sap/ui/core/SortOrder"
 	],
-	function(BaseAPI, Utils, FEBuilder, TableBuilder, DialogBuilder, OpaBuilder, Action) {
+	function(BaseAPI, Utils, FEBuilder, TableBuilder, DialogBuilder, OpaBuilder, Action, SortOrder) {
 		"use strict";
 
 		/**
@@ -181,7 +182,7 @@ sap.ui.define(
 		};
 
 		/**
-		 * Helper method to personalize table. If no actions are given, this function can be used for checking only.
+		 * Helper method to personalize table, either adapt columns or filter. If no actions are given, this function can be used for checking only.
 		 * During execution it checks for an already open dialog. If it does not exist, it is opened before
 		 * the check/interaction of the columns, and closed/confirmed directly afterwards.
 		 *
@@ -273,7 +274,128 @@ sap.ui.define(
 					.execute()
 			);
 		};
+		/**
+		 * Helper method to adapt the sorting of a table. If no actions are given, this function can be used for checking only.
+		 * During execution it checks for an already open dialog. If it does not exist, it is opened before
+		 * the check/interaction of the columns, and closed/confirmed directly afterwards.
+		 *
+		 * @param {string | sap.fe.test.api.ColumnIdentifier} vColumnIdentifier The field identifier
+		 * @param {object} [mState] The state of the personalization field. The following states are supported:
+		 * <code><pre>
+		 * 	{
+		 * 		sortOrder: SortOrder.Ascending|SortOrder.Descending|SortOrder.None
+		 * 	}
+		 * </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 {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
+		 *
+		 * @ui5-restricted
+		 */
+		TableAPI.prototype.sortingPersonalization = function(
+			vColumnIdentifier,
+			mState,
+			vActions,
+			sDescription,
+			oDialogBuilder,
+			fnOpenDialog,
+			fnCloseDialog
+		) {
+			var aArguments = Utils.parseArguments(
+					[[String, Object], Object, [Function, Array, Action], String, OpaBuilder, Function, Function],
+					arguments
+				),
+				oBuilder = FEBuilder.create(this.getOpaInstance()),
+				bDialogOpen,
+				oAdaptColumnBuilder = FEBuilder.create(this.getOpaInstance())
+					.hasType("sap.m.CustomListItem")
+					.isDialogElement(),
+				oNoneColumnMatcher = OpaBuilder.Matchers.childrenMatcher(
+					OpaBuilder.create()
+						.hasType("sap.m.Select")
+						.hasProperties({ selectedKey: "$_none" })
+				),
+				oTargetColumnMatcher;
+
+			oDialogBuilder = aArguments[4];
+			fnOpenDialog = aArguments[5];
+			fnCloseDialog = aArguments[6];
+
+			vColumnIdentifier = aArguments[0];
+			if (Utils.isOfType(vColumnIdentifier, String)) {
+				oTargetColumnMatcher = OpaBuilder.Matchers.childrenMatcher(
+					OpaBuilder.create(this.getOpaInstance())
+						.hasType("sap.m.Select")
+						.has(function(oSelectControl) {
+							return oSelectControl.getSelectedItem().getText() === vColumnIdentifier;
+						})
+				);
+			} else {
+				oTargetColumnMatcher = OpaBuilder.Matchers.childrenMatcher(
+					OpaBuilder.create(this.getOpaInstance())
+						.hasType("sap.m.Select")
+						.hasProperties({ selectedKey: vColumnIdentifier.name })
+				);
+			}
 
+			oDialogBuilder
+				.has(OpaBuilder.Matchers.children(oAdaptColumnBuilder))
+				.has(function(aCustomListItems) {
+					var aMatchingListItems = OpaBuilder.Matchers.filter(oTargetColumnMatcher)(aCustomListItems);
+					if (aMatchingListItems.length) {
+						return aMatchingListItems;
+					}
+					return OpaBuilder.Matchers.filter(oNoneColumnMatcher)(aCustomListItems);
+				})
+				.has(function(aFoundAdaptationColumns) {
+					if (bCheckForNotVisible) {
+						return aFoundAdaptationColumns.length === 0;
+					}
+					return FEBuilder.Matchers.atIndex(0)(aFoundAdaptationColumns);
+				});
+
+			mState = aArguments[1];
+			var bCheckForNotVisible = mState && mState.visible === false;
+			if (!bCheckForNotVisible && !Utils.isOfType(mState, [null, undefined])) {
+				if (mState.sortOrder) {
+					var sSortOrder = mState.sortOrder;
+					delete mState.sortOrder;
+					oDialogBuilder.hasChildren(
+						OpaBuilder.create()
+							.hasType("sap.m.SegmentedButton")
+							.has(function(oSegmentedButton) {
+								if (sSortOrder === SortOrder.None) {
+									return !oSegmentedButton.enabled;
+								}
+								return oSegmentedButton.getSelectedKey() === (sSortOrder === SortOrder.Ascending ? "asc" : "desc");
+							})
+					);
+				}
+				//oDialogBuilder.hasState(mState);
+			}
+
+			vActions = aArguments[2];
+			if (!Utils.isOfType(vActions, [null, undefined])) {
+				oDialogBuilder.do(vActions);
+			}
+
+			sDescription = aArguments[3];
+			return this.prepareResult(
+				oBuilder
+					.success(function() {
+						bDialogOpen = FEBuilder.controlsExist(oDialogBuilder);
+						if (!bDialogOpen) {
+							fnOpenDialog();
+							oDialogBuilder.success(fnCloseDialog);
+						}
+						return oDialogBuilder.description(sDescription).execute();
+					})
+					.execute()
+			);
+		};
 		/**
 		 * Helper method to adapt columns fields. If no actions are given, this function can be used for checking only.
 		 * During execution it checks for an already open adaptation dialog. If it does not exist, it is opened before
@@ -313,7 +435,7 @@ sap.ui.define(
 		 * @ui5-restricted
 		 */
 		TableAPI.prototype.columnSorting = function(vColumnIdentifier, mState, vActions, sDescription) {
-			return this.personalization(
+			return this.sortingPersonalization(
 				vColumnIdentifier,
 				mState,
 				vActions,

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

@@ -704,46 +704,48 @@ sap.ui.define(
 		Actions.prototype.iChangeSortOrder = function(vColumnIdentifier, sSortOrder) {
 			var oOpaInstance = this.getOpaInstance(),
 				aActions = [],
-				oMdcResourceBundle = Core.getLibraryResourceBundle("sap.ui.mdc"),
-				fnSortOrderAction = function(oColumnListItem) {
+				fnSelectSortingColumnAction = function(oColumnListItem) {
 					var oChildBuilder = OpaBuilder.create(oOpaInstance).hasType("sap.m.Select"),
-						vControls = OpaBuilder.Matchers.children(oChildBuilder)(oColumnListItem);
-					// this function is not used in case of sSortOrder === SortOrder.None, so this case isn't handled
-					return OpaBuilder.Actions.executor(
-						OpaBuilder.Actions.enterText(
-							sSortOrder === SortOrder.Ascending
-								? oMdcResourceBundle.getText("sort.PERSONALIZATION_DIALOG_OPTION_ASCENDING")
-								: oMdcResourceBundle.getText("sort.PERSONALIZATION_DIALOG_OPTION_DESCENDING")
-						)
-					)(vControls);
+						vControls = OpaBuilder.Matchers.children(oChildBuilder)(oColumnListItem),
+						fnFindItem = Utils.isOfType(vColumnIdentifier, String)
+							? function(oItem) {
+									return oItem.getText() === vColumnIdentifier;
+							  }
+							: function(oItem) {
+									return oItem.getKey() === vColumnIdentifier.name;
+							  };
+
+					return OpaBuilder.Actions.executor(function(oSelectControl) {
+						var oItemToSelect = oSelectControl.getItems().find(fnFindItem);
+						if (!oItemToSelect) {
+							throw Error(Utils.formatMessage("can not find sort item '{0}'", vColumnIdentifier));
+						}
+						oSelectControl.setSelectedItem(oItemToSelect);
+						// not the recommended way - but seems to do?!
+						oSelectControl.fireChange({ selectedItem: oItemToSelect });
+					})(vControls);
+				},
+				fnSelectSortOrderAction = function(oColumnListItem) {
+					var sIcon =
+							sSortOrder === SortOrder.None
+								? "sap-icon://decline"
+								: "sap-icon://sort-" + (sSortOrder === SortOrder.Ascending ? "ascending" : "descending"),
+						oTargetButtonMatcher = OpaBuilder.create(oOpaInstance)
+							.hasType("sap.m.Button")
+							.hasProperties({ icon: sIcon });
+					var vControl = OpaBuilder.Matchers.children(oTargetButtonMatcher)(oColumnListItem);
+					return OpaBuilder.Actions.executor(OpaBuilder.Actions.press())(vControl);
 				};
+
 			sSortOrder = sSortOrder || SortOrder.Ascending;
 			switch (sSortOrder) {
 				case SortOrder.Ascending:
-					aActions.push(
-						OpaBuilder.Actions.conditional(
-							OpaBuilder.Matchers.properties({ selected: false }),
-							OpaBuilder.Actions.press("selectMulti")
-						)
-					);
-					aActions.push(fnSortOrderAction);
-					break;
 				case SortOrder.Descending:
-					aActions.push(
-						OpaBuilder.Actions.conditional(
-							OpaBuilder.Matchers.properties({ selected: false }),
-							OpaBuilder.Actions.press("selectMulti")
-						)
-					);
-					aActions.push(fnSortOrderAction);
+					aActions.push(fnSelectSortingColumnAction);
+					aActions.push(fnSelectSortOrderAction);
 					break;
 				case SortOrder.None:
-					aActions.push(
-						OpaBuilder.Actions.conditional(
-							OpaBuilder.Matchers.properties({ selected: true }),
-							OpaBuilder.Actions.press("selectMulti")
-						)
-					);
+					aActions.push(fnSelectSortOrderAction);
 					break;
 				default:
 					throw new Error("unhandled switch case: " + sSortOrder);

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

@@ -382,7 +382,9 @@ sap.ui.define(
 		 * @public
 		 */
 		TableAssertions.prototype.iCheckColumnSorting = function() {
-			return this._iCheckTableProvidedAction("ColumnSorting");
+			this.iOpenColumnSorting();
+			TableBuilder.createSortingDialogBuilder(this.getOpaInstance()).execute();
+			return this.iConfirmColumnSorting();
 		};
 
 		/**
@@ -393,7 +395,10 @@ sap.ui.define(
 		 * @public
 		 */
 		TableAssertions.prototype.iCheckColumnFiltering = function() {
-			return this._iCheckTableProvidedAction("ColumnFiltering");
+			this.iOpenFilterDialog();
+			TableBuilder.createFilteringDialogBuilder(this.getOpaInstance()).execute();
+			return this.iConfirmFilterDialog();
+			// return this._iCheckTableProvidedAction("ColumnAdaptation");
 		};
 
 		/**
@@ -495,12 +500,7 @@ sap.ui.define(
 			// either check via sorting dialog...
 			if (bCheckPersonalization) {
 				var mState = {};
-				if (sSortOrder === SortOrder.None) {
-					mState.selected = false;
-				} else {
-					mState.selected = true;
-					mState.content = { selectedKey: sSortOrder === SortOrder.Descending ? "true" : "false" };
-				}
+				mState.sortOrder = sSortOrder;
 				return this.columnSorting(vColumnIdentifier, mState, undefined, sDescription);
 			}
 

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

@@ -0,0 +1,55 @@
+/*
+ * ! SAPUI5
+ * (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) {
+	"use strict";
+
+	var KPIBuilder = function() {
+		return FEBuilder.apply(this, arguments);
+	};
+
+	KPIBuilder.create = function(oOpaInstance) {
+		return new KPIBuilder(oOpaInstance);
+	};
+
+	KPIBuilder.prototype = Object.create(FEBuilder.prototype);
+	KPIBuilder.prototype.constructor = KPIBuilder;
+
+	/**
+	 * Checks if a KPI exists with a given label and other optional properties.
+	 *
+	 * @param {string} sKPILabel The label of the new variant
+	 * @param {object} oKPIProperties Additional optional properties on the KPI (status, number, or unit)
+	 * @returns {sap.fe.test.builder.KPIBuilder} This instance
+	 * @public
+	 * @ui5-restricted
+	 */
+	KPIBuilder.prototype.checkKPI = function(sKPILabel, oKPIProperties) {
+		var oTagProperties = { text: sKPILabel };
+
+		if (oKPIProperties && oKPIProperties.status) {
+			oTagProperties.status = oKPIProperties.status;
+		}
+
+		var retValue = this.hasType("sap.m.GenericTag").hasProperties(oTagProperties);
+
+		if (oKPIProperties && (oKPIProperties.number || oKPIProperties.unit)) {
+			var oNumberProperties = {};
+			if (oKPIProperties.number) {
+				oNumberProperties.number = oKPIProperties.number;
+			}
+			if (oKPIProperties.unit) {
+				oNumberProperties.unit = oKPIProperties.unit;
+			}
+			retValue = retValue.hasChildren(
+				FEBuilder.create(this)
+					.hasType("sap.m.ObjectNumber")
+					.hasProperties(oNumberProperties)
+			);
+		}
+		return retValue;
+	};
+
+	return KPIBuilder;
+});

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

@@ -571,11 +571,24 @@ sap.ui.define(
 		};
 
 		TableBuilder.prototype.hasColumnSorting = function() {
-			return _createTableInternalButtonBuilder(this, "sort", false);
+			return _createTableInternalButtonBuilder(this, "settings", false);
 		};
 
 		TableBuilder.prototype.doOpenColumnSorting = function() {
-			return _createTableInternalButtonBuilder(this, "sort", OpaBuilder.Actions.press());
+			return _createTableInternalButtonBuilder(this, "settings", OpaBuilder.Actions.press()).success(
+				OpaBuilder.create(this.getOpaInstance())
+					.isDialogElement()
+					.hasType("sap.m.IconTabBar")
+					.has(
+						OpaBuilder.Matchers.aggregation(
+							"items",
+							OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.TAB_Sort")
+						)
+					)
+					.has(FEBuilder.Matchers.singleElement())
+					.doPress()
+					.description("Selecting Icon Tab Sort")
+			);
 		};
 
 		TableBuilder.prototype.hasColumnFiltering = function() {
@@ -583,7 +596,20 @@ sap.ui.define(
 		};
 
 		TableBuilder.prototype.doOpenColumnFiltering = function() {
-			return _createTableInternalButtonBuilder(this, "filter", OpaBuilder.Actions.press());
+			return _createTableInternalButtonBuilder(this, "settings", OpaBuilder.Actions.press()).success(
+				OpaBuilder.create(this.getOpaInstance())
+					.isDialogElement()
+					.hasType("sap.m.IconTabBar")
+					.has(
+						OpaBuilder.Matchers.aggregation(
+							"items",
+							OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.TAB_Filter")
+						)
+					)
+					.has(FEBuilder.Matchers.singleElement())
+					.doPress()
+					.description("Selecting Icon Tab Filter")
+			);
 		};
 
 		TableBuilder.prototype.hasColumnExport = function() {
@@ -603,18 +629,28 @@ sap.ui.define(
 		TableBuilder.createAdaptationDialogBuilder = function(oOpaInstance) {
 			return DialogBuilder.create(oOpaInstance).hasSome(
 				OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "table.SETTINGS_COLUMN"),
-				OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "p13nDialog.VIEW_SETTINGS") // new adaptation dialog title (sap-ui-xx-mdcTableP13n=true or for RTA)
+				OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "p13nDialog.VIEW_SETTINGS")
 			);
 		};
 
 		TableBuilder.createSortingDialogBuilder = function(oOpaInstance) {
-			return DialogBuilder.create(oOpaInstance).has(OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "table.SETTINGS_SORT"));
+			return DialogBuilder.create(oOpaInstance)
+				.has(OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "p13nDialog.VIEW_SETTINGS"))
+				.hasChildren(
+					OpaBuilder.create(oOpaInstance)
+						.hasType("sap.m.IconTabFilter")
+						.has(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.TAB_Sort"))
+				);
 		};
 
 		TableBuilder.createFilteringDialogBuilder = function(oOpaInstance) {
-			return DialogBuilder.create(oOpaInstance).has(
-				OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "filter.PERSONALIZATION_DIALOG_TITLE")
-			);
+			return DialogBuilder.create(oOpaInstance)
+				.has(OpaBuilder.Matchers.resourceBundle("title", "sap.ui.mdc", "p13nDialog.VIEW_SETTINGS"))
+				.hasChildren(
+					OpaBuilder.create(oOpaInstance)
+						.hasType("sap.m.IconTabFilter")
+						.has(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.TAB_Filter"))
+				);
 		};
 
 		TableBuilder.Cell = {
@@ -835,6 +871,21 @@ sap.ui.define(
 									? oCellControl.getContentDisplay()
 									: oCellControl.getContentEdit()[0];
 						}
+						if (oCellControl.isA("sap.m.VBox")) {
+							oCellControl =
+								oCellControl
+									.getItems()[0]
+									.getContent()
+									.getEditMode() === "Display"
+									? oCellControl
+											.getItems()[0]
+											.getContent()
+											.getContentDisplay()
+									: oCellControl
+											.getItems()[0]
+											.getContent()
+											.getContentEdit()[0];
+						}
 						if (oCellControl.isA("sap.fe.core.controls.ConditionalWrapper")) {
 							oCellControl = oCellControl.getCondition() ? oCellControl.getContentTrue() : oCellControl.getContentFalse();
 						}

package/src/sap/fe/test/internal/FEJourneyRunner.js

@@ -17,7 +17,9 @@ sap.ui.define(["sap/fe/test/JourneyRunner", "sap/fe/test/Utils", "./FEArrangemen
 
 	var DEFAULT_RUNNER = new FERunner({
 		launchUrl: "test-resources/sap/fe/templates/internal/demokit/flpSandbox.html",
-		launchParameters: {},
+		launchParameters: {
+			"sap-ui-xx-mdcTableP13n": true
+		},
 		opaConfig: {
 			frameWidth: 1300,
 			frameHeight: 1024
@@ -25,7 +27,9 @@ sap.ui.define(["sap/fe/test/JourneyRunner", "sap/fe/test/Utils", "./FEArrangemen
 	});
 	var WIDE_RUNNER = new FERunner({
 		launchUrl: "test-resources/sap/fe/templates/internal/demokit/flpSandbox.html",
-		launchParameters: {},
+		launchParameters: {
+			"sap-ui-xx-mdcTableP13n": true
+		},
 		opaConfig: {
 			frameWidth: 1700,
 			frameHeight: 1024
@@ -33,7 +37,9 @@ sap.ui.define(["sap/fe/test/JourneyRunner", "sap/fe/test/Utils", "./FEArrangemen
 	});
 	var FCL_RUNNER = new FERunner({
 		launchUrl: "test-resources/sap/fe/templates/internal/demokit/flpSandbox.html",
-		launchParameters: {},
+		launchParameters: {
+			"sap-ui-xx-mdcTableP13n": true
+		},
 		opaConfig: {
 			frameWidth: 1900,
 			frameHeight: 1440

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

@@ -27,7 +27,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.92.0",
+			version: "1.93.3",
 			noLibraryCSS: true
 		});
 

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

@@ -8,7 +8,7 @@ sap.ui.define(
 		"use strict";
 
 		var MassEditRuntime = {
-			handleMassEditChange: function(oSource, value) {
+			handleMassEditChange: function(oSource, value, bValidationCase) {
 				var oDialog =
 					oSource &&
 					oSource
@@ -20,6 +20,20 @@ sap.ui.define(
 					keyValue: oSource.getId().substring(oSource.getId().lastIndexOf(":") + 1),
 					value: value
 				};
+				if (!value && bValidationCase) {
+					// var oSourceControl = sap.ui.getCore().byId(sUnitId);
+					oSource.setValueState("Error");
+					oSource.setValueStateText("Please enter a value");
+					oDataObject = {
+						control: oSource,
+						valueState: "Error",
+						valueStateText: "Please enter a value",
+						validationError: true
+					};
+				} else {
+					oSource.setValueState("None");
+					oSource.setValueStateText(null);
+				}
 				oFieldsInfoData.results.push(oDataObject);
 			}
 		};