@openui5/sap.ui.mdc 1.96.5 → 1.99.0

package/test/sap/ui/mdc/testutils/opa/p13n/Actions.js

@@ -16,7 +16,8 @@ sap.ui.define([
 	"./waitForSelectWithSelectedTextOnPanel",
 	"./Util",
 	"sap/base/Log",
-	"sap/base/util/UriParameters"
+	"sap/base/util/UriParameters",
+	"sap/ui/core/Core"
 ], function(
 	Opa5,
 	Matcher,
@@ -31,11 +32,12 @@ sap.ui.define([
 	waitForSelectWithSelectedTextOnPanel,
 	Util,
 	Log,
-	UriParameters
+	UriParameters,
+	oCore
 ) {
 	"use strict";
 
-	var oMDCBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+	var oMDCBundle = oCore.getLibraryResourceBundle("sap.ui.mdc");
 
 	var iOpenThePersonalizationDialog = function(oControl, oSettings) {
 		var sControlId = typeof oControl === "string" ? oControl : oControl.getId();
@@ -46,51 +48,88 @@ sap.ui.define([
 			success: function(oControlInstance) {
 				Opa5.assert.ok(oControlInstance);
 
-				aButtonMatchers.push(new Ancestor(oControlInstance));
+				if (oControlInstance.isA("sap.m.Link")) {
+					// mdc.Link handling
 
-				if (oControlInstance.isA("sap.ui.comp.smartchart.SmartChart")) {
-					aDialogMatchers.push(function(oP13nDialog) {
-						return oP13nDialog.getParent().getChart() === oControlInstance.getChart().getId();
+					new Press().executeOn(oControlInstance);
+					this.waitFor({
+						controlType: "sap.ui.mdc.link.Panel",
+						success: function(aPanels) {
+							Opa5.assert.equal(aPanels.length, 1, "mdc.link.Panel found");
+							var oPanel = aPanels[0];
+
+							waitForP13nButtonWithMatchers.call(this, {
+								actions: new Press(),
+								matchers: [
+									new Ancestor(oPanel, false),
+									new PropertyStrictEquals({
+										name: "text",
+										value: oMDCBundle.getText("info.POPOVER_DEFINE_LINKS")
+									})
+								],
+								success: function() {
+									waitForP13nDialog.call(this, {
+										matchers: new PropertyStrictEquals({
+											name: "title",
+											value: oMDCBundle.getText("info.SELECTION_DIALOG_ALIGNEDTITLE")
+										}),
+										success:  function(oP13nDialog) {
+											if (oSettings && typeof oSettings.success === "function") {
+												oSettings.success.call(this, oP13nDialog);
+											}
+										}
+									});
+								}
+							});
+						}
 					});
 				} else {
-					aDialogMatchers.push(new Ancestor(oControlInstance, false));
-				}
+					aButtonMatchers.push(new Ancestor(oControlInstance));
 
-				if (oControlInstance.isA("sap.ui.mdc.FilterBar")) {
-					// Add matcher for p13n button text
-					var oMatcher = new Matcher();
-					oMatcher.isMatching = function(oButton) {
-						return oButton.getText().includes(oMDCBundle.getText("filterbar.ADAPT"));
-					};
-					aButtonMatchers.push(oMatcher);
-					aDialogMatchers.push(new Properties({
-						title: oMDCBundle.getText("filterbar.ADAPT_TITLE")
-					}));
-				} else {
-					// Add matcher for p13n button icon
-					aButtonMatchers.push(new Properties({
-						icon: Util.icons.settings
-					}));
-					aDialogMatchers.push(new Properties({
-						title: oMDCBundle.getText("p13nDialog.VIEW_SETTINGS")
-					}));
-				}
+					if (oControlInstance.isA("sap.ui.comp.smartchart.SmartChart")) {
+						aDialogMatchers.push(function(oP13nDialog) {
+							return oP13nDialog.getParent().getChart() === oControlInstance.getChart().getId();
+						});
+					} else {
+						aDialogMatchers.push(new Ancestor(oControlInstance, false));
+					}
 
-				waitForP13nButtonWithMatchers.call(this, {
-					actions: new Press(),
-					matchers: aButtonMatchers,
-					success: function() {
-						waitForP13nDialog.call(this, {
-							matchers: aDialogMatchers,
-							success:  function(oP13nDialog) {
-								if (oSettings && typeof oSettings.success === "function") {
-									oSettings.success.call(this, oP13nDialog);
+					if (oControlInstance.isA("sap.ui.mdc.FilterBar")) {
+						// Add matcher for p13n button text
+						var oMatcher = new Matcher();
+						oMatcher.isMatching = function(oButton) {
+							return oButton.getText().includes(oMDCBundle.getText("filterbar.ADAPT"));
+						};
+						aButtonMatchers.push(oMatcher);
+						aDialogMatchers.push(new Properties({
+							title: oMDCBundle.getText("filterbar.ADAPT_TITLE")
+						}));
+					} else {
+						// Add matcher for p13n button icon
+						aButtonMatchers.push(new Properties({
+							icon: Util.icons.settings
+						}));
+						aDialogMatchers.push(new Properties({
+							title: oMDCBundle.getText("p13nDialog.VIEW_SETTINGS")
+						}));
+					}
+
+					waitForP13nButtonWithMatchers.call(this, {
+						actions: new Press(),
+						matchers: aButtonMatchers,
+						success: function() {
+							waitForP13nDialog.call(this, {
+								matchers: aDialogMatchers,
+								success:  function(oP13nDialog) {
+									if (oSettings && typeof oSettings.success === "function") {
+										oSettings.success.call(this, oP13nDialog);
+									}
 								}
-							}
-						});
-					},
-					errorMessage: "Control '" + sControlId + "' has no P13n button"
-				});
+							});
+						},
+						errorMessage: "Control '" + sControlId + "' has no P13n button"
+					});
+				}
 			},
 			errorMessage: "Control '" + sControlId + "' not found."
 		});
@@ -456,7 +495,7 @@ sap.ui.define([
 
 	var iPersonalizeListViewItems = function(oP13nDialog, aItems) {
 		this.waitFor({
-			controlType: oP13nDialog.getContent()[0].getView("columns") ? "sap.ui.mdc.p13n.panels.ListView" : "sap.m.p13n.SelectionPanel",
+			controlType: oP13nDialog.getContent()[0].getView("columns") && oP13nDialog.getContent()[0].getView("columns").getContent().isA("sap.ui.mdc.p13n.panels.ListView") ? "sap.ui.mdc.p13n.panels.ListView" : "sap.m.p13n.SelectionPanel",
 			matchers: new Ancestor(oP13nDialog, false),
 			success: function(aListViews) {
 				var oListView = aListViews[0];
@@ -611,26 +650,120 @@ sap.ui.define([
 		});
 	};
 
-    return {
+	var iPersonalizeOldChartP13n = function(oControl, sChartType, aItems, oP13nDialog) {
+		this.waitFor({
+			controlType: "sap.m.P13nDimMeasurePanel",
+			matchers: new Ancestor(oP13nDialog, false),
+			success: function(aP13nDimMeasurePanels) {
+				var oP13nDimMeasurePanel = aP13nDimMeasurePanels[0];
+				this.waitFor({
+				controlType: "sap.m.OverflowToolbar",
+				matchers: new Ancestor(oP13nDimMeasurePanel, false),
+				success: function(aOverflowToolbars) {
+					var oOverflowToolbar = aOverflowToolbars[0];
+					this.waitFor({
+						controlType: "sap.m.ComboBox",
+						matchers: new Ancestor(oOverflowToolbar),
+						success: function(aComboBoxes) {
+							var oComboBox = aComboBoxes[0];
+							iChangeComboBoxSelection.call(this, oComboBox, sChartType, {
+								success: function() {
+									this.waitFor({
+										controlType: "sap.m.ColumnListItem",
+										matchers: [
+											new Ancestor(oP13nDialog, false)
+										],
+										actions: function(oColumnListItem) {
+											this.waitFor({
+												controlType: "sap.m.Text",
+												matchers: new Ancestor(oColumnListItem),
+												success: function(aTexts) {
+													var oText = aTexts[0];
+													var oItem = aItems.find(function(oItem) {
+														return oText.getText() === oItem.key;
+													});
+													var bItemIsPresent = !!oItem;
+
+													this.waitFor({
+														controlType: "sap.m.CheckBox",
+														matchers: new Ancestor(oColumnListItem),
+														actions: function(oCheckBox) {
+															if ((!oCheckBox.getSelected() && bItemIsPresent) ||
+																(oCheckBox.getSelected() && !bItemIsPresent)) {
+																new Press().executeOn(oCheckBox);
+															}
+														},
+														success: function() {
+															if (bItemIsPresent) {
+																this.waitFor({
+																	controlType: "sap.m.Select",
+																	matchers: new Ancestor(oColumnListItem),
+																	actions: function(oSelect) {
+																		iChangeSelectSelection.call(this, oSelect, oItem.role);
+																	}.bind(this)
+																});
+															}
+														}
+													});
+												}
+											});
+										}.bind(this),
+										success: function() {
+											iPressTheOKButtonOnTheDialog.call(this,oP13nDialog);
+										}
+									});
+								}
+							});
+						}
+					});
+				}
+				});
+			}
+		});
+	};
+
+	return {
 		iPressTheOKButtonOnTheDialog: function(oDialog, oSettings) {
 			return iPressTheOKButtonOnTheDialog.call(this, oDialog, oSettings);
 		},
 		iOpenThePersonalizationDialog: function(oControl, oSettings) {
 			return iOpenThePersonalizationDialog.call(this, oControl, oSettings);
 		},
+		/**
+		 * @typedef {object} ChartPersonalizationConfiguration
+		 * @property {string} key Key of the value that is the result of the personalization
+		 * @property {string} role Role of the given value
+		 */
+		/**
+		 * OPA5 test action
+		 * 1. Opens the personalization dialog of a given chart.
+		 * 2. Selects a chart type given by <code>sChartType</code>.
+		 * 3. Executes the given <code>ChartPersonalizationConfiguration</code>.
+		 * 4. Closes the personalization dialog.
+		 * @param {sap.ui.core.Control | string} oChart Instance / ID of the <code>SmartChart</code> that is personalized
+		 * @param {string} sChartType String containing the type of chart that is displayed
+		 * @param {ChartPersonalizationConfiguration[]} aConfigurations Array containing the chart personalization configuration objects
+		 * @returns {Promise} OPA waitFor
+		 */
 		iPersonalizeChart: function(oControl, sChartType, aItems) {
 			return iPersonalize.call(this, oControl, Util.texts.chart, {
 				success: function(oP13nDialog) {
 
-					if (UriParameters.fromQuery(window.location.search).get("newChartP13n") === "true") {
-
+					//oP13nDialog.getContent()[0].getView("item") && oP13nDialog.getContent()[0].getView("item").getContent().isA("sap.ui.mdc.p13n.panels.ListView")
+					if (oP13nDialog.getContent()[0].getView("dimeasure").getContent().isA("sap.m.P13nDimMeasurePanel")){
+						iPersonalizeOldChartP13n.call(this, oControl, sChartType, aItems, oP13nDialog);
+					} else {
 						this.waitFor({
-							controlType: "sap.ui.mdc.p13n.panels.ChartItemPanelNew",
+							controlType: "sap.ui.mdc.p13n.panels.ChartItemPanel",
 							matchers: new Ancestor(oP13nDialog, false),
-							success: function() {
-								// Setup chart type
+							success: function(aItemPanels) {
+								//This is done in 3 steps
+								//1. Remove current selection
+								//2. Add items in order
+								//3. Select correct roles
+
 								var aItemsToRemoveIds = [];
-								var aItemsAlreadyPresent = [];
+								var oItemPanel = aItemPanels[0];
 
 								this.waitFor({
 
@@ -639,196 +772,128 @@ sap.ui.define([
 										new Ancestor(oP13nDialog, false)
 									],
 									actions: function(oColumnListItem) {
-										this.waitFor({
-											controlType: "sap.m.ComboBox",
-											matchers: new Ancestor(oColumnListItem),
-											success: function(aComboBoxes) {
-												var oComboBox = aComboBoxes[0];
-												var oItem = aItems.find(function(oItem) {
-													return oComboBox.getSelectedKey() === oItem.key;
-												});
-												var bItemIsPresent = !!oItem;
-
-												//Remove if not selected
-												if (!bItemIsPresent) {
-
-													//Template has only one cell (no role & remove)
-													var  bTemplate = oColumnListItem.getCells().length === 1;
-
-													if (!bTemplate){
-														this.waitFor({
-															controlType: "sap.m.Button",
-															matchers: new Ancestor(oColumnListItem, false),
-															actions: function(oBtn) {
-																aItemsToRemoveIds.push(oBtn.getId());
-															}
-														});
-													}
-												} else {
-													aItemsAlreadyPresent.push(oComboBox.getSelectedKey());
-												}
-											}
-										});
-									}.bind(this),
-									success: function() {
-
-										aItemsToRemoveIds.forEach(function(oBtnId){
+										//Step 1.1: Find all remove buttons
+										var  bTemplate = oColumnListItem.getCells().length === 1;
 
+										if (!bTemplate){
 											this.waitFor({
-
 												controlType: "sap.m.Button",
 												matchers: [
-													new Ancestor(oP13nDialog, false),
+													new Ancestor(oColumnListItem),
 													new Properties({
-														id: oBtnId
+														icon: "sap-icon://decline"
 													})
 												],
 												success: function(aBtns) {
-													new Press().executeOn(aBtns[0]);
+													var oButton = aBtns[0];
+													aItemsToRemoveIds.push(oButton.getId());
 												}
 											});
+										}
+									}.bind(this),
+									success: function() {
 
-										}.bind(this));
+										var iClickOnChartP13nRemoveButton = function(sCurrentBtnId, oP13nDialog, aBtnIds, fnFollowUpFunction, aFollowUpParams){
+											this.waitFor({
 
-										var aItemsToAdd = aItems.filter(function(oItem){return aItemsAlreadyPresent.indexOf(oItem.key) === -1;});
+												controlType: "sap.m.Button",
+												id: sCurrentBtnId,
+												matchers: [
+													new Ancestor(oP13nDialog, false)
+												],
+												success: function(oBtn) {
+													new Press().executeOn(oBtn);
+
+													var iIdx = aBtnIds.indexOf(sCurrentBtnId);
 
-										aItemsToAdd.forEach(function(oItem) {
+													if (iIdx === aBtnIds.length - 1){
+														fnFollowUpFunction.apply(this, aFollowUpParams);
+													} else {
+														iClickOnChartP13nRemoveButton.call(this, aBtnIds[iIdx + 1], oP13nDialog, aBtnIds, fnFollowUpFunction, aFollowUpParams);
+													}
+												}
+											});
+										};
 
-											if (oItem.kind) {
+										var fnAddAllItems = function(oCurrentItem, aItems, fnFollowUp){
+											if (oCurrentItem.kind) {
 												this.waitFor({
 													controlType: "sap.m.ComboBox",
-													matchers: [
-														new Ancestor(oP13nDialog, false),
-														new Properties({
-															id: "p13nPanel-templateComboBox-" + oItem.kind
-														})
-													],
+													id: "p13nPanel-templateComboBox-" + oCurrentItem.kind,
+													matchers: new Ancestor(oP13nDialog, false),
 													actions: function(oComboBox) {
-														iChangeComboBoxSelection.call(this, oComboBox, oItem.key);
-													}.bind(this)
+														iChangeComboBoxSelection.call(this, oComboBox, oCurrentItem.key);
+													}.bind(this),
+													success: function(){
+														var iIdx = aItems.indexOf(oCurrentItem);
+
+														if (iIdx === aItems.length - 1){
+															fnFollowUp.call(this);
+														} else {
+															fnAddAllItems.call(this, aItems[iIdx + 1], aItems, fnFollowUp);
+														}
+													}
 												});
 											} else {
-												Log.error("P13nChartPersonalizationOPA: No kind field given for " + oItem.key + ". Ignoring the field!");
+												Log.error("P13nChartPersonalizationOPA: No kind field given for " + oCurrentItem.key + ". Ignoring the field!");
 											}
+										};
 
+										var fnAssignRoles = function(){
+											this.waitFor({
 
-										}.bind(this));
-
-										//Make sure every new item has the correct role
-										this.waitFor({
-
-											controlType: "sap.m.ColumnListItem",
-											matchers: [
-												new Ancestor(oP13nDialog, false)
-											],
-											actions: function(oColumnListItem) {
-												this.waitFor({
-													controlType: "sap.m.ComboBox",
-													matchers: new Ancestor(oColumnListItem),
-													success: function(aComboBoxes) {
-														var oComboBox = aComboBoxes[0];
-														var oItem = aItems.find(function(oItem) {
-															return oComboBox.getSelectedKey() === oItem.key;
-														});
-														var bItemIsPresent = !!oItem;
+												controlType: "sap.m.ColumnListItem",
+												matchers: [
+													new Ancestor(oP13nDialog, false)
+												],
+												actions: function(oColumnListItem) {
+													this.waitFor({
+														controlType: "sap.m.ComboBox",
+														matchers: new Ancestor(oColumnListItem),
+														success: function(aComboBoxes) {
+															var oComboBox = aComboBoxes[0];
+															var oItem = aItems.find(function(oItem) {
+																return oComboBox.getSelectedKey() === oItem.key;
+															});
+															var bItemIsPresent = !!oItem;
 
-														if (bItemIsPresent) {
+															if (bItemIsPresent) {
 
-															var bMobile = oColumnListItem.getTable().getParent().getParent()._bMobileMode;
-															if (bMobile && oColumnListItem.getCells()[0].getItems[1].getVisible() == false) {
-																return;
-															}
+																//Ignore templates / items with no role select (due to chart type)
+																var bMobile = oItemPanel._bMobileMode;
+																if (bMobile && oColumnListItem.getCells()[0].getItems[1].getVisible() == false) {
+																	return;
+																}
 
 															if (!bMobile && !oColumnListItem.getCells()[1].getVisible()) {
-																return;
-															}
-
-															//Select correct role if selected
-															this.waitFor({
-																controlType: "sap.m.Select",
-																matchers: new Ancestor(oColumnListItem),
-																actions: function(oSelect) {
-																	iChangeSelectSelection.call(this, oSelect, oItem.role);
-																}.bind(this)
-															});
-														}
-													}.bind(this)
-												});
-											}.bind(this)
-										});
-
-										iPressTheOKButtonOnTheDialog.call(this, oP13nDialog);
-									}
-								});
-							}
-						});
-					} else {
-						this.waitFor({
-							controlType: "sap.m.P13nDimMeasurePanel",
-							matchers: new Ancestor(oP13nDialog, false),
-							success: function(aP13nDimMeasurePanels) {
-								var oP13nDimMeasurePanel = aP13nDimMeasurePanels[0];
-								this.waitFor({
-								controlType: "sap.m.OverflowToolbar",
-								matchers: new Ancestor(oP13nDimMeasurePanel, false),
-								success: function(aOverflowToolbars) {
-									var oOverflowToolbar = aOverflowToolbars[0];
-									this.waitFor({
-										controlType: "sap.m.ComboBox",
-										matchers: new Ancestor(oOverflowToolbar),
-										success: function(aComboBoxes) {
-											var oComboBox = aComboBoxes[0];
-											iChangeComboBoxSelection.call(this, oComboBox, sChartType, {
-												success: function() {
-													this.waitFor({
-														controlType: "sap.m.ColumnListItem",
-														matchers: [
-															new Ancestor(oP13nDialog, false)
-														],
-														actions: function(oColumnListItem) {
-															this.waitFor({
-																controlType: "sap.m.Text",
-																matchers: new Ancestor(oColumnListItem),
-																success: function(aTexts) {
-																	var oText = aTexts[0];
-																	var oItem = aItems.find(function(oItem) {
-																		return oText.getText() === oItem.key;
-																	});
-																	var bItemIsPresent = !!oItem;
-
-																	this.waitFor({
-																		controlType: "sap.m.CheckBox",
-																		matchers: new Ancestor(oColumnListItem),
-																		actions: function(oCheckBox) {
-																			if ((!oCheckBox.getSelected() && bItemIsPresent) ||
-																				(oCheckBox.getSelected() && !bItemIsPresent)) {
-																				new Press().executeOn(oCheckBox);
-																			}
-																		},
-																		success: function() {
-																			if (bItemIsPresent) {
-																				this.waitFor({
-																					controlType: "sap.m.Select",
-																					matchers: new Ancestor(oColumnListItem),
-																					actions: function(oSelect) {
-																						iChangeSelectSelection.call(this, oSelect, oItem.role);
-																					}.bind(this)
-																				});
-																			}
-																		}
-																	});
+																	return;
 																}
-															});
-														}.bind(this),
-														success: function() {
-															iPressTheOKButtonOnTheDialog.call(this,oP13nDialog);
-														}
+
+																//Select correct role if selected
+																this.waitFor({
+																	controlType: "sap.m.Select",
+																	matchers: new Ancestor(oColumnListItem),
+																	actions: function(oSelect) {
+																		iChangeSelectSelection.call(this, oSelect, oItem.role);
+																	}.bind(this)
+																});
+															}
+														}.bind(this)
 													});
+												}.bind(this),
+												success: function() {
+													iPressTheOKButtonOnTheDialog.call(this, oP13nDialog);
 												}
 											});
+										};
+
+
+										if (aItemsToRemoveIds.length != 0){
+											iClickOnChartP13nRemoveButton.call(this, aItemsToRemoveIds[0], oP13nDialog, aItemsToRemoveIds, fnAddAllItems, [aItems[0], aItems, fnAssignRoles]);
+										} else {
+											fnAddAllItems.call(this, aItems[0], aItems, fnAssignRoles);
 										}
-									});
-								}
+									}
 								});
 							}
 						});
@@ -837,9 +902,12 @@ sap.ui.define([
 			});
 		},
 		/**
-		 *
+		 * OPA5 test action
+		 * 1. Opens the personalization dialog of a given table.
+		 * 2. Selects all columns determined by the given labels. Also deselects all other columns that are selected but not included in the given labels.
+		 * 3. Closes the personalization dialog.
 		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be personalized
-		 * @param {string[]} aColumns Array containing the keys of the columns that should be result of the personalisation
+		 * @param {string[]} aColumns Array containing the labels of the columns that are the result of the personalization
 		 * @returns {Promise} Opa waitFor
 		 */
 		 iPersonalizeColumns: function(oControl, aColumns) {
@@ -901,18 +969,68 @@ sap.ui.define([
 				}
 			});
 		},
+		/**
+		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be personalized
+		 * @param {string[]} aLinks an array containing the names of the links that should be result of the personalisation
+		 * @returns {Promise} Opa waitFor
+		 */
+		iPersonalizeLink: function(oControl, aLinks) {
+			return iOpenThePersonalizationDialog.call(this, oControl, {
+				success: function(oP13nDialog) {
+					this.waitFor({
+						controlType: "sap.ui.mdc.p13n.panels.LinkSelectionPanel",
+						matchers: new Ancestor(oP13nDialog, false),
+						success: function(aLinkSelectionPanels) {
+							Opa5.assert.equal(aLinkSelectionPanels.length, 1, "sap.ui.mdc.p13n.panels.LinkSelectionPanel found");
+							var oLinkSelectionPanel = aLinkSelectionPanels[0];
+							this.waitFor({
+								controlType: "sap.m.ColumnListItem",
+								matchers: new Ancestor(oLinkSelectionPanel, false),
+								actions: function(oColumnListItem) {
+									this.waitFor({
+										controlType: "sap.m.Link",
+										matchers: new Ancestor(oColumnListItem, false),
+										success: function(aLinkControls) {
+											var oLinkControl = aLinkControls[0];
+											this.waitFor({
+												controlType: "sap.m.CheckBox",
+												matchers: [
+													new Ancestor(oColumnListItem, false)
+												],
+												actions: function(oCheckBox) {
+													if ((!oCheckBox.getSelected() && aLinks.includes(oLinkControl.getText())) ||
+														(oCheckBox.getSelected() && !aLinks.includes(oLinkControl.getText()))) {
+														new Press().executeOn(oCheckBox);
+													}
+												}
+											});
+										}
+									});
+								}.bind(this),
+								success: function() {
+									iPressTheOKButtonOnTheDialog.call(this, oP13nDialog);
+								}
+							});
+						}
+					});
+				}
+			});
+		},
 		/**
 		 * @typedef {object} FilterPersonalizationConfiguration
-		 * @property {string} key of the item that should be result of the personalisation
-		 * @property {string} operator operator in which the items should be filtered
-		 * @property {string[]} values filter values for the given operator
-		 * @property {string} inputControl
+		 * @property {string} key Key of the value that is the result of the personalization
+		 * @property {string} operator Operator defining how the items are filtered
+		 * @property {string[]} values Filter values for the given operator
+		 * @property {string} inputControl <code>Control</code> that is used as input for the value
 		 */
 		/**
-		 *
-		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be reset
-		 * @param {FilterPersonalizationConfiguration[]} aConfigurations an array containing the group personalization configuration objects
-		 * @returns {Promise} Opa waitFor
+		 * OPA5 test action
+		 * 1. Opens the personalization dialog of a given chart.
+		 * 2. Executes the given <code>FilterPersonalizationConfiguration</code>.
+		 * 3. Closes the personalization dialog.
+		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the <code>Control</code> that is filtered
+		 * @param {FilterPersonalizationConfiguration[]} aConfigurations Array containing the filter personalization configuration objects
+		 * @returns {Promise} OPA waitFor
 		 */
 		iPersonalizeFilter: function(oControl, aConfigurations) {
 			return iPersonalize.call(this, oControl, Util.texts.filter, {
@@ -959,11 +1077,14 @@ sap.ui.define([
 		},
 		/**
 		 * @typedef {object} GroupPersonalizationConfiguration
-		 * @property {string} key of the item that should be result of the personalisation
-		 * @property {boolean} showFieldAsColumn determinating if the "Show Field as Column" checkbox should be checked
+		 * @property {string} key of the item that is the result of the personalization
+		 * @property {boolean} showFieldAsColumn Determines if the "Show Field as Column" checkbox is to be checked
 		 */
 		/**
-		 *
+		 * Opa5 test action:
+		 * 1. Opens the personalization dialog of a given control.
+		 * 2. Executes the given <code>GroupPersonalizationConfiguration</code>.
+		 * 3. Closes the personalization dialog.
 		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be reset
 		 * @param {GroupPersonalizationConfiguration[]} aConfigurations an array containing the group personalization configuration objects
 		 * @returns {Promise} Opa waitFor
@@ -972,7 +1093,7 @@ sap.ui.define([
 			return iPersonalize.call(this, oControl, Util.texts.group, {
 				success: function(oP13nDialog) {
 					this.waitFor({
-						controlType: (oP13nDialog.getContent()[0].getView("group") ? "sap.ui.mdc.p13n.panels.GroupPanel" : "sap.m.p13n.GroupPanel"),
+						controlType: oP13nDialog.getContent()[0].getView("group") && oP13nDialog.getContent()[0].getView("group").getContent().isA("sap.ui.mdc.p13n.panels.GroupPanel") ? "sap.ui.mdc.p13n.panels.GroupPanel" : "sap.m.p13n.GroupPanel",
 						matchers: new Ancestor(oP13nDialog, false),
 						success: function(aGroupPanels) {
 							var oGroupPanel = aGroupPanels[0];
@@ -1001,20 +1122,23 @@ sap.ui.define([
 		},
 		/**
 		 * @typedef {object} SortPersonalizationConfiguration
-		 * @property {string} key of the item that should be result of the personalisation
-		 * @property {boolean} descending determinating if the sort direction is descending
+		 * @property {string} key Key of the item that is the result of the personalization
+		 * @property {boolean} descending Determines whether the sort direction is descending
 		 */
 		/**
-		 *
-		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be reset
-		 * @param {SortPersonalizationConfiguration[]} aConfigurations an array containing the sort personalization configuration objects
-		 * @returns {Promise} Opa waitFor
+		 * OPA5 test action
+		 * 1. Opens the personalization dialog of a given chart.
+		 * 2. Executes the given <code>SortPersonalizationConfiguration</code>.
+		 * 3. Closes the personalization dialog.
+		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the <code>Control</code> that is sorted
+		 * @param {SortPersonalizationConfiguration[]} aConfigurations Array containing the sort personalization configuration objects
+		 * @returns {Promise} OPA waitFor
 		 */
 		iPersonalizeSort: function(oControl, aConfigurations) {
 			return iPersonalize.call(this, oControl, Util.texts.sort, {
 				success: function(oP13nDialog) {
 					this.waitFor({
-						controlType: oP13nDialog.getContent()[0].getView("sort") ? "sap.ui.mdc.p13n.panels.SortQueryPanel" : "sap.m.p13n.SortPanel",
+						controlType: oP13nDialog.getContent()[0].getView("sort") && oP13nDialog.getContent()[0].getView("sort").getContent().isA("sap.ui.mdc.p13n.panels.SortQueryPanel") ? "sap.ui.mdc.p13n.panels.SortQueryPanel" : "sap.m.p13n.SortPanel",
 						matchers: new Ancestor(oP13nDialog, false),
 						success: function(aSortPanels) {
 							var oSortPanel = aSortPanels[0];
@@ -1042,8 +1166,13 @@ sap.ui.define([
 			});
 		},
 		/**
-		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the control which is to be reset
-		 * @returns {Promise} Opa waitFor
+		 * Opa5 test action
+		 * 1. Opens the personalization dialog of a given chart.
+		 * 2. Presses the reset personalization button.
+		 * 3. Confirms the reset dialog.
+		 * 4. Closes the personalization dialog.
+		 * @param {sap.ui.core.Control | string} oControl Instance / ID of the <code>Control</code> that is reset
+		 * @returns {Promise} OPA waitFor
 		 */
 		iResetThePersonalization: function (oControl) {
 			return iOpenThePersonalizationDialog.call(this, oControl, {
@@ -1064,5 +1193,5 @@ sap.ui.define([
 				}
 			});
 		}
-    };
+	};
 });