@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.test/src/sap/fe/test/UI5MockHelper.ts

@@ -1,12 +1,18 @@
 /**
  * Mock class for a V4 Context
  */
-
+import { Event } from "sap/ui/base";
+import { Control, UI5Element } from "sap/ui/core";
+import { Controller, View } from "sap/ui/core/mvc";
 import { Context, ODataListBinding, ODataContextBinding, ODataMetaModel, ODataModel } from "sap/ui/model/odata/v4";
 
 export class MockContext implements Partial<Context> {
 	public constructor(private oValues: any, private oBinding?: any) {}
 
+	public isA(sClassName: string): boolean {
+		return sClassName === "sap.ui.model.odata.v4.Context";
+	}
+
 	public getProperty = jest.fn((key: string) => {
 		return this.oValues[key];
 	});
@@ -25,14 +31,31 @@ export class MockContext implements Partial<Context> {
 	public getBinding = jest.fn(() => {
 		return this.oBinding;
 	});
-	public getModel = jest.fn();
+	public getModel = jest.fn(() => {
+		return (this.oBinding?.getModel() as any) as ODataModel;
+	});
+	public isTransient = jest.fn();
 }
 
-export class MockControl {
-	public getBindingInfo = jest.fn();
+export class MockUI5Element implements Partial<UI5Element> {
+	[key: string]: any;
+	public bindingContext = new MockContext({});
 	public getBinding = jest.fn();
+	public getBindingContext = jest.fn().mockReturnValue(this.bindingContext);
+	public getBindingInfo = jest.fn();
 	public data = jest.fn();
 	public getModel = jest.fn();
+	public getParent = jest.fn();
+}
+
+export class MockControl extends MockUI5Element implements Partial<Control> {}
+
+export class MockEvent implements Partial<Event> {
+	public constructor(public params: { [key: string]: any } = {}, public source: MockUI5Element = new MockUI5Element()) {}
+
+	public getParameter = jest.fn(name => this.params[name]);
+
+	public getSource = jest.fn(() => this.source as any);
 }
 
 /**
@@ -41,7 +64,7 @@ export class MockControl {
 export class MockListBinding implements Partial<ODataListBinding> {
 	private aMockContexts: MockContext[];
 
-	public constructor(aContexts?: any[]) {
+	public constructor(aContexts?: any[], private mockModel?: MockModel) {
 		aContexts = aContexts || [];
 
 		this.aMockContexts = aContexts.map(context => {
@@ -53,6 +76,10 @@ export class MockListBinding implements Partial<ODataListBinding> {
 		return sClassName === "sap.ui.model.odata.v4.ODataListBinding";
 	}
 
+	public setModel(oModel: MockModel) {
+		this.mockModel = oModel;
+	}
+
 	// Mocked API
 	public setAggregation = jest.fn();
 	public filter = jest.fn();
@@ -66,12 +93,15 @@ export class MockListBinding implements Partial<ODataListBinding> {
 	public getCurrentContexts = jest.fn((...args) => {
 		return (this.aMockContexts as any) as Context[];
 	});
+	public getModel = jest.fn(() => {
+		return (this.mockModel as any) as ODataModel;
+	});
 }
 
 export class MockContextBinding implements Partial<ODataContextBinding> {
 	private oMockContext: MockContext;
 
-	public constructor(oContext?: any) {
+	public constructor(oContext?: any, private mockModel?: MockModel) {
 		this.oMockContext = new MockContext(oContext || {}, this);
 	}
 
@@ -81,12 +111,18 @@ export class MockContextBinding implements Partial<ODataContextBinding> {
 	public getInternalMockContext(): MockContext {
 		return this.oMockContext;
 	}
+	public setModel(oModel: MockModel) {
+		this.mockModel = oModel;
+	}
 
 	// Mocked API
 	public getBoundContext = jest.fn(() => {
 		return (this.oMockContext as any) as Context;
 	});
 	public attachEventOnce = jest.fn();
+	public getModel = jest.fn(() => {
+		return (this.mockModel as any) as ODataModel;
+	});
 }
 
 /**
@@ -108,7 +144,9 @@ export class MockMetaModel implements Partial<ODataMetaModel> {
 		return this.oMetaContext.getProperty(sPath);
 	});
 	public requestObject = jest.fn();
-	public createBindingContext = jest.fn();
+	public createBindingContext = jest.fn((sPath: string) => {
+		return (new MockContext({ $path: sPath }) as any) as Context;
+	});
 	public getMetaPath = jest.fn();
 }
 
@@ -119,7 +157,14 @@ export class MockMetaModel implements Partial<ODataMetaModel> {
 export class MockModel implements Partial<ODataModel> {
 	private oMetaModel?: MockMetaModel;
 
-	public constructor(private mockListBinding?: MockListBinding, private mockContextBinding?: MockContextBinding) {}
+	public constructor(private mockListBinding?: MockListBinding, private mockContextBinding?: MockContextBinding) {
+		if (mockListBinding) {
+			mockListBinding.setModel(this);
+		}
+		if (mockContextBinding) {
+			mockContextBinding.setModel(this);
+		}
+	}
 
 	// Factories
 	static modelFromListBinding(mockListBinding: MockListBinding): MockModel {
@@ -149,3 +194,53 @@ export class MockModel implements Partial<ODataModel> {
 	public getProperty = jest.fn();
 	public setProperty = jest.fn();
 }
+
+export class MockView implements Partial<View> {
+	public getController = jest.fn();
+
+	public getModel = jest.fn();
+
+	public getViewData = jest.fn();
+}
+
+export class MockController implements Partial<Controller> {
+	public getView = jest.fn();
+
+	public _routing = {
+		navigateToTarget: jest.fn()
+	};
+
+	public _editFlow = {
+		syncTask: jest.fn()
+	};
+
+	public _sideEffects = {
+		handleFieldChange: jest.fn()
+	};
+
+	isA = jest.fn().mockReturnValue(false);
+}
+
+export interface MVCMock {
+	model: MockModel;
+	view: MockView;
+	controller: MockController;
+}
+
+/**
+ * Generate model, view and controller mocks that refer to each other.
+ *
+ * @param existing Optional existing mocked instances that should be used
+ * @returns Mocked model, view and controller instances
+ */
+export function mockMVC(existing?: Partial<MVCMock>): MVCMock {
+	const model = existing?.model || new MockModel();
+	const view = existing?.view || new MockView();
+	const controller = existing?.controller || new MockController();
+
+	view.getController.mockReturnValue(controller);
+	view.getModel.mockReturnValue(model);
+	controller.getView.mockReturnValue(view);
+
+	return { model, view, controller };
+}

package/packages/sap.fe.test/src/sap/fe/test/Utils-dbg.js

@@ -288,18 +288,6 @@ sap.ui.define(
 			return vTarget;
 		};
 
-		Utils.getParametersArray = function(iStartIndex, aArguments) {
-			var aArguments = Array.prototype.slice.call(arguments, 1);
-			if (aArguments.length === 1 && Utils.isArguments(aArguments[0])) {
-				aArguments = Array.prototype.slice.call(aArguments[0], 0);
-			}
-			var aParameters = aArguments[iStartIndex];
-			if (aArguments.length > iStartIndex || (aParameters && !Array.isArray(aParameters))) {
-				aParameters = Array.prototype.slice.call(aArguments, iStartIndex);
-			}
-			return aParameters;
-		};
-
 		return Utils;
 	}
 );

package/packages/sap.fe.test/src/sap/fe/test/Utils.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/base/util/LoaderExtensions","sap/base/util/UriParameters","sap/base/util/merge","sap/base/strings/formatMessage","sap/base/strings/capitalize"],function(L,U,m,f,c){"use strict";var a={};a.getManifest=function(C){var u=sap.ushell&&sap.ushell.Container;if(!u){var b=a.getNoFLPAppPath();C="local"+b;}var o=new U(window.location.href),d=o.get("manifest"),s=o.get("user"),t,M="",D=L.loadResource(C+"/manifest.json");try{if(window.parent.__karma__.config.ui5.config.usetenants){t=window.parent.__karma__.config.ui5.shardIndex;}}catch(e){t=undefined;}var T=D;if(d){d.split(",").forEach(function(S){if(S.indexOf("/")!==0){S=C+"/"+S;}try{T=m({},T,L.loadResource(S));}catch(i){}});}if(t!==undefined&&T["sap.app"].tenantSupport!==false){M+="/tenant-"+t;T.tenantID=t;}T["sap.app"].dataSources.mainService.uri=M+T["sap.app"].dataSources.mainService.uri+(s?"?u="+s:"");return T;};a.getNoFLPAppPath=function(){var u=new U(window.location.href);var A=u.get("app")||"SalesOrder";var b=a.getAppInfo(A).appPath;return b;};a.getAppInfo=function(A){var o={"SalesOrder-manage":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-manageInline":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-manageFCL":{appName:"SalesOrderFCL",appPath:"/apps/salesorder-FCL/webapp"},"SalesOrder-aggregate":{appName:"SalesOrder",appPath:"/apps/salesorder-aggregate/webapp"},"SalesOrder-manageInlineTest":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"Customer-manage":{appName:"Customer",appPath:"/apps/customer/webapp"},"Customer-displayFactSheet":{appName:"Customer",appPath:"/apps/customer-displayFactSheet/webapp"},"SalesOrder-sticky":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-stickyFCL":{appName:"SalesOrderFCL",appPath:"/apps/salesorder-FCL/webapp"},"Products-manage":{appName:"catalog-admin-ui",appPath:"/apps/office-supplies/admin/webapp"},"Products-custom":{appName:"catalog-admin-ui",appPath:"/apps/office-supplies/custompage/webapp"},"Chevron-Navigation":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"Manage-items":{appName:"ManageItems",appPath:"/apps/manage-items/webapp"},"Drafts-manage":{appName:"ManageDrafts",appPath:"/apps/manage-drafts/webapp"},"Drafts-manageFCL":{appName:"ManageDraftsFCL",appPath:"/apps/manage-drafts-FCL/webapp"},"Manage-itemsSem":{appName:"ManageItemsSem",appPath:"/apps/manage-drafts/webapp"},"CustomNavigation-sample":{appName:"customNavigation.sample",appPath:"/apps/customNav"},"SalesOrder-Create":{appName:"SalesOrderCreate",appPath:"/apps/salesorder-Create/webapp"},"SalesOrder-CreateFCL":{appName:"SalesOrderCreateFCL",appPath:"/apps/salesorder-CreateFCL/webapp"},"SalesOrder":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"}};return o[A];};a.isOfType=function(t,v,n){var V=Array.isArray(v)?v:[v];return V.reduce(function(i,T){if(i){return true;}if(T===null||T===undefined){return t===T;}if(t===null||t===undefined){return!!n;}if(typeof T==="function"){if(T===Boolean){return typeof t==="boolean";}if(T===Array){return Array.isArray(t);}if(T===String){return typeof t==="string"||t instanceof String;}if(T===Object){return typeof t==="object"&&t.constructor===Object;}if(T===Number){return typeof t==="number";}return t instanceof T;}return typeof t===T;},false);};a.isArguments=function(v){return Object.prototype.toString.call(v)==="[object Arguments]";};a.parseArguments=function(e){var A=Array.prototype.slice.call(arguments,1);if(A.length===1&&a.isArguments(A[0])){A=Array.prototype.slice.call(A[0],0);}return e.reduce(function(b,E){if(a.isOfType(A[0],E,true)){b.push(A.shift());}else{b.push(undefined);}return b;},[]);};a.formatObject=function(o){if(a.isOfType(o,[null,undefined])){return"";}if(a.isOfType(o,Array)){return("["+o.map(function(e){return a.formatObject(e);}).join(", ")+"]");}if(a.isOfType(o,Object)){return("{"+Object.keys(o).map(function(k){return k+": "+a.formatObject(o[k]);}).join(", ")+"}");}return o.toString();};a.formatMessage=function(M){var p=Array.prototype.slice.call(arguments,1).map(function(P){return a.formatObject(P);});return f(M&&M.replace(/'/g,"''"),p);};a.mergeObjects=function(){return m.apply(this,[{}].concat(Array.prototype.slice.call(arguments)));};a.getAggregation=function(M,A){if(!M){return null;}var b=M["get"+c(A,0)];if(!b){throw new Error("Object '"+M+"' does not have an aggregation called '"+A+"'");}return b.call(M);};a.pushToArray=function(e,t,A){if(t===undefined){t=[];}else if(!Array.isArray(t)){t=[t];}else{t=t.slice(0);}if(Array.isArray(e)){t=A?e.slice(0).concat(t):t.concat(e);}else if(e!==undefined){if(A){t.unshift(e);}else{t.push(e);}}return t;};a.getParametersArray=function(s,A){var A=Array.prototype.slice.call(arguments,1);if(A.length===1&&a.isArguments(A[0])){A=Array.prototype.slice.call(A[0],0);}var p=A[s];if(A.length>s||(p&&!Array.isArray(p))){p=Array.prototype.slice.call(A,s);}return p;};return a;});
+sap.ui.define(["sap/base/util/LoaderExtensions","sap/base/util/UriParameters","sap/base/util/merge","sap/base/strings/formatMessage","sap/base/strings/capitalize"],function(L,U,m,f,c){"use strict";var a={};a.getManifest=function(C){var u=sap.ushell&&sap.ushell.Container;if(!u){var b=a.getNoFLPAppPath();C="local"+b;}var o=new U(window.location.href),d=o.get("manifest"),s=o.get("user"),t,M="",D=L.loadResource(C+"/manifest.json");try{if(window.parent.__karma__.config.ui5.config.usetenants){t=window.parent.__karma__.config.ui5.shardIndex;}}catch(e){t=undefined;}var T=D;if(d){d.split(",").forEach(function(S){if(S.indexOf("/")!==0){S=C+"/"+S;}try{T=m({},T,L.loadResource(S));}catch(i){}});}if(t!==undefined&&T["sap.app"].tenantSupport!==false){M+="/tenant-"+t;T.tenantID=t;}T["sap.app"].dataSources.mainService.uri=M+T["sap.app"].dataSources.mainService.uri+(s?"?u="+s:"");return T;};a.getNoFLPAppPath=function(){var u=new U(window.location.href);var A=u.get("app")||"SalesOrder";var b=a.getAppInfo(A).appPath;return b;};a.getAppInfo=function(A){var o={"SalesOrder-manage":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-manageInline":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-manageFCL":{appName:"SalesOrderFCL",appPath:"/apps/salesorder-FCL/webapp"},"SalesOrder-aggregate":{appName:"SalesOrder",appPath:"/apps/salesorder-aggregate/webapp"},"SalesOrder-manageInlineTest":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"Customer-manage":{appName:"Customer",appPath:"/apps/customer/webapp"},"Customer-displayFactSheet":{appName:"Customer",appPath:"/apps/customer-displayFactSheet/webapp"},"SalesOrder-sticky":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"SalesOrder-stickyFCL":{appName:"SalesOrderFCL",appPath:"/apps/salesorder-FCL/webapp"},"Products-manage":{appName:"catalog-admin-ui",appPath:"/apps/office-supplies/admin/webapp"},"Products-custom":{appName:"catalog-admin-ui",appPath:"/apps/office-supplies/custompage/webapp"},"Chevron-Navigation":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"},"Manage-items":{appName:"ManageItems",appPath:"/apps/manage-items/webapp"},"Drafts-manage":{appName:"ManageDrafts",appPath:"/apps/manage-drafts/webapp"},"Drafts-manageFCL":{appName:"ManageDraftsFCL",appPath:"/apps/manage-drafts-FCL/webapp"},"Manage-itemsSem":{appName:"ManageItemsSem",appPath:"/apps/manage-drafts/webapp"},"CustomNavigation-sample":{appName:"customNavigation.sample",appPath:"/apps/customNav"},"SalesOrder-Create":{appName:"SalesOrderCreate",appPath:"/apps/salesorder-Create/webapp"},"SalesOrder-CreateFCL":{appName:"SalesOrderCreateFCL",appPath:"/apps/salesorder-CreateFCL/webapp"},"SalesOrder":{appName:"SalesOrder",appPath:"/apps/salesorder/webapp"}};return o[A];};a.isOfType=function(t,v,n){var V=Array.isArray(v)?v:[v];return V.reduce(function(i,T){if(i){return true;}if(T===null||T===undefined){return t===T;}if(t===null||t===undefined){return!!n;}if(typeof T==="function"){if(T===Boolean){return typeof t==="boolean";}if(T===Array){return Array.isArray(t);}if(T===String){return typeof t==="string"||t instanceof String;}if(T===Object){return typeof t==="object"&&t.constructor===Object;}if(T===Number){return typeof t==="number";}return t instanceof T;}return typeof t===T;},false);};a.isArguments=function(v){return Object.prototype.toString.call(v)==="[object Arguments]";};a.parseArguments=function(e){var A=Array.prototype.slice.call(arguments,1);if(A.length===1&&a.isArguments(A[0])){A=Array.prototype.slice.call(A[0],0);}return e.reduce(function(b,E){if(a.isOfType(A[0],E,true)){b.push(A.shift());}else{b.push(undefined);}return b;},[]);};a.formatObject=function(o){if(a.isOfType(o,[null,undefined])){return"";}if(a.isOfType(o,Array)){return("["+o.map(function(e){return a.formatObject(e);}).join(", ")+"]");}if(a.isOfType(o,Object)){return("{"+Object.keys(o).map(function(k){return k+": "+a.formatObject(o[k]);}).join(", ")+"}");}return o.toString();};a.formatMessage=function(M){var p=Array.prototype.slice.call(arguments,1).map(function(P){return a.formatObject(P);});return f(M&&M.replace(/'/g,"''"),p);};a.mergeObjects=function(){return m.apply(this,[{}].concat(Array.prototype.slice.call(arguments)));};a.getAggregation=function(M,A){if(!M){return null;}var b=M["get"+c(A,0)];if(!b){throw new Error("Object '"+M+"' does not have an aggregation called '"+A+"'");}return b.call(M);};a.pushToArray=function(e,t,A){if(t===undefined){t=[];}else if(!Array.isArray(t)){t=[t];}else{t=t.slice(0);}if(Array.isArray(e)){t=A?e.slice(0).concat(t):t.concat(e);}else if(e!==undefined){if(A){t.unshift(e);}else{t.push(e);}}return t;};return a;});

package/packages/sap.fe.test/src/sap/fe/test/api/BaseAPI-dbg.js

@@ -4,13 +4,7 @@
     
  */
 sap.ui.define(
-	[
-		"sap/fe/test/Utils",
-		"sap/ui/test/Opa5",
-		"sap/ui/test/OpaBuilder",
-		"sap/fe/test/builder/FEBuilder",
-		"sap/ui/mdc/p13n/panels/BasePanel"
-	],
+	["sap/fe/test/Utils", "sap/ui/test/Opa5", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/m/p13n/BasePanel"],
 	function(Utils, Opa5, OpaBuilder, FEBuilder, MdcP13nBasePanel) {
 		"use strict";
 

package/packages/sap.fe.test/src/sap/fe/test/api/BaseAPI.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/test/Utils","sap/ui/test/Opa5","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/ui/mdc/p13n/panels/BasePanel"],function(U,O,a,F,M){"use strict";function _(r,c){var A=r.and;if(c in A){return _(A[c],c);}return A;}var B=function(o,i){this._oBuilder=o;this._vIdentifier=i;};B.MDC_P13N_MODEL=M.prototype.P13N_MODEL;B.prototype.isAction=undefined;B.prototype.getBuilder=function(){return new this._oBuilder.constructor(this._oBuilder.getOpaInstance(),this._oBuilder.build());};B.prototype.getOpaInstance=function(){return this._oBuilder.getOpaInstance();};B.prototype.getIdentifier=function(){return this._vIdentifier;};B.prototype.prepareResult=function(w){var p=_(w,this.isAction?"when":"then");w.and=this;if(!U.isOfType(this.isAction,[null,undefined])){w.and[this.isAction?"when":"then"]=p;}return w;};B.prototype.createActionMatcher=function(A){var m,s;if(!U.isOfType(A,String)){if(typeof A.service==="string"&&typeof A.action==="string"){s=A.service+(A.unbound?"::":".")+A.action;m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error("not supported service and action parameters for creating a control id: "+A.service+"/"+A.action);}}else{m=a.Matchers.properties({text:A});}return m;};B.prototype.createFieldMatcher=function(f){var m,s;if(!U.isOfType(f,String)){if(typeof f.property==="string"){if(f.connectedFields){s="ConnectedFields::"+f.connectedFields+"::"+f.property.replaceAll("/","::")+"::Field";}else{s=f.property.replaceAll("/","::")+"::Field";}return a.Matchers.some.apply(null,["DataField","DataFieldWithURL","DataFieldForAnnotation"].reduce(function(b,d){return b.concat([F.Matchers.id(new RegExp(U.formatMessage("::{0}::{1}$",d,s)))]);},[]));}else{throw new Error("The 'property' parameter for creating a control ID for a field is not supported: "+f.property);}}else{m=F.Matchers.label(f);}return m;};B.prototype.createFormElementMatcher=function(f,d){var m,s;if(!U.isOfType(f,String)){if(f.property&&typeof f.property==="string"){if(f.connectedFields){s="SemanticFormElement::"+d+"::ConnectedFields::"+f.connectedFields;}else{s="FormElement::"+d+"::"+f.property.replaceAll("/","::");}m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error("Unsupported parameter for creating a control id for a FormElement");}}else{m=a.Matchers.properties({label:f});}return m;};B.prototype.createFieldGroupMatcher=function(f){var m,s;if(!U.isOfType(f,String)){if(f.fieldGroup&&typeof f.fieldGroup==="string"){s="FormContainer::"+f.fieldGroup;m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error(U.formatMessage("The parameter for creating a control ID for a FieldGroup is not supported: {0}",f));}}else{m=a.Matchers.properties({title:f});}return m;};return B;});
+sap.ui.define(["sap/fe/test/Utils","sap/ui/test/Opa5","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/m/p13n/BasePanel"],function(U,O,a,F,M){"use strict";function _(r,c){var A=r.and;if(c in A){return _(A[c],c);}return A;}var B=function(o,i){this._oBuilder=o;this._vIdentifier=i;};B.MDC_P13N_MODEL=M.prototype.P13N_MODEL;B.prototype.isAction=undefined;B.prototype.getBuilder=function(){return new this._oBuilder.constructor(this._oBuilder.getOpaInstance(),this._oBuilder.build());};B.prototype.getOpaInstance=function(){return this._oBuilder.getOpaInstance();};B.prototype.getIdentifier=function(){return this._vIdentifier;};B.prototype.prepareResult=function(w){var p=_(w,this.isAction?"when":"then");w.and=this;if(!U.isOfType(this.isAction,[null,undefined])){w.and[this.isAction?"when":"then"]=p;}return w;};B.prototype.createActionMatcher=function(A){var m,s;if(!U.isOfType(A,String)){if(typeof A.service==="string"&&typeof A.action==="string"){s=A.service+(A.unbound?"::":".")+A.action;m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error("not supported service and action parameters for creating a control id: "+A.service+"/"+A.action);}}else{m=a.Matchers.properties({text:A});}return m;};B.prototype.createFieldMatcher=function(f){var m,s;if(!U.isOfType(f,String)){if(typeof f.property==="string"){if(f.connectedFields){s="ConnectedFields::"+f.connectedFields+"::"+f.property.replaceAll("/","::")+"::Field";}else{s=f.property.replaceAll("/","::")+"::Field";}return a.Matchers.some.apply(null,["DataField","DataFieldWithURL","DataFieldForAnnotation"].reduce(function(b,d){return b.concat([F.Matchers.id(new RegExp(U.formatMessage("::{0}::{1}$",d,s)))]);},[]));}else{throw new Error("The 'property' parameter for creating a control ID for a field is not supported: "+f.property);}}else{m=F.Matchers.label(f);}return m;};B.prototype.createFormElementMatcher=function(f,d){var m,s;if(!U.isOfType(f,String)){if(f.property&&typeof f.property==="string"){if(f.connectedFields){s="SemanticFormElement::"+d+"::ConnectedFields::"+f.connectedFields;}else{s="FormElement::"+d+"::"+f.property.replaceAll("/","::");}m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error("Unsupported parameter for creating a control id for a FormElement");}}else{m=a.Matchers.properties({label:f});}return m;};B.prototype.createFieldGroupMatcher=function(f){var m,s;if(!U.isOfType(f,String)){if(f.fieldGroup&&typeof f.fieldGroup==="string"){s="FormContainer::"+f.fieldGroup;m=F.Matchers.id(new RegExp(U.formatMessage("{0}$",s)));}else{throw new Error(U.formatMessage("The parameter for creating a control ID for a FieldGroup is not supported: {0}",f));}}else{m=a.Matchers.properties({title:f});}return m;};return B;});

package/packages/sap.fe.test/src/sap/fe/test/api/ChartAssertions-dbg.js

@@ -28,7 +28,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iCheckItems = function(iNumberOfItems, sTab) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.ChartNew")
+				.hasType("sap.ui.mdc.Chart")
 				.check(function(aCharts) {
 					var oChart;
 					if (sTab && aCharts && aCharts.length > 1) {
@@ -57,7 +57,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iSeeChartType = function(sChartType) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.ChartNew")
+				.hasType("sap.ui.mdc.Chart")
 				.check(function(oChart) {
 					return sChartType === oChart[0].getChartType();
 				}, true)
@@ -67,7 +67,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iSeeChartVisible = function() {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.ChartNew")
+				.hasType("sap.ui.mdc.Chart")
 				.check(function(oChart) {
 					return oChart[0].getVisible() === true;
 				}, true)
@@ -104,7 +104,7 @@ sap.ui.define(
 
 		ChartAssertions.prototype.iCheckChartNoDataText = function(sNoDataText) {
 			return OpaBuilder.create(this)
-				.hasType("sap.ui.mdc.ChartNew")
+				.hasType("sap.ui.mdc.Chart")
 				.check(function(oChart) {
 					return sNoDataText === oChart[0].getNoDataText();
 				})

package/packages/sap.fe.test/src/sap/fe/test/api/ChartAssertions.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./BaseAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/ui/core/SortOrder"],function(B,U,O,F,S){"use strict";var C=function(b,c){return B.call(this,b,c);};C.prototype=Object.create(B.prototype);C.prototype.constructor=C;C.prototype.isAction=false;C.prototype.iCheckItems=function(n,t){return O.create(this).hasType("sap.ui.mdc.ChartNew").check(function(c){var o;if(t&&c&&c.length>1){for(var i=0;i<c.length;i++){if(c[i].getId().indexOf("fe::Chart::"+t)>-1){o=c[i];break;}}}else{o=c[0];}var a=o.getControlDelegate()._getChart(o).getBinding("data").getContexts();return((a&&(n===undefined?a.length!==0:a.length===n))||(!a&&n===0));},true).description("Seeing "+n+"of items").execute();};C.prototype.iSeeChartType=function(c){return O.create(this).hasType("sap.ui.mdc.ChartNew").check(function(o){return c===o[0].getChartType();},true).description("Chart type is "+c).execute();};C.prototype.iSeeChartVisible=function(){return O.create(this).hasType("sap.ui.mdc.ChartNew").check(function(c){return c[0].getVisible()===true;},true).description("Chart is Visible").execute();};C.prototype.iCheckBreadCrumb=function(l){return O.create(this).hasType("sap.m.Breadcrumbs").hasProperties({currentLocationText:l}).description("BreadCrumb is "+l).execute();};C.prototype.iCheckVisibleDimensions=function(d){return O.create(this).hasType("sap.chart.Chart").check(function(c){return c[0].getVisibleDimensions().toString()===d.toString();}).description("Visible Dimensions are checked correctly").execute();};C.prototype.iCheckVisibleMeasures=function(m){return O.create(this).hasType("sap.chart.Chart").check(function(c){return c[0].getVisibleMeasures().toString()===m.toString();}).description("Visible Measures are checked correctly").execute();};C.prototype.iCheckChartNoDataText=function(n){return O.create(this).hasType("sap.ui.mdc.ChartNew").check(function(c){return n===c[0].getNoDataText();}).description("No Data text is "+n).execute();};C.prototype.iCheckButtonWithText=function(t){return O.create(this).hasType("sap.m.Button").hasProperties({text:t}).description("Seeing Button with text '"+t+"'").execute();};C.prototype.iCheckMessageToastWithText=function(t){return F.createMessageToastBuilder(t).execute(this);};return C;});
+sap.ui.define(["./BaseAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/ui/core/SortOrder"],function(B,U,O,F,S){"use strict";var C=function(b,c){return B.call(this,b,c);};C.prototype=Object.create(B.prototype);C.prototype.constructor=C;C.prototype.isAction=false;C.prototype.iCheckItems=function(n,t){return O.create(this).hasType("sap.ui.mdc.Chart").check(function(c){var o;if(t&&c&&c.length>1){for(var i=0;i<c.length;i++){if(c[i].getId().indexOf("fe::Chart::"+t)>-1){o=c[i];break;}}}else{o=c[0];}var a=o.getControlDelegate()._getChart(o).getBinding("data").getContexts();return((a&&(n===undefined?a.length!==0:a.length===n))||(!a&&n===0));},true).description("Seeing "+n+"of items").execute();};C.prototype.iSeeChartType=function(c){return O.create(this).hasType("sap.ui.mdc.Chart").check(function(o){return c===o[0].getChartType();},true).description("Chart type is "+c).execute();};C.prototype.iSeeChartVisible=function(){return O.create(this).hasType("sap.ui.mdc.Chart").check(function(c){return c[0].getVisible()===true;},true).description("Chart is Visible").execute();};C.prototype.iCheckBreadCrumb=function(l){return O.create(this).hasType("sap.m.Breadcrumbs").hasProperties({currentLocationText:l}).description("BreadCrumb is "+l).execute();};C.prototype.iCheckVisibleDimensions=function(d){return O.create(this).hasType("sap.chart.Chart").check(function(c){return c[0].getVisibleDimensions().toString()===d.toString();}).description("Visible Dimensions are checked correctly").execute();};C.prototype.iCheckVisibleMeasures=function(m){return O.create(this).hasType("sap.chart.Chart").check(function(c){return c[0].getVisibleMeasures().toString()===m.toString();}).description("Visible Measures are checked correctly").execute();};C.prototype.iCheckChartNoDataText=function(n){return O.create(this).hasType("sap.ui.mdc.Chart").check(function(c){return n===c[0].getNoDataText();}).description("No Data text is "+n).execute();};C.prototype.iCheckButtonWithText=function(t){return O.create(this).hasType("sap.m.Button").hasProperties({text:t}).description("Seeing Button with text '"+t+"'").execute();};C.prototype.iCheckMessageToastWithText=function(t){return F.createMessageToastBuilder(t).execute(this);};return C;});

package/packages/sap.fe.test/src/sap/fe/test/api/KPICardActions-dbg.js

@@ -0,0 +1,43 @@
+/*
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuilder"], function(KPICardAPI, Utils, FEBuilder) {
+	"use strict";
+
+	/**
+	 * Constructs a new TableAssertions instance.
+	 *
+	 * @param {sap.fe.test.builder.KPIBuilder} oBuilderInstance The builder instance used to interact with the UI
+	 * @returns {sap.fe.test.api.KPICardAssertions} The new instance
+	 * @class
+	 * @extends sap.fe.test.api.KPICardAPI
+	 * @hideconstructor
+	 * @public
+	 */
+	var KPICardActions = function(oBuilderInstance) {
+		return KPICardAPI.call(this, oBuilderInstance);
+	};
+	KPICardActions.prototype = Object.create(KPICardAPI.prototype);
+	KPICardActions.prototype.constructor = KPICardActions;
+	KPICardActions.prototype.isAction = true;
+
+	/**
+	 * Clicks on the header of the KPI Card.
+	 *
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+	 */
+	KPICardActions.prototype.iClickHeader = function() {
+		var oKPIBuilder = this.getBuilder();
+
+		return this.prepareResult(
+			oKPIBuilder
+				.doClickKPICardHeader()
+				.description("Clicking KPI card header")
+				.execute()
+		);
+	};
+
+	return KPICardActions;
+});

package/packages/sap.fe.test/src/sap/fe/test/api/KPICardActions.js

@@ -0,0 +1,6 @@
+/*
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["./KPICardAPI","sap/fe/test/Utils","sap/fe/test/builder/FEBuilder"],function(K,U,F){"use strict";var a=function(b){return K.call(this,b);};a.prototype=Object.create(K.prototype);a.prototype.constructor=a;a.prototype.isAction=true;a.prototype.iClickHeader=function(){var k=this.getBuilder();return this.prepareResult(k.doClickKPICardHeader().description("Clicking KPI card header").execute());};return a;});

package/packages/sap.fe.test/src/sap/fe/test/api/KPICardAssertions-dbg.js

@@ -125,10 +125,10 @@ sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuild
 	KPICardAssertions.prototype.iSeeHeaderValue = function(sValue, mStates) {
 		var oKPIBuilder = this.getBuilder();
 		var oProperties = mStates || {};
-		oProperties.value = sValue;
+		oProperties.number = sValue;
 
 		var vTitleMatcher = FEBuilder.create(this)
-			.hasType("sap.m.NumericContent")
+			.hasType("sap.f.cards.NumericIndicators")
 			.hasProperties(oProperties);
 
 		var sDescription = mStates
@@ -154,21 +154,25 @@ sap.ui.define(["./KPICardAPI", "sap/fe/test/Utils", "sap/fe/test/builder/FEBuild
 		var oKPIBuilder = this.getBuilder();
 
 		var vIndicatorMatcher = FEBuilder.create(this)
-			.hasType("sap.f.cards.NumericSideIndicator")
+			.hasType("sap.f.cards.NumericIndicators")
 			.hasChildren(
 				FEBuilder.create(this)
-					.hasType("sap.m.Text")
-					.hasProperties({ text: sTitle })
-			)
-			.hasChildren(
-				FEBuilder.create(this)
-					.hasType("sap.m.Text")
-					.hasProperties({ text: sValue })
-			)
-			.hasChildren(
-				FEBuilder.create(this)
-					.hasType("sap.m.Text")
-					.hasProperties({ text: sUnit })
+					.hasType("sap.f.cards.NumericSideIndicator")
+					.hasChildren(
+						FEBuilder.create(this)
+							.hasType("sap.m.Text")
+							.hasProperties({ text: sTitle })
+					)
+					.hasChildren(
+						FEBuilder.create(this)
+							.hasType("sap.m.Text")
+							.hasProperties({ text: sTitle })
+					)
+					.hasChildren(
+						FEBuilder.create(this)
+							.hasType("sap.m.Text")
+							.hasProperties({ text: sValue })
+					)
 			);
 
 		return this.prepareResult(

package/packages/sap.fe.test/src/sap/fe/test/api/KPICardAssertions.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./KPICardAPI","sap/fe/test/Utils","sap/fe/test/builder/FEBuilder"],function(K,U,F){"use strict";var a=function(b){return K.call(this,b);};a.prototype=Object.create(K.prototype);a.prototype.constructor=a;a.prototype.isAction=false;a.prototype.iSeeHeaderTitle=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-title");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card title: "+t).execute());};a.prototype.iSeeHeaderSubtitle=function(s){var k=this.getBuilder();var t=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-subtitle");}).hasProperties({text:s});return this.prepareResult(k.doOnKPICardHeader(t,true).description("Checking card sub-title: "+s).execute());};a.prototype.iSeeHeaderUnit=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-unitOfMeasurement");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card unit: "+t).execute());};a.prototype.iSeeHeaderDetails=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-details");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card details: "+t).execute());};a.prototype.iSeeHeaderValue=function(v,s){var k=this.getBuilder();var p=s||{};p.value=v;var t=F.create(this).hasType("sap.m.NumericContent").hasProperties(p);var d=s?U.formatMessage("Checking card header value '{0}' in state '{1}'",v,s):U.formatMessage("Checking card header value '{0}'",v);return this.prepareResult(k.doOnKPICardHeader(t,true).description("Checking card header: "+d).execute());};a.prototype.iSeeSideIndicator=function(t,v,u){var k=this.getBuilder();var i=F.create(this).hasType("sap.f.cards.NumericSideIndicator").hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:t})).hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:v})).hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:u}));return this.prepareResult(k.doOnKPICardHeader(i,true).description("Checking card side indicator: "+t+" - "+v+" - "+u).execute());};a.prototype.iSeeChart=function(p){var k=this.getBuilder();var c=p&&Object.keys(p).length?F.create(this).hasProperties(p):undefined;var d=c?U.formatMessage("Checking card chart with properties '{0}'",p):U.formatMessage("Checking card chart");return this.prepareResult(k.doOnKPICardChart(c).description(d).execute());};return a;});
+sap.ui.define(["./KPICardAPI","sap/fe/test/Utils","sap/fe/test/builder/FEBuilder"],function(K,U,F){"use strict";var a=function(b){return K.call(this,b);};a.prototype=Object.create(K.prototype);a.prototype.constructor=a;a.prototype.isAction=false;a.prototype.iSeeHeaderTitle=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-title");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card title: "+t).execute());};a.prototype.iSeeHeaderSubtitle=function(s){var k=this.getBuilder();var t=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-subtitle");}).hasProperties({text:s});return this.prepareResult(k.doOnKPICardHeader(t,true).description("Checking card sub-title: "+s).execute());};a.prototype.iSeeHeaderUnit=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-unitOfMeasurement");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card unit: "+t).execute());};a.prototype.iSeeHeaderDetails=function(t){var k=this.getBuilder();var T=F.create(this).hasType("sap.m.Text").has(function(c){return c.getId().endsWith("-details");}).hasProperties({text:t});return this.prepareResult(k.doOnKPICardHeader(T,true).description("Checking card details: "+t).execute());};a.prototype.iSeeHeaderValue=function(v,s){var k=this.getBuilder();var p=s||{};p.number=v;var t=F.create(this).hasType("sap.f.cards.NumericIndicators").hasProperties(p);var d=s?U.formatMessage("Checking card header value '{0}' in state '{1}'",v,s):U.formatMessage("Checking card header value '{0}'",v);return this.prepareResult(k.doOnKPICardHeader(t,true).description("Checking card header: "+d).execute());};a.prototype.iSeeSideIndicator=function(t,v,u){var k=this.getBuilder();var i=F.create(this).hasType("sap.f.cards.NumericIndicators").hasChildren(F.create(this).hasType("sap.f.cards.NumericSideIndicator").hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:t})).hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:t})).hasChildren(F.create(this).hasType("sap.m.Text").hasProperties({text:v})));return this.prepareResult(k.doOnKPICardHeader(i,true).description("Checking card side indicator: "+t+" - "+v+" - "+u).execute());};a.prototype.iSeeChart=function(p){var k=this.getBuilder();var c=p&&Object.keys(p).length?F.create(this).hasProperties(p):undefined;var d=c?U.formatMessage("Checking card chart with properties '{0}'",p):U.formatMessage("Checking card chart");return this.prepareResult(k.doOnKPICardChart(c).description(d).execute());};return a;});

package/packages/sap.fe.test/src/sap/fe/test/api/TableAssertions-dbg.js

@@ -692,6 +692,17 @@ sap.ui.define(
 			);
 		};
 
+		TableAssertions.prototype.iCheckTitle = function(sTitle) {
+			var oTableBuilder = this.getBuilder();
+
+			return this.prepareResult(
+				oTableBuilder
+					.hasTitle(sTitle)
+					.description(Utils.formatMessage("Checking table '{0}' has title '{1}'", this.getIdentifier(), sTitle))
+					.execute()
+			);
+		};
+
 		return TableAssertions;
 	}
 );

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./TableAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/fe/test/builder/MdcTableBuilder","sap/fe/test/builder/MdcFilterFieldBuilder","sap/ui/core/SortOrder","./APIHelper"],function(T,U,O,F,a,b,S,A){"use strict";var c=function(B,t){return T.call(this,B,t);};c.prototype=Object.create(T.prototype);c.prototype.constructor=c;c.prototype.isAction=false;c.prototype.iCheckState=function(s){var t=this.getBuilder();return this.prepareResult(t.hasState(s).description(U.formatMessage("Checking table '{0}' in state '{1}'",this.getIdentifier(),s)).execute());};c.prototype.iCheckRows=function(r,e,s,E){var d=U.parseArguments([Object,Number,Object,Array],arguments),n=d[1],R=T.createRowMatchers(d[0],d[2],undefined,d[3]),t=this.getBuilder();if(R.length){t.hasRows(R,true).has(function(f){return U.isOfType(n,Number)?f.length===n:f.length>0;});}else{t.hasNumberOfRows(n).hasRows(null,true);}return this.prepareResult(t.description(U.formatMessage("Checking table '{0}' having {1} rows with values='{2}', state='{3}' and empty columns='{4}'",this.getIdentifier(),n===undefined?"> 0":n,d[0],d[2],d[3])).execute());};c.prototype.iCheckCreationRow=function(r,s){var t=this.getBuilder();return this.prepareResult(t.has(O.Matchers.childrenMatcher(F.create(this).hasType("sap.ui.table.CreationRow").has(a.Row.Matchers.cellValues(r)).hasState(s))).description(U.formatMessage("Checking table '{0}' having a CreationRow with values='{1}' and state='{2}'",this.getIdentifier(),r,s)).execute());};c.prototype.iCheckQuickFilterItems=function(e){return this.prepareResult(this.getBuilder().hasQuickFilterItems(e).description(U.formatMessage("Checking table '{0}' having  '{1}' item(s)",this.getIdentifier(),e)).execute());};c.prototype.iCheckColumns=function(e,C){var d=U.parseArguments([Number,Object],arguments),m=d[1],n=d[0],t=this.getBuilder();if(n!==undefined){t.hasAggregationLength("columns",n);}else{t.hasAggregation("columns");}t.hasColumns(m);return this.prepareResult(t.description(U.formatMessage("Checking table '{0}' having {1} columns and column states='{2}'",this.getIdentifier(),n===undefined?"> 0":n,m)).execute());};c.prototype.iCheckCells=function(r,C){var R=arguments.length>1?arguments[0]:undefined,m=arguments.length>1?arguments[1]:arguments[0],d=T.createRowMatchers(R,a.Row.Matchers.cellProperties(m)),t=this.getBuilder();return this.prepareResult(t.hasRows(d).description(U.formatMessage("Checking table '{0}' having cells properties '{2}' of rows with values '{1}'",this.getIdentifier(),R,m)).execute());};c.prototype.iCheckAction=function(v,s){var t=this.getBuilder(),d=this.createActionMatcher(v),e=F.Matchers.deepAggregationMatcher("actions/action",[d,F.Matchers.states(s)]);if(s&&s.visible===false){e=O.Matchers.some(e,O.Matchers.not(F.Matchers.deepAggregationMatcher("actions/action",d)));}return this.prepareResult(t.has(e).description(U.formatMessage("Checking table '{0}' having action '{1}' with state='{2}'",this.getIdentifier(),v.service==="StandardAction"?v.action:v,s)).execute());};c.prototype.iCheckMenuAction=function(v){return this.prepareResult(A.createMenuActionCheckBuilder(v).execute());};c.prototype.iCheckDelete=function(s){return this.iCheckAction({service:"StandardAction",action:"Delete",unbound:true},s);};c.prototype.iCheckSearchField=function(s,m){var d=U.parseArguments([String,Object],arguments),t=this.getBuilder();return this.prepareResult(t.hasSearchField(s,m).description(U.formatMessage("Checking the search field on table '{0}' having search text '{1}' and state='{2}'",this.getIdentifier(),d[0]||"",d[1])).execute());};c.prototype.iCheckCreate=function(s){return this.iCheckAction({service:"StandardAction",action:"Create",unbound:true},s);};c.prototype.iCheckPaste=function(s){return this.iCheckAction({service:"StandardAction",action:"Paste",unbound:true},s);};c.prototype.iCheckFullScreen=function(s){return this.iCheckAction({service:"StandardAction",action:"FullScreen",unbound:true},s);};c.prototype._iCheckTableProvidedAction=function(p){var t=this.getBuilder();return this.prepareResult(t["has"+p]().description(U.formatMessage("Checking table '{0}' having button available for '{1}'",this.getIdentifier(),p)).execute());};c.prototype.iCheckColumnAdaptation=function(){return this._iCheckTableProvidedAction("ColumnAdaptation");};c.prototype.iCheckColumnSorting=function(){this.iOpenColumnSorting();a.createSortingDialogBuilder(this.getOpaInstance()).execute();return this.iConfirmColumnSorting();};c.prototype.iCheckColumnFiltering=function(){this.iOpenFilterDialog();a.createFilteringDialogBuilder(this.getOpaInstance()).execute();return this.iConfirmFilterDialog();};c.prototype.iCheckExport=function(){return this._iCheckTableProvidedAction("ColumnExport");};c.prototype.iCheckQuickFilter=function(s){var t=this.getBuilder();return this.prepareResult(t.hasAggregation("quickFilter",F.Matchers.states(s)).description(U.formatMessage("Checking that table '{0}' has a QuickFilter Control with state='{1}'",this.getIdentifier(),s)).execute());};c.prototype.iCheckColumnAdaptationDialog=function(){var o=a.createAdaptationDialogBuilder(this.getOpaInstance());return this.prepareResult(o.description(U.formatMessage("Checking column adaptation dialog for table '{0}'",this.getIdentifier())).execute());};c.prototype.iCheckAdaptationColumn=function(C,s){return this.columnAdaptation(C,s,undefined,U.formatMessage("Checking adaptation column '{1}' on table '{0}' for state='{2}'",this.getIdentifier(),C,s));};c.prototype.iCheckSortOrder=function(C,s,d){var e=U.parseArguments([[String,Object],String,Boolean],arguments);s=e[1]||S.Ascending;d=e[2];var D=U.formatMessage("Checking column '{1}' on table '{0}' to be sorted '{2}'",this.getIdentifier(),C,s);if(d){var m={};m.sortOrder=s;return this.columnSorting(C,m,undefined,D);}var f={};f[U.isOfType(C,Object)?C.name:C]={sortOrder:s};return this.prepareResult(this.getBuilder().hasColumns(f).description(D).execute());};c.prototype.iCheckFilterField=function(C,s){var f=b.create(this.getOpaInstance()).isDialogElement().hasType("sap.ui.mdc.FilterField").description(U.formatMessage("Checking the filter field '{0}' of table '{1}' in state '{2}'",C,this.getIdentifier(),s)),o=U.isOfType(C,String)?O.Matchers.properties({label:C}):O.Matchers.properties({fieldPath:C.name}),d,e=s&&s.visible===false,g=this.iOpenFilterDialog.bind(this),h=this.iConfirmFilterDialog.bind(this);if(e){f.check(function(i){return i.every(function(j){return O.Matchers.not(o)(j);});});}else{f.has(o).checkNumberOfMatches(1);if(!U.isOfType(s,[null,undefined])){f.hasState(s);}}return this.prepareResult(F.create(this.getOpaInstance()).success(function(){d=F.controlsExist(f);if(!d){g();f.success(h);}return f.execute();}).execute());};c.prototype.iCheckMessageStrip=function(p){var t=this.getBuilder();return this.prepareResult(t.has(O.Matchers.childrenMatcher(F.create(this).hasType("sap.m.MessageStrip").hasProperties(p))).description(U.formatMessage("Checking table '{0}' having a MessageStrip with text ='{1}' and type ='{2}'",this.getIdentifier(),p.text,p.type)).execute());};c.prototype.iCheckGroupByColumn=function(C,e,f){var t=this.getBuilder(),v=U.isOfType(C,Object)?C.name:C;return this.prepareResult(t.hasGroupByColumn(v,f,e).description(U.formatMessage("Checking table '{0}' having {1} groupBy options for {2}{3}",this.getIdentifier(),e===undefined?"any":e,C,f?"/"+f:"")).execute());};c.prototype.iCheckAggregationColumn=function(C,e,f){var t=this.getBuilder(),v=U.isOfType(C,Object)?C.name:C;return this.prepareResult(t.hasAggregationColumn(v,f,e).description(U.formatMessage("Checking table '{0}' having {1} aggregate options for {2}{3}",this.getIdentifier(),e===undefined?"any":e,C,f?"/"+f:"")).execute());};return c;});
+sap.ui.define(["./TableAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/fe/test/builder/MdcTableBuilder","sap/fe/test/builder/MdcFilterFieldBuilder","sap/ui/core/SortOrder","./APIHelper"],function(T,U,O,F,a,b,S,A){"use strict";var c=function(B,t){return T.call(this,B,t);};c.prototype=Object.create(T.prototype);c.prototype.constructor=c;c.prototype.isAction=false;c.prototype.iCheckState=function(s){var t=this.getBuilder();return this.prepareResult(t.hasState(s).description(U.formatMessage("Checking table '{0}' in state '{1}'",this.getIdentifier(),s)).execute());};c.prototype.iCheckRows=function(r,e,s,E){var d=U.parseArguments([Object,Number,Object,Array],arguments),n=d[1],R=T.createRowMatchers(d[0],d[2],undefined,d[3]),t=this.getBuilder();if(R.length){t.hasRows(R,true).has(function(f){return U.isOfType(n,Number)?f.length===n:f.length>0;});}else{t.hasNumberOfRows(n).hasRows(null,true);}return this.prepareResult(t.description(U.formatMessage("Checking table '{0}' having {1} rows with values='{2}', state='{3}' and empty columns='{4}'",this.getIdentifier(),n===undefined?"> 0":n,d[0],d[2],d[3])).execute());};c.prototype.iCheckCreationRow=function(r,s){var t=this.getBuilder();return this.prepareResult(t.has(O.Matchers.childrenMatcher(F.create(this).hasType("sap.ui.table.CreationRow").has(a.Row.Matchers.cellValues(r)).hasState(s))).description(U.formatMessage("Checking table '{0}' having a CreationRow with values='{1}' and state='{2}'",this.getIdentifier(),r,s)).execute());};c.prototype.iCheckQuickFilterItems=function(e){return this.prepareResult(this.getBuilder().hasQuickFilterItems(e).description(U.formatMessage("Checking table '{0}' having  '{1}' item(s)",this.getIdentifier(),e)).execute());};c.prototype.iCheckColumns=function(e,C){var d=U.parseArguments([Number,Object],arguments),m=d[1],n=d[0],t=this.getBuilder();if(n!==undefined){t.hasAggregationLength("columns",n);}else{t.hasAggregation("columns");}t.hasColumns(m);return this.prepareResult(t.description(U.formatMessage("Checking table '{0}' having {1} columns and column states='{2}'",this.getIdentifier(),n===undefined?"> 0":n,m)).execute());};c.prototype.iCheckCells=function(r,C){var R=arguments.length>1?arguments[0]:undefined,m=arguments.length>1?arguments[1]:arguments[0],d=T.createRowMatchers(R,a.Row.Matchers.cellProperties(m)),t=this.getBuilder();return this.prepareResult(t.hasRows(d).description(U.formatMessage("Checking table '{0}' having cells properties '{2}' of rows with values '{1}'",this.getIdentifier(),R,m)).execute());};c.prototype.iCheckAction=function(v,s){var t=this.getBuilder(),d=this.createActionMatcher(v),e=F.Matchers.deepAggregationMatcher("actions/action",[d,F.Matchers.states(s)]);if(s&&s.visible===false){e=O.Matchers.some(e,O.Matchers.not(F.Matchers.deepAggregationMatcher("actions/action",d)));}return this.prepareResult(t.has(e).description(U.formatMessage("Checking table '{0}' having action '{1}' with state='{2}'",this.getIdentifier(),v.service==="StandardAction"?v.action:v,s)).execute());};c.prototype.iCheckMenuAction=function(v){return this.prepareResult(A.createMenuActionCheckBuilder(v).execute());};c.prototype.iCheckDelete=function(s){return this.iCheckAction({service:"StandardAction",action:"Delete",unbound:true},s);};c.prototype.iCheckSearchField=function(s,m){var d=U.parseArguments([String,Object],arguments),t=this.getBuilder();return this.prepareResult(t.hasSearchField(s,m).description(U.formatMessage("Checking the search field on table '{0}' having search text '{1}' and state='{2}'",this.getIdentifier(),d[0]||"",d[1])).execute());};c.prototype.iCheckCreate=function(s){return this.iCheckAction({service:"StandardAction",action:"Create",unbound:true},s);};c.prototype.iCheckPaste=function(s){return this.iCheckAction({service:"StandardAction",action:"Paste",unbound:true},s);};c.prototype.iCheckFullScreen=function(s){return this.iCheckAction({service:"StandardAction",action:"FullScreen",unbound:true},s);};c.prototype._iCheckTableProvidedAction=function(p){var t=this.getBuilder();return this.prepareResult(t["has"+p]().description(U.formatMessage("Checking table '{0}' having button available for '{1}'",this.getIdentifier(),p)).execute());};c.prototype.iCheckColumnAdaptation=function(){return this._iCheckTableProvidedAction("ColumnAdaptation");};c.prototype.iCheckColumnSorting=function(){this.iOpenColumnSorting();a.createSortingDialogBuilder(this.getOpaInstance()).execute();return this.iConfirmColumnSorting();};c.prototype.iCheckColumnFiltering=function(){this.iOpenFilterDialog();a.createFilteringDialogBuilder(this.getOpaInstance()).execute();return this.iConfirmFilterDialog();};c.prototype.iCheckExport=function(){return this._iCheckTableProvidedAction("ColumnExport");};c.prototype.iCheckQuickFilter=function(s){var t=this.getBuilder();return this.prepareResult(t.hasAggregation("quickFilter",F.Matchers.states(s)).description(U.formatMessage("Checking that table '{0}' has a QuickFilter Control with state='{1}'",this.getIdentifier(),s)).execute());};c.prototype.iCheckColumnAdaptationDialog=function(){var o=a.createAdaptationDialogBuilder(this.getOpaInstance());return this.prepareResult(o.description(U.formatMessage("Checking column adaptation dialog for table '{0}'",this.getIdentifier())).execute());};c.prototype.iCheckAdaptationColumn=function(C,s){return this.columnAdaptation(C,s,undefined,U.formatMessage("Checking adaptation column '{1}' on table '{0}' for state='{2}'",this.getIdentifier(),C,s));};c.prototype.iCheckSortOrder=function(C,s,d){var e=U.parseArguments([[String,Object],String,Boolean],arguments);s=e[1]||S.Ascending;d=e[2];var D=U.formatMessage("Checking column '{1}' on table '{0}' to be sorted '{2}'",this.getIdentifier(),C,s);if(d){var m={};m.sortOrder=s;return this.columnSorting(C,m,undefined,D);}var f={};f[U.isOfType(C,Object)?C.name:C]={sortOrder:s};return this.prepareResult(this.getBuilder().hasColumns(f).description(D).execute());};c.prototype.iCheckFilterField=function(C,s){var f=b.create(this.getOpaInstance()).isDialogElement().hasType("sap.ui.mdc.FilterField").description(U.formatMessage("Checking the filter field '{0}' of table '{1}' in state '{2}'",C,this.getIdentifier(),s)),o=U.isOfType(C,String)?O.Matchers.properties({label:C}):O.Matchers.properties({fieldPath:C.name}),d,e=s&&s.visible===false,g=this.iOpenFilterDialog.bind(this),h=this.iConfirmFilterDialog.bind(this);if(e){f.check(function(i){return i.every(function(j){return O.Matchers.not(o)(j);});});}else{f.has(o).checkNumberOfMatches(1);if(!U.isOfType(s,[null,undefined])){f.hasState(s);}}return this.prepareResult(F.create(this.getOpaInstance()).success(function(){d=F.controlsExist(f);if(!d){g();f.success(h);}return f.execute();}).execute());};c.prototype.iCheckMessageStrip=function(p){var t=this.getBuilder();return this.prepareResult(t.has(O.Matchers.childrenMatcher(F.create(this).hasType("sap.m.MessageStrip").hasProperties(p))).description(U.formatMessage("Checking table '{0}' having a MessageStrip with text ='{1}' and type ='{2}'",this.getIdentifier(),p.text,p.type)).execute());};c.prototype.iCheckGroupByColumn=function(C,e,f){var t=this.getBuilder(),v=U.isOfType(C,Object)?C.name:C;return this.prepareResult(t.hasGroupByColumn(v,f,e).description(U.formatMessage("Checking table '{0}' having {1} groupBy options for {2}{3}",this.getIdentifier(),e===undefined?"any":e,C,f?"/"+f:"")).execute());};c.prototype.iCheckAggregationColumn=function(C,e,f){var t=this.getBuilder(),v=U.isOfType(C,Object)?C.name:C;return this.prepareResult(t.hasAggregationColumn(v,f,e).description(U.formatMessage("Checking table '{0}' having {1} aggregate options for {2}{3}",this.getIdentifier(),e===undefined?"any":e,C,f?"/"+f:"")).execute());};c.prototype.iCheckTitle=function(t){var o=this.getBuilder();return this.prepareResult(o.hasTitle(t).description(U.formatMessage("Checking table '{0}' has title '{1}'",this.getIdentifier(),t)).execute());};return c;});

package/packages/sap.fe.test/src/sap/fe/test/builder/KPIBuilder-dbg.js

@@ -78,10 +78,19 @@ sap.ui.define(["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/fe/test/Utils"], fu
 	};
 
 	/**
-	 * Applies a matcher to the card header content.
+	 * Clicks on the KPI card header.
+	 *
+	 * @returns {sap.fe.test.builder.KPIBuilder} This instance
+	 */
+	KPIBuilder.prototype.doClickKPICardHeader = function() {
+		return this.hasType("sap.ui.integration.cards.NumericHeader").doPress();
+	};
+
+	/**
+	 * Applies a matcher to the content of the card header.
 	 *
 	 * @param {sap.ui.test.matchers.Matcher} vMatcher The matcher to filter child items
-	 * @param {boolean} bDirectChild Specifies if the matcher shoould be applied onlmy to direct children or all descendants
+	 * @param {boolean} bDirectChild Specifies if the matcher should be applied only to direct children or all descendants
 	 * @returns {sap.fe.test.builder.KPIBuilder} This instance
 	 */
 	KPIBuilder.prototype.doOnKPICardHeader = function(vMatcher, bDirectChild) {

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FEBuilder","sap/ui/test/OpaBuilder","sap/fe/test/Utils"],function(F,O,U){"use strict";var K=function(){return F.apply(this,arguments);};K.create=function(o){return new K(o);};K.prototype=Object.create(F.prototype);K.prototype.constructor=K;K.prototype.checkKPITag=function(k,o){var t={text:k};if(o&&o.status){t.status=o.status;}var r=this.hasType("sap.m.GenericTag").hasProperties(t);if(o&&(o.number||o.unit)){var n={};if(o.number){n.number=o.number;}if(o.unit){n.unit=o.unit;}r=r.hasChildren(F.create(this).hasType("sap.m.ObjectNumber").hasProperties(n));}return r;};K.prototype.clickKPITag=function(k){var t={text:k};return this.hasType("sap.m.GenericTag").hasProperties(t).doPress();};K.prototype.checkKPICard=function(){return this.hasType("sap.m.Popover").hasChildren(F.create(this).hasType("sap.ui.integration.widgets.Card"));};K.prototype.doOnKPICardHeader=function(m,d){return this.hasType("sap.ui.integration.widgets.Card").hasChildren(F.create(this).hasType("sap.ui.integration.cards.NumericHeader").hasChildren(m,d));};K.prototype.doOnKPICardChart=function(m){var a=m?F.create(this).hasType("sap.ui.integration.cards.AnalyticalContent").hasChildren(m):F.create(this).hasType("sap.ui.integration.cards.AnalyticalContent");return this.hasType("sap.ui.integration.widgets.Card").hasChildren(a);};return K;});
+sap.ui.define(["./FEBuilder","sap/ui/test/OpaBuilder","sap/fe/test/Utils"],function(F,O,U){"use strict";var K=function(){return F.apply(this,arguments);};K.create=function(o){return new K(o);};K.prototype=Object.create(F.prototype);K.prototype.constructor=K;K.prototype.checkKPITag=function(k,o){var t={text:k};if(o&&o.status){t.status=o.status;}var r=this.hasType("sap.m.GenericTag").hasProperties(t);if(o&&(o.number||o.unit)){var n={};if(o.number){n.number=o.number;}if(o.unit){n.unit=o.unit;}r=r.hasChildren(F.create(this).hasType("sap.m.ObjectNumber").hasProperties(n));}return r;};K.prototype.clickKPITag=function(k){var t={text:k};return this.hasType("sap.m.GenericTag").hasProperties(t).doPress();};K.prototype.checkKPICard=function(){return this.hasType("sap.m.Popover").hasChildren(F.create(this).hasType("sap.ui.integration.widgets.Card"));};K.prototype.doClickKPICardHeader=function(){return this.hasType("sap.ui.integration.cards.NumericHeader").doPress();};K.prototype.doOnKPICardHeader=function(m,d){return this.hasType("sap.ui.integration.widgets.Card").hasChildren(F.create(this).hasType("sap.ui.integration.cards.NumericHeader").hasChildren(m,d));};K.prototype.doOnKPICardChart=function(m){var a=m?F.create(this).hasType("sap.ui.integration.cards.AnalyticalContent").hasChildren(m):F.create(this).hasType("sap.ui.integration.cards.AnalyticalContent");return this.hasType("sap.ui.integration.widgets.Card").hasChildren(a);};return K;});

package/packages/sap.fe.test/src/sap/fe/test/builder/MdcTableBuilder-dbg.js

@@ -237,6 +237,14 @@ sap.ui.define(
 			return this.has(TableBuilder.Matchers.columnsMatcher(mColumnMap, bIgnoreColumnState));
 		};
 
+		TableBuilder.prototype.hasTitle = function(sTitle) {
+			return this.hasChildren(
+				FEBuilder.create(this)
+					.hasType("sap.m.Title")
+					.hasProperties({ text: sTitle })
+			);
+		};
+
 		TableBuilder.prototype.hasSearchField = function(sSearchText, mState) {
 			var aArguments = Utils.parseArguments([String, Object], arguments);
 			mState = aArguments[1];
@@ -447,6 +455,13 @@ sap.ui.define(
 							.isDialogElement()
 							.hasType("sap.m.StandardListItem")
 							.checkNumberOfMatches(iExpectedNumber)
+							.success(
+								OpaBuilder.create()
+									.isDialogElement()
+									.hasType("sap.m.Button")
+									.hasProperties({ icon: "sap-icon://decline" })
+									.doPress()
+							)
 					);
 				}
 			} else {
@@ -466,6 +481,13 @@ sap.ui.define(
 						.hasType("sap.m.StandardListItem")
 						.hasProperties({ title: sFieldName })
 						.checkNumberOfMatches(iExpectedNumber)
+						.success(
+							OpaBuilder.create()
+								.isDialogElement()
+								.hasType("sap.m.Button")
+								.hasProperties({ icon: "sap-icon://decline" })
+								.doPress()
+						)
 				);
 			}