@sapui5/sap.fe.test 1.96.4 → 1.99.0

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

@@ -1,18 +1,46 @@
 /**
  * Mock class for a V4 Context
  */
-
-import { Context, ODataListBinding, ODataContextBinding, ODataMetaModel, ODataModel } from "sap/ui/model/odata/v4";
+import Event from "sap/ui/base/Event";
+import Control from "sap/ui/core/Control";
+import UI5Element from "sap/ui/core/Element";
+import Controller from "sap/ui/core/mvc/Controller";
+import View from "sap/ui/core/mvc/View";
+import Context from "sap/ui/model/odata/v4/Context";
+import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
+import ODataContextBinding from "sap/ui/model/odata/v4/ODataContextBinding";
+import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import ODataModel from "sap/ui/model/odata/v4/ODataModel";
 
 export class MockContext implements Partial<Context> {
-	public constructor(private oValues: any, private oBinding?: any) {}
+	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];
 	});
-	public getObject = jest.fn((key: string) => {
+	public setProperty = jest.fn((key: string, value: any) => {
+		this.oValues[key] = value;
 		return this.oValues[key];
 	});
+
+	public getObject = jest.fn((path: string) => {
+		const that = this as any;
+		let result = path ? that.oValues[path] : that.oValues;
+
+		if (!result && path && path.indexOf("/") > -1) {
+			const parts = path.split("/");
+			result = parts.reduce((sum, part: any) => {
+				sum = part ? sum[part] : sum;
+				return sum;
+			}, that.oValues);
+		}
+
+		return result;
+	});
 	public getPath = jest.fn(() => {
 		return this.oValues["$path"];
 	});
@@ -20,11 +48,33 @@ export class MockContext implements Partial<Context> {
 	public getBinding = jest.fn(() => {
 		return this.oBinding;
 	});
+	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> {
+	public getBindingContext: jest.Mock<any, any> = jest.fn();
+}
+
+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);
 }
 
 /**
@@ -33,7 +83,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 => {
@@ -45,6 +95,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();
@@ -58,12 +112,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);
 	}
 
@@ -73,12 +130,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;
+	});
 }
 
 /**
@@ -99,6 +162,12 @@ export class MockMetaModel implements Partial<ODataMetaModel> {
 	public getObject = jest.fn((sPath: string) => {
 		return this.oMetaContext.getProperty(sPath);
 	});
+	public requestObject = jest.fn();
+	public createBindingContext = jest.fn((sPath: string) => {
+		return (new MockContext({ $path: sPath }) as any) as Context;
+	});
+	public getMetaPath = jest.fn();
+	public getContext = jest.fn();
 }
 
 /**
@@ -108,7 +177,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 {
@@ -134,4 +210,57 @@ export class MockModel implements Partial<ODataModel> {
 	public getMetaModel = jest.fn(() => {
 		return (this.oMetaModel as any) as ODataMetaModel;
 	});
+
+	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/src/sap/fe/test/Utils.js

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -287,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/src/sap/fe/test/api/APIHelper.js

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder"], function(Utils, OpaBuilder, FEBuilder) {
 	"use strict";

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

@@ -1,15 +1,10 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (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"
-	],
+	["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";
 
@@ -18,6 +13,7 @@ sap.ui.define(
 		 *
 		 * @typedef {object} TableIdentifier
 		 * @property {string} property The name of the navigation property used for the table
+		 * @property {string} [qualifier] The name of a qualifier for the table
 		 *
 		 * @name sap.fe.test.api.TableIdentifier
 		 * @public
@@ -78,6 +74,27 @@ sap.ui.define(
 		 * @public
 		 */
 
+		/**
+		 * An dialog field identifier
+		 *
+		 * @typedef {object} DialogFieldIdentifier
+		 * @property {string} property The name of the field
+		 * In case of an action parameter dialog, this is the fieldname only
+		 * <code><pre>
+		 * {
+		 *     property: <fieldname>
+		 * }
+		 * </pre></code>
+		 * In case of a create dialog, the concatenation of the entity and fieldname has to be provided
+		 * <code><pre>
+		 * {
+		 *     property: <entity>::<fieldname>
+		 * }
+		 * </pre></code>
+		 * @name sap.fe.test.api.DialogFieldIdentifier
+		 * @public
+		 */
+
 		function _findParentChainFunction(oResult, sChainKeyword) {
 			var oAnd = oResult.and;
 			if (sChainKeyword in oAnd) {

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (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"], function(
 	BaseAPI,

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (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"],
@@ -27,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) {
@@ -56,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)
@@ -66,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)
@@ -103,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/src/sap/fe/test/api/DialogAPI.js

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -28,25 +29,30 @@ sap.ui.define(
 				throw new Error("oDialogBuilder parameter must be a DialogBuilder instance");
 			}
 			this._iConfirmButtonIndex = iConfirmButtonIndex || 0;
+			this._iConfirmDiscardDraftButtonIndex = this._iConfirmButtonIndex + 1; // second button in the list
 			return BaseAPI.call(this, oDialogBuilder, vDialogDescription);
 		};
 		DialogAPI.prototype = Object.create(BaseAPI.prototype);
 		DialogAPI.prototype.constructor = DialogAPI;
 
 		/**
-		 * Creates a matcher for fields within action dialogs.
+		 * Creates a matcher for fields within create and action dialogs.
 		 *
 		 * @param {sap.fe.test.api.FieldIdentifier | string} vFieldIdentifier Identifier to be used for the matcher
+		 * @param {object} oDialogIdentifier Identifier for the dialog (create/action)
 		 *
 		 * @returns {object} A matcher
 		 *
 		 * @private
 		 */
-		DialogAPI.prototype._createFieldMatcher = function(vFieldIdentifier) {
+		DialogAPI.prototype._createFieldMatcher = function(vFieldIdentifier, oDialogIdentifier) {
 			var vMatcher, sFieldId;
 			if (!Utils.isOfType(vFieldIdentifier, String)) {
 				if (typeof vFieldIdentifier.property === "string") {
-					sFieldId = "APD_::" + vFieldIdentifier.property.replaceAll("/", "::");
+					sFieldId =
+						oDialogIdentifier && oDialogIdentifier.type === "Create"
+							? "CreateDialog::" + vFieldIdentifier.property.replaceAll("/", "::")
+							: "APD_::" + vFieldIdentifier.property.replaceAll("/", "::");
 				} else {
 					throw new Error(
 						"The 'property' parameter for creating a control ID for a field in an action dialog is not supported: " +
@@ -61,12 +67,12 @@ sap.ui.define(
 			return vMatcher;
 		};
 
-		DialogAPI.prototype._createFieldBuilder = function(vFieldIdentifier) {
+		DialogAPI.prototype._createFieldBuilder = function(vFieldIdentifier, oDialogIdentifier) {
 			var oMdcFieldBuilder = new MdcFieldBuilder(this.getOpaInstance());
 			return oMdcFieldBuilder
 				.isDialogElement()
 				.hasType("sap.ui.mdc.Field")
-				.has(this._createFieldMatcher(vFieldIdentifier));
+				.has(this._createFieldMatcher(vFieldIdentifier, oDialogIdentifier));
 		};
 
 		DialogAPI.prototype._getConfirmButtonMatcher = function() {
@@ -82,8 +88,19 @@ sap.ui.define(
 			var iConfirmButtonIndex = this._iConfirmButtonIndex;
 			return function(oButton) {
 				var aButtons = oButton.getParent().getButtons();
-				// Cancel is (usually) right next to the first (confirm) button
-				return aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex + 1);
+				// Cancel is (usually) right next to the first (confirm) button and (usually) the last one in the list
+				return aButtons.length > 2
+					? aButtons.indexOf(oButton) === aButtons.length - 1
+					: aButtons.indexOf(oButton) === Math.min(aButtons.length - 1, iConfirmButtonIndex + 1);
+			};
+		};
+
+		DialogAPI.prototype._getConfirmDiscardDraftButtonMatcher = function() {
+			var iConfirmDiscardDraftButtonIndex = this._iConfirmDiscardDraftButtonIndex;
+			return function(oButton) {
+				var aButtons = oButton.getParent().getButtons();
+				// for the KeepDraft/DiscardDraft message, the DiscardDraft button is the second in the list
+				return aButtons.indexOf(oButton) === iConfirmDiscardDraftButtonIndex;
 			};
 		};
 

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogAPI, Utils, OpaBuilder) {
 	"use strict";
@@ -70,22 +71,22 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 	};
 
 	/**
-	 * Changes the content of a field in an action parameter dialog.
+	 * Changes the content of a field in a dialog.
 	 *
-	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {sap.fe.test.api.DialogFieldIdentifier} vFieldIdentifier The identifier of the field
 	 * @param {string} [vValue] The new target value.
 	 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set filters, otherwise all previously set values will be kept
 	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
 	 * @public
 	 */
-	DialogActions.prototype.iChangeActionParameterDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
+	DialogActions.prototype.iChangeDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
 		var aArguments = Utils.parseArguments([Object, String, Boolean], arguments);
 		return this.prepareResult(
-			this._createFieldBuilder(vFieldIdentifier)
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
 				.doChangeValue(aArguments[1], aArguments[2])
 				.description(
 					Utils.formatMessage(
-						"Changing the field '{1}' of action parameter dialog '{0}' by adding '{2}' (was cleared first: {3})",
+						"Changing the field '{1}' of dialog '{0}' by adding '{2}' (was cleared first: {3})",
 						this.getIdentifier(),
 						aArguments[0],
 						aArguments[1],
@@ -96,5 +97,18 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], fu
 		);
 	};
 
+	/**
+	 * Changes the content of a field in an action parameter dialog.
+	 *
+	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string} [vValue] The new target value.
+	 * @param {boolean} [bClearFirst] Set to <code>true</code> to clear previously set filters, otherwise all previously set values will be kept
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
+	 * @public
+	 */
+	DialogActions.prototype.iChangeActionParameterDialogField = function(vFieldIdentifier, vValue, bClearFirst) {
+		return this.iChangeDialogField(vFieldIdentifier, vValue, bClearFirst);
+	};
+
 	return DialogActions;
 });

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	"use strict";
@@ -86,9 +87,9 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	};
 
 	/**
-	 * Checks the content and state of a field in an action parameter dialog.
+	 * Checks the content and state of a field in a dialog.
 	 *
-	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {sap.fe.test.api.DialogFieldIdentifier} vFieldIdentifier The identifier of the field
 	 * @param {string | Array | object} [vValue] Expected value(s) of the field.
 	 * if passed as an object, the following pattern will be considered:
 	 * <code><pre>
@@ -100,15 +101,16 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 	 * @public
 	 */
-	DialogAssertions.prototype.iCheckActionParameterDialogField = function(vFieldIdentifier, vValue, mState) {
+	DialogAssertions.prototype.iCheckDialogField = function(vFieldIdentifier, vValue, mState) {
 		var aArguments = Utils.parseArguments([Object, [String, Array, Object], Object], arguments);
 		return this.prepareResult(
-			this._createFieldBuilder(vFieldIdentifier)
+			this._createFieldBuilder(vFieldIdentifier, this.getIdentifier())
 				.hasValue(aArguments[1])
 				.hasState(aArguments[2])
 				.description(
 					Utils.formatMessage(
-						"Checking field '{0}' with content '{1}' and state '{2}'",
+						"Checking field '{1}' of dialog '{0}' with content '{2}' and state '{3}'",
+						this.getIdentifier(),
 						aArguments[0],
 						aArguments[1],
 						aArguments[2]
@@ -118,5 +120,24 @@ sap.ui.define(["./DialogAPI", "sap/fe/test/Utils"], function(DialogAPI, Utils) {
 		);
 	};
 
+	/**
+	 * Checks the content and state of a field in an action parameter dialog.
+	 *
+	 * @param {sap.fe.test.api.ActionDialogFieldIdentifier} vFieldIdentifier The identifier of the field
+	 * @param {string | Array | object} [vValue] Expected value(s) of the field.
+	 * if passed as an object, the following pattern will be considered:
+	 * <code><pre>
+	 * {
+	 *     value: <string>, 		// optional
+	 * }
+	 * </pre></code>
+	 * @param {object} [mState] Defines the expected state of the field
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+	 * @public
+	 */
+	DialogAssertions.prototype.iCheckActionParameterDialogField = function(vFieldIdentifier, vValue, mState) {
+		return this.iCheckDialogField(vFieldIdentifier, vValue, mState);
+	};
+
 	return DialogAssertions;
 });

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogActions, Utils, OpaBuilder) {
 	"use strict";
@@ -18,7 +19,7 @@ sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"]
 	 * @public
 	 */
 	var DialogCreateActions = function(oDialogBuilder, vDialogDescription) {
-		return DialogActions.call(this, oDialogBuilder, vDialogDescription, 1);
+		return DialogActions.call(this, oDialogBuilder, vDialogDescription, 0);
 	};
 	DialogCreateActions.prototype = Object.create(DialogActions.prototype);
 	DialogCreateActions.prototype.constructor = DialogCreateActions;

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/builder/FEBuilder", "sap/fe/test/Utils"], function(
 	DialogAssertions,
@@ -23,7 +24,7 @@ sap.ui.define(["./DialogAssertions", "sap/ui/test/OpaBuilder", "sap/fe/test/buil
 	 * @public
 	 */
 	var DialogCreateAssertions = function(oDialogBuilder, vDialogDescription) {
-		return DialogAssertions.call(this, oDialogBuilder, vDialogDescription, 1);
+		return DialogAssertions.call(this, oDialogBuilder, vDialogDescription, 0);
 	};
 	DialogCreateAssertions.prototype = Object.create(DialogAssertions.prototype);
 	DialogCreateAssertions.prototype.constructor = DialogCreateAssertions;

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

@@ -1,6 +1,7 @@
 /*
- * ! SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * ! SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"], function(DialogActions, Utils, OpaBuilder) {
 	"use strict";
@@ -18,7 +19,7 @@ sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"]
 	 * @public
 	 */
 	var DialogMessageActions = function(oDialogBuilder, vDialogDescription) {
-		return DialogActions.call(this, oDialogBuilder, vDialogDescription, 1);
+		return DialogActions.call(this, oDialogBuilder, vDialogDescription, 0);
 	};
 	DialogMessageActions.prototype = Object.create(DialogActions.prototype);
 	DialogMessageActions.prototype.constructor = DialogMessageActions;
@@ -54,5 +55,20 @@ sap.ui.define(["./DialogActions", "sap/fe/test/Utils", "sap/ui/test/OpaBuilder"]
 		);
 	};
 
+	/**
+	 * Confirms the draft message with Discard Draft when navigating back to the list-report.
+	 *
+	 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+	 * @public
+	 */
+	DialogMessageActions.prototype.iConfirmDiscardDraft = function() {
+		return this.prepareResult(
+			this.getBuilder()
+				.doPressFooterButton(this._getConfirmDiscardDraftButtonMatcher())
+				.description(Utils.formatMessage("Confirming dialog '{0}' with Discard Draft", this.getIdentifier()))
+				.execute()
+		);
+	};
+
 	return DialogMessageActions;
 });