@sapui5/sap.fe.test 1.109.0 → 1.110.1

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

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	[
@@ -15,7 +16,8 @@ sap.ui.define(
 		"sap/fe/test/api/APIHelper",
 		"sap/ui/test/matchers/Interactable",
 		"sap/ui/core/SortOrder",
-		"sap/ui/test/actions/EnterText"
+		"sap/ui/test/actions/EnterText",
+		"sap/ui/core/Core"
 	],
 	function (
 		Opa5,
@@ -28,10 +30,13 @@ sap.ui.define(
 		APIHelper,
 		Interactable,
 		SortOrder,
-		EnterText
+		EnterText,
+		Core
 	) {
 		"use strict";
 
+		var oSAPMResourceBundle = Core.getLibraryResourceBundle("sap.m");
+
 		// depending on the sap.ui.table creates now extra request which are not optimal for test execution
 		var RowActionType = {
 			/**
@@ -272,6 +277,15 @@ sap.ui.define(
 			);
 		}
 
+		function _getColumnContextToggleBuilder(ToggleButtonLabel, ToggleType) {
+			return OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.ToggleButton")
+				.hasProperties({ text: ToggleButtonLabel })
+				.doPress()
+				.description(Utils.formatMessage(ToggleType + " column '{0}'", ToggleButtonLabel));
+		}
+
 		TableBuilder.create = function (oOpaInstance) {
 			return new TableBuilder(oOpaInstance);
 		};
@@ -432,35 +446,126 @@ sap.ui.define(
 			return this.has(TableBuilder.Matchers.columnControl(vColumn)).has(FEBuilder.Matchers.singleElement()).doPress();
 		};
 
-		TableBuilder.prototype.doColumnHeaderAction = function (vColumn, sActionIconName, sFieldName) {
-			var oSortPopoverBuilder = OpaBuilder.create()
+		TableBuilder.prototype.doColumnHeaderSorting = function (vColumn, sFieldName, sSortOrder, sIcon, bClearFirst) {
+			var SortingIcon = sSortOrder === SortOrder.Ascending ? "sap-icon://sort-ascending" : "sap-icon://sort-descending";
+
+			var TriggerSortOK = OpaBuilder.create()
 				.isDialogElement()
-				.hasType(sFieldName ? "sap.m.ToggleButton" : "sap.m.Button")
-				.hasProperties({ icon: sActionIconName })
-				.doPress();
+				.hasType("sap.m.Button")
+				.hasProperties({ text: "OK" })
+				.doPress()
+				.description("Confirming the Sorting dialog");
 
-			if (sFieldName) {
-				oSortPopoverBuilder.success(
-					OpaBuilder.create().isDialogElement().hasType("sap.m.StandardListItem").hasProperties({ title: sFieldName }).doPress()
-				);
-			}
-			return this.doPressColumnHeader(vColumn).success(oSortPopoverBuilder);
-		};
+			// Builder to clear existing sorting entries
+			var DeclineSortingBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.Button")
+				.hasProperties({ icon: "sap-icon://decline" })
+				.doPress()
+				.description("Removing all previous sortings");
 
-		TableBuilder.prototype.doSortByColumn = function (vColumn, sFieldName, bDescending) {
-			var sIcon = "sap-icon://sort-ascending";
-			if (bDescending) {
-				sIcon = "sap-icon://sort-descending";
-			}
-			return this.doColumnHeaderAction(vColumn, sIcon, sFieldName);
+			// Builder to check for a specific sorting entry
+			var CheckSortingFieldBuilder = OpaBuilder.create(this)
+				.isDialogElement()
+				.hasType("sap.m.ComboBox")
+				.hasProperties({ value: sFieldName });
+
+			// Builder for changing existing sorting entries
+			var ExistingSortingFieldBuilder = OpaBuilder.create(this)
+				.isDialogElement()
+				.hasType("sap.m.CustomListItem")
+				.hasChildren(OpaBuilder.create(this).hasType("sap.m.ComboBox").hasProperties({ value: sFieldName }))
+				.doOnChildren(OpaBuilder.create(this).hasType("sap.m.Button").hasProperties({ icon: SortingIcon }).doPress())
+				.description(Utils.formatMessage("Change existing sorting field '{0}': {1}", sFieldName, sSortOrder))
+				.success(TriggerSortOK);
+
+			// Builder for new sorting entries
+			var NewSortingFieldBuilder = OpaBuilder.create(this)
+				.isDialogElement()
+				.hasType("sap.m.CustomListItem")
+				.hasChildren(
+					OpaBuilder.create(this).hasType("sap.m.ComboBox").hasProperties({ placeholder: "Sort by" }).hasProperties({ value: "" })
+				)
+				.doOnChildren(
+					OpaBuilder.create(this)
+						.hasType("sap.m.ComboBox")
+						.hasProperties({ placeholder: "Sort by" })
+						.hasProperties({ value: "" })
+						.doEnterText(sFieldName, true, false, true)
+				)
+				.doOnChildren(OpaBuilder.create(this).hasType("sap.m.Button").hasProperties({ icon: SortingIcon }).doPress())
+				.description(Utils.formatMessage("Insert new sorting field '{0}': {1}", sFieldName, sSortOrder))
+				.success(TriggerSortOK);
+
+			// Builder to distinguish between inserting a new entry or changing an existing entry
+			var CheckSortingPanelBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.p13n.SortPanel")
+				.do(function () {
+					if (bClearFirst) {
+						DeclineSortingBuilder.execute();
+					}
+					if (!FEBuilder.controlsExist(CheckSortingFieldBuilder) || bClearFirst) {
+						return NewSortingFieldBuilder.execute();
+					} else {
+						return ExistingSortingFieldBuilder.execute();
+					}
+				});
+
+			// Opens the Sorting panel within the table column header context menu
+			var TriggerSortingPanelBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.StandardListItem")
+				.hasProperties({ icon: sIcon })
+				.doPress()
+				.description("Opening the Sorting dialog")
+				.success(CheckSortingPanelBuilder);
+
+			// Triggers the sorting by using the toggle buttons on the context menu
+			var TriggerToggleBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.ToggleButton")
+				.hasProperties({ text: sSortOrder })
+				.has(function (oButton) {
+					if (typeof oButton.getParent().getLabel === "function") {
+						return (
+							oButton.getParent().getLabel() ===
+							Utils.formatMessage(oSAPMResourceBundle.getText("table.COLUMNMENU_QUICK_SORT"), sFieldName)
+						);
+					}
+					return false;
+				})
+				.doPress()
+				.description(Utils.formatMessage("Sorting column '{0}': {1}", vColumn, sSortOrder));
+
+			// return this.doPressColumnHeader(vColumn).success(!sFieldName ? TriggerToggleBuilder : TriggerSortingPanelBuilder);
+			return this.doPressColumnHeader(vColumn).success(bClearFirst ? TriggerToggleBuilder : TriggerSortingPanelBuilder);
 		};
+		TableBuilder.prototype.doSortByColumn = function (vColumn, sFieldName, sSortOrder, bClearFirst) {
+			var sIcon = "sap-icon://sort";
+			return this.doColumnHeaderSorting(vColumn, sFieldName, sSortOrder, sIcon, bClearFirst);
+		};
+
+		TableBuilder.prototype.doColumnHeaderGrouping = function (vColumn, sFieldName) {
+			var sGroupingField = !sFieldName ? vColumn : sFieldName,
+				// Triggers the grouping by using the toggle buttons on the context menu
+				TriggerToggleBuilder = _getColumnContextToggleBuilder(sGroupingField, "Grouping");
 
+			return this.doPressColumnHeader(vColumn).success(TriggerToggleBuilder);
+		};
 		TableBuilder.prototype.doGroupByColumn = function (vColumn, sFieldName) {
-			return this.doColumnHeaderAction(vColumn, "sap-icon://group-2", sFieldName);
+			return this.doColumnHeaderGrouping(vColumn, sFieldName);
 		};
 
+		TableBuilder.prototype.doColumnHeaderAggregating = function (vColumn, sFieldName) {
+			var sAggregationField = !sFieldName ? vColumn : sFieldName,
+				// Triggers the grouping by using the toggle buttons on the context menu
+				TriggerToggleBuilder = _getColumnContextToggleBuilder(sAggregationField, "Aggregating");
+
+			return this.doPressColumnHeader(vColumn).success(TriggerToggleBuilder);
+		};
 		TableBuilder.prototype.doAggregateByColumn = function (vColumn, sFieldName) {
-			return this.doColumnHeaderAction(vColumn, "sap-icon://sum", sFieldName);
+			return this.doColumnHeaderAggregating(vColumn, sFieldName);
 		};
 
 		TableBuilder.prototype.doChangeSearch = function (sSearchText) {
@@ -483,81 +588,67 @@ sap.ui.define(
 			return this.doOpenOverflow().success(oSuccessBuilder);
 		};
 
-		TableBuilder.prototype.checkColumnHeaderAction = function (vColumn, sActionIconName, sFieldName, iExpectedNumber) {
-			var oHeaderPopoverBuilder;
-
-			if (!sFieldName) {
-				if (iExpectedNumber === undefined) {
-					// We just check if there's a button for the action in the header
-					oHeaderPopoverBuilder = OpaBuilder.create()
-						.isDialogElement()
-						.hasProperties({ icon: sActionIconName })
-						.checkNumberOfMatches(1);
-				} else if (iExpectedNumber === 1) {
-					// Only 1 action expected --> we check that this is a simple button (no sub-menu)
-					oHeaderPopoverBuilder = OpaBuilder.create()
-						.isDialogElement()
-						.hasType("sap.m.Button")
-						.hasProperties({ icon: sActionIconName })
-						.checkNumberOfMatches(1);
-				} else {
-					// More than 1 action --> check the number of items in the sub-menu
-					oHeaderPopoverBuilder = OpaBuilder.create()
-						.isDialogElement()
-						.hasType("sap.m.ToggleButton")
-						.hasProperties({ icon: sActionIconName })
-						.doPress();
-
-					oHeaderPopoverBuilder.success(
-						OpaBuilder.create()
-							.isDialogElement()
-							.hasType("sap.m.StandardListItem")
-							.checkNumberOfMatches(iExpectedNumber)
-							.success(
-								OpaBuilder.create()
-									.isDialogElement()
-									.hasType("sap.m.Button")
-									.hasProperties({ icon: "sap-icon://decline" })
-									.doPress()
-							)
-					);
-				}
-			} else {
-				if (iExpectedNumber === undefined) {
-					iExpectedNumber = 1;
-				}
+		TableBuilder.prototype.checkColumnHeaderAction = function (vColumn, sActionIconName, sFieldName, iExpectedNumber, sGroupTotals) {
+			var TriggerGroupingCancel = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.Button")
+				.hasProperties({ text: "Cancel" })
+				.doPress()
+				.description("Cancelling the dialog");
 
-				oHeaderPopoverBuilder = OpaBuilder.create()
-					.isDialogElement()
-					.hasType("sap.m.ToggleButton")
-					.hasProperties({ icon: sActionIconName })
-					.doPress();
-
-				oHeaderPopoverBuilder.success(
-					OpaBuilder.create()
-						.isDialogElement()
-						.hasType("sap.m.StandardListItem")
-						.hasProperties({ title: sFieldName })
-						.checkNumberOfMatches(iExpectedNumber)
-						.success(
-							OpaBuilder.create()
-								.isDialogElement()
-								.hasType("sap.m.Button")
-								.hasProperties({ icon: "sap-icon://decline" })
-								.doPress()
-						)
-				);
-			}
+			// Opens the Grouping panel within the table column header context menu to successfully leave the context dialog with cancel button
+			var TriggerGroupingPanelBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.StandardListItem")
+				.hasProperties({ icon: sActionIconName })
+				.doPress()
+				.success(TriggerGroupingCancel);
 
-			return this.doPressColumnHeader(vColumn).success(oHeaderPopoverBuilder);
-		};
+			var CheckMultipleGroupingBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.ToggleButton")
+				.has(function (oButton) {
+					if (typeof oButton.getParent().getLabel === "function") {
+						return oButton.getParent().getLabel() === sGroupTotals;
+					}
+					return false;
+				})
+				.checkNumberOfMatches(iExpectedNumber)
+				.success(TriggerGroupingPanelBuilder);
 
+			var CheckSingleGroupingBuilder = OpaBuilder.create()
+				.isDialogElement()
+				.hasType("sap.m.ToggleButton")
+				.hasProperties({ text: sFieldName })
+				.has(function (oButton) {
+					if (typeof oButton.getParent().getLabel === "function") {
+						return oButton.getParent().getLabel() === sGroupTotals;
+					}
+					return false;
+				})
+				.checkNumberOfMatches(iExpectedNumber)
+				.success(TriggerGroupingPanelBuilder);
+
+			return this.doPressColumnHeader(vColumn).success(sFieldName ? CheckSingleGroupingBuilder : CheckMultipleGroupingBuilder);
+		};
 		TableBuilder.prototype.hasGroupByColumn = function (vColumn, sFieldName, iExpectedNumber) {
-			return this.checkColumnHeaderAction(vColumn, "sap-icon://group-2", sFieldName, iExpectedNumber);
+			return this.checkColumnHeaderAction(
+				vColumn,
+				"sap-icon://group-2",
+				sFieldName,
+				iExpectedNumber,
+				oSAPMResourceBundle.getText("table.COLUMNMENU_QUICK_GROUP")
+			);
 		};
 
 		TableBuilder.prototype.hasAggregationColumn = function (vColumn, sFieldName, iExpectedNumber) {
-			return this.checkColumnHeaderAction(vColumn, "sap-icon://sum", sFieldName, iExpectedNumber);
+			return this.checkColumnHeaderAction(
+				vColumn,
+				"sap-icon://table-column",
+				sFieldName,
+				iExpectedNumber,
+				oSAPMResourceBundle.getText("table.COLUMNMENU_QUICK_TOTAL")
+			);
 		};
 
 		TableBuilder.prototype.doExpand = function (vRowMatcher) {
@@ -927,7 +1018,7 @@ sap.ui.define(
 						})
 					);
 				},
-				emptyCell: function (sColumnName) {
+				hiddenCell: function (sColumnName) {
 					return function (oRow) {
 						var oCellField = TableBuilder.Row.Matchers.cell(sColumnName)(oRow);
 						while (oCellField.isA("sap.fe.macros.MacroAPI")) {
@@ -937,13 +1028,13 @@ sap.ui.define(
 						return MacroFieldBuilder.Matchers.empty(oCellField);
 					};
 				},
-				emptyCells: function (vColumn) {
+				hiddenCells: function (vColumn) {
 					if (!vColumn || vColumn.length === 0) {
 						return OpaBuilder.Matchers.TRUE;
 					}
 					return FEBuilder.Matchers.match(
 						vColumn.map(function (sColumnName) {
-							return TableBuilder.Row.Matchers.emptyCell(sColumnName);
+							return TableBuilder.Row.Matchers.hiddenCell(sColumnName);
 						})
 					);
 				},

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

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+	
  */
 sap.ui.define(
 	["sap/ui/test/OpaBuilder", "./FEBuilder", "sap/fe/test/Utils", "sap/ui/test/matchers/Interactable"],

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

@@ -1,7 +1,8 @@
 /*
- * ! SAP UI development toolkit for HTML5 (SAPUI5)
+ * ! 
+		SAP UI development toolkit for HTML5 (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";