@sap/open.fe 1.96.0 → 1.97.0

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

@@ -71,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],
@@ -97,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/packages/sap.fe.test/src/sap/fe/test/api/DialogActions.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./DialogAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder"],function(D,U,O){"use strict";var a=function(d,v,c){return D.call(this,d,v,c);};a.prototype=Object.create(D.prototype);a.prototype.constructor=a;a.prototype.isAction=true;a.prototype.iConfirm=function(){return this.prepareResult(this.getBuilder().doPressFooterButton(this._getConfirmButtonMatcher()).description(U.formatMessage("Confirming dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iCancel=function(){return this.prepareResult(this.getBuilder().doPressFooterButton(this._getCancelButtonMatcher()).description(U.formatMessage("Cancelling dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iClose=function(){return this.prepareResult(this.getBuilder().doPressKeyboardShortcut("Escape").description(U.formatMessage("Closing dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iChangeActionParameterDialogField=function(f,v,c){var A=U.parseArguments([Object,String,Boolean],arguments);return this.prepareResult(this._createFieldBuilder(f).doChangeValue(A[1],A[2]).description(U.formatMessage("Changing the field '{1}' of action parameter dialog '{0}' by adding '{2}' (was cleared first: {3})",this.getIdentifier(),A[0],A[1],!!A[2])).execute());};return a;});
+sap.ui.define(["./DialogAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder"],function(D,U,O){"use strict";var a=function(d,v,c){return D.call(this,d,v,c);};a.prototype=Object.create(D.prototype);a.prototype.constructor=a;a.prototype.isAction=true;a.prototype.iConfirm=function(){return this.prepareResult(this.getBuilder().doPressFooterButton(this._getConfirmButtonMatcher()).description(U.formatMessage("Confirming dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iCancel=function(){return this.prepareResult(this.getBuilder().doPressFooterButton(this._getCancelButtonMatcher()).description(U.formatMessage("Cancelling dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iClose=function(){return this.prepareResult(this.getBuilder().doPressKeyboardShortcut("Escape").description(U.formatMessage("Closing dialog '{0}'",this.getIdentifier())).execute());};a.prototype.iChangeDialogField=function(f,v,c){var A=U.parseArguments([Object,String,Boolean],arguments);return this.prepareResult(this._createFieldBuilder(f,this.getIdentifier()).doChangeValue(A[1],A[2]).description(U.formatMessage("Changing the field '{1}' of dialog '{0}' by adding '{2}' (was cleared first: {3})",this.getIdentifier(),A[0],A[1],!!A[2])).execute());};a.prototype.iChangeActionParameterDialogField=function(f,v,c){return this.iChangeDialogField(f,v,c);};return a;});

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

@@ -87,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>
@@ -101,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]
@@ -119,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/packages/sap.fe.test/src/sap/fe/test/api/DialogAssertions.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./DialogAPI","sap/fe/test/Utils"],function(D,U){"use strict";var a=function(d,v,c){return D.call(this,d,v,c);};a.prototype=Object.create(D.prototype);a.prototype.constructor=a;a.prototype.isAction=false;a.prototype.iCheckState=function(d){return this.prepareResult(this.getBuilder().hasState(d).description(U.formatMessage("Checking dialog '{0}' in state '{1}'",this.getIdentifier(),d)).execute());};a.prototype.iCheckConfirm=function(b){return this.prepareResult(this.getBuilder().hasFooterButton(this._getConfirmButtonMatcher(),b).description(U.formatMessage("Checking dialog '{0}' having confirmation button with state '{1}'",this.getIdentifier(),b)).execute());};a.prototype.iCheckCancel=function(b){return this.prepareResult(this.getBuilder().hasFooterButton(this._getCancelButtonMatcher(),b).description(U.formatMessage("Checking dialog '{0}' having cancellation button with state '{1}'",this.getIdentifier(),b)).execute());};a.prototype.iCheckActionParameterDialogField=function(f,v,s){var A=U.parseArguments([Object,[String,Array,Object],Object],arguments);return this.prepareResult(this._createFieldBuilder(f).hasValue(A[1]).hasState(A[2]).description(U.formatMessage("Checking field '{0}' with content '{1}' and state '{2}'",A[0],A[1],A[2])).execute());};return a;});
+sap.ui.define(["./DialogAPI","sap/fe/test/Utils"],function(D,U){"use strict";var a=function(d,v,c){return D.call(this,d,v,c);};a.prototype=Object.create(D.prototype);a.prototype.constructor=a;a.prototype.isAction=false;a.prototype.iCheckState=function(d){return this.prepareResult(this.getBuilder().hasState(d).description(U.formatMessage("Checking dialog '{0}' in state '{1}'",this.getIdentifier(),d)).execute());};a.prototype.iCheckConfirm=function(b){return this.prepareResult(this.getBuilder().hasFooterButton(this._getConfirmButtonMatcher(),b).description(U.formatMessage("Checking dialog '{0}' having confirmation button with state '{1}'",this.getIdentifier(),b)).execute());};a.prototype.iCheckCancel=function(b){return this.prepareResult(this.getBuilder().hasFooterButton(this._getCancelButtonMatcher(),b).description(U.formatMessage("Checking dialog '{0}' having cancellation button with state '{1}'",this.getIdentifier(),b)).execute());};a.prototype.iCheckDialogField=function(f,v,s){var A=U.parseArguments([Object,[String,Array,Object],Object],arguments);return this.prepareResult(this._createFieldBuilder(f,this.getIdentifier()).hasValue(A[1]).hasState(A[2]).description(U.formatMessage("Checking field '{1}' of dialog '{0}' with content '{2}' and state '{3}'",this.getIdentifier(),A[0],A[1],A[2])).execute());};a.prototype.iCheckActionParameterDialogField=function(f,v,s){return this.iCheckDialogField(f,v,s);};return a;});

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

@@ -33,6 +33,15 @@ sap.ui.define(
 			 * @type {string}
 			 * @public
 			 */
+			AllHidingDrafts: EditState.ALL_HIDING_DRAFTS.id,
+			/**
+			 * All (Hiding Drafts)
+			 *
+			 * @name sap.fe.test.api.EditState.AllHidingDrafts
+			 * @constant
+			 * @type {string}
+			 * @public
+			 */
 			Unchanged: EditState.UNCHANGED.id,
 			/**
 			 * Own Draft

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/macros/filter/DraftEditState"],function(E){"use strict";return{All:E.ALL.id,Unchanged:E.UNCHANGED.id,OwnDraft:E.OWN_DRAFT.id,Locked:E.LOCKED.id,UnsavedChanges:E.UNSAVED_CHANGES.id};},true);
+sap.ui.define(["sap/fe/macros/filter/DraftEditState"],function(E){"use strict";return{All:E.ALL.id,AllHidingDrafts:E.ALL_HIDING_DRAFTS.id,Unchanged:E.UNCHANGED.id,OwnDraft:E.OWN_DRAFT.id,Locked:E.LOCKED.id,UnsavedChanges:E.UNSAVED_CHANGES.id};},true);

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

@@ -235,18 +235,28 @@ sap.ui.define(
 		/**
 		 * Saves a variant under the given name, or overwrites the current variant.
 		 *
-		 * @param {string} [sVariantName] The name of the new variant. If omitted, the current variant will be overwritten.
+		 * @param {string} [sVariantName] The name of the new variant. If no new variant name is defined, the current variant will be overwritten.
+		 * @param {string} [bSetAsDefault] Saves the new variant with option "Set as Default".
+		 * @param {string} [bApplyAutomatically] Saves the new variant with option "Apply Automatically".
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 *
 		 * @public
 		 */
-		FilterBarActions.prototype.iSaveVariant = function(sVariantName) {
+		FilterBarActions.prototype.iSaveVariant = function(sVariantName, bSetAsDefault, bApplyAutomatically) {
 			var fnSuccessFunction = Utils.isOfType(sVariantName, String)
 				? function(oFilterBar) {
 						return VMBuilder.create(this)
 							.hasId(oFilterBar.getId() + "::VariantManagement")
-							.doSaveAs(sVariantName)
-							.description(Utils.formatMessage("Saving variant for '{0}' as '{1}'", this.getIdentifier(), sVariantName))
+							.doSaveAs(sVariantName, bSetAsDefault, bApplyAutomatically)
+							.description(
+								Utils.formatMessage(
+									"Saving variant for '{0}' as '{1}' with default='{2}' and applyAutomatically='{3}'",
+									this.getIdentifier(),
+									sVariantName,
+									!!bSetAsDefault,
+									!!bApplyAutomatically
+								)
+							)
 							.execute();
 				  }
 				: function(oFilterBar) {
@@ -264,6 +274,30 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Selects the chosen variant.
+		 *
+		 * @param {string} sVariantName The name of the variant to be selected
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 *
+		 * @public
+		 */
+		FilterBarActions.prototype.iSelectVariant = function(sVariantName) {
+			return this.prepareResult(
+				this.getBuilder()
+					.success(
+						function(oFilterBar) {
+							return VMBuilder.create(this)
+								.hasId(oFilterBar.getId() + "::VariantManagement")
+								.doSelectVariant(sVariantName)
+								.description(Utils.formatMessage("Selecting variant '{1}' from '{0}'", this.getIdentifier(), sVariantName))
+								.execute();
+						}.bind(this)
+					)
+					.execute()
+			);
+		};
+
 		FilterBarActions.prototype.iSelectVisualFilter = function(sVisualFilterIdentifier, sLabelValue, bIsSelected) {
 			// var that = this;
 			return this.prepareResult(

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FilterBarAPI","sap/fe/test/Utils","sap/fe/macros/filter/DraftEditState","sap/fe/test/builder/FEBuilder","sap/ui/test/Opa5","sap/ui/test/OpaBuilder","sap/fe/test/builder/VMBuilder"],function(F,U,E,a,O,b,V){"use strict";var c=function(f,v){return F.call(this,f,v);};c.prototype=Object.create(F.prototype);c.prototype.constructor=c;c.prototype.isAction=true;c.prototype.iChangeFilterField=function(f,v,C){var A=U.parseArguments([[String,Object],String,Boolean],arguments),o=F.createFilterFieldBuilder(this.getBuilder(),A[0]);return this.prepareResult(o.doChangeValue(A[1],A[2]).description(U.formatMessage("Changing the filter field '{1}' of filter bar '{0}' by adding '{2}' (was cleared first: {3})",this.getIdentifier(),A[0],A[1],!!A[2])).execute());};c.prototype.iOpenValueHelp=function(f){var o=F.createFilterFieldBuilder(this.getBuilder(),f);return this.prepareResult(o.doOpenValueHelp().description(U.formatMessage("Opening the value help for filter field '{1}' of filter bar '{0}'",this.getIdentifier(),f)).execute());};c.prototype.iChangeSearchField=function(s){var f=this.getBuilder();return this.prepareResult(f.doChangeSearch(s).description(U.formatMessage("Changing the search text on filter bar '{0}' to '{1}'",this.getIdentifier(),s||"")).execute());};c.prototype.iResetSearchField=function(){var f=this.getBuilder();return this.prepareResult(f.doResetSearch().description(U.formatMessage("Resetting the search field on filter bar '{0}'",this.getIdentifier())).execute());};c.prototype.iChangeEditingStatus=function(e){var f=this.getBuilder();return this.prepareResult(f.doChangeEditingStatus(e&&E[e]).description(U.formatMessage("Changing the editing status on filter bar '{0}' to '{1}'",this.getIdentifier(),e&&E[e].display)).execute());};c.prototype.iExecuteSearch=function(){var f=this.getBuilder();return this.prepareResult(f.doSearch().description(U.formatMessage("Executing search on filter bar '{0}'",this.getIdentifier())).execute());};c.prototype.iAddAdaptationFilterField=function(f){return this.filterFieldAdaptation(f,{selected:false},b.Actions.press("selectMulti"),U.formatMessage("Adding field '{1}' to filter bar '{0}'",this.getIdentifier(),f));};c.prototype.iRemoveAdaptationFilterField=function(f){return this.filterFieldAdaptation(f,{selected:true},b.Actions.press("selectMulti"),U.formatMessage("Removing field '{1}' to filter bar '{0}'",this.getIdentifier(),f));};c.prototype.iExecuteKeyboardShortcut=function(s,f){var B=f?F.createFilterFieldBuilder(this.getBuilder(),f):this.getBuilder();return this.prepareResult(B.doPressKeyboardShortcut(s).description(U.formatMessage("Execute keyboard shortcut '{1}' on filter bar '{0}' on field '{2}'",this.getIdentifier(),s,f)).execute());};c.prototype.iSaveVariant=function(v){var s=U.isOfType(v,String)?function(f){return V.create(this).hasId(f.getId()+"::VariantManagement").doSaveAs(v).description(U.formatMessage("Saving variant for '{0}' as '{1}'",this.getIdentifier(),v)).execute();}:function(f){return V.create(this).hasId(f.getId()+"::VariantManagement").doSave().description(U.formatMessage("Saving current variant for '{0}'",this.getIdentifier())).execute();};return this.prepareResult(this.getBuilder().success(s.bind(this)).execute());};c.prototype.iSelectVisualFilter=function(v,l,i){return this.prepareResult(b.create(this).hasType("sap.fe.core.controls.filterbar.VisualFilter").hasId(new RegExp(v,"i")).success(function(d){var o=d[0];var s;var I=o.getItems()[1].getItems()[0];var e=(I.isA("sap.suite.ui.microchart.InteractiveLineChart")&&I.getPoints())||(I.isA("sap.suite.ui.microchart.InteractiveBarChart")&&I.getBars());e.forEach(function(f){if(f.getLabel()==l){s=f;}});if(!s){s=e[0];}if(I.isA("sap.suite.ui.microchart.InteractiveLineChart")){var p=I.getSelectedPoints();return I.fireSelectionChanged({selectedPoints:p,point:s,selected:i});}else if(I.isA("sap.suite.ui.microchart.InteractiveBarChart")){var p=I.getSelectedBars();return I.fireSelectionChanged({selectedPoints:p,point:s,selected:i});}}).description("Selecting an item in "+v+" VisualFilter").execute());};c.prototype.iOpenVisualFilterValueHelp=function(v){return this.prepareResult(b.create(this).hasType("sap.fe.core.controls.filterbar.VisualFilter").hasId(new RegExp(v,"i")).success(function(d){var s=d[0].getId();b.create(this).hasType("sap.m.Button").hasId(s+"::VisualFilterValueHelpButton").doPress().execute();}).description("Open ValueHelp Dialog "+v+" VisualFilter").execute());};return c;});
+sap.ui.define(["./FilterBarAPI","sap/fe/test/Utils","sap/fe/macros/filter/DraftEditState","sap/fe/test/builder/FEBuilder","sap/ui/test/Opa5","sap/ui/test/OpaBuilder","sap/fe/test/builder/VMBuilder"],function(F,U,E,a,O,b,V){"use strict";var c=function(f,v){return F.call(this,f,v);};c.prototype=Object.create(F.prototype);c.prototype.constructor=c;c.prototype.isAction=true;c.prototype.iChangeFilterField=function(f,v,C){var A=U.parseArguments([[String,Object],String,Boolean],arguments),o=F.createFilterFieldBuilder(this.getBuilder(),A[0]);return this.prepareResult(o.doChangeValue(A[1],A[2]).description(U.formatMessage("Changing the filter field '{1}' of filter bar '{0}' by adding '{2}' (was cleared first: {3})",this.getIdentifier(),A[0],A[1],!!A[2])).execute());};c.prototype.iOpenValueHelp=function(f){var o=F.createFilterFieldBuilder(this.getBuilder(),f);return this.prepareResult(o.doOpenValueHelp().description(U.formatMessage("Opening the value help for filter field '{1}' of filter bar '{0}'",this.getIdentifier(),f)).execute());};c.prototype.iChangeSearchField=function(s){var f=this.getBuilder();return this.prepareResult(f.doChangeSearch(s).description(U.formatMessage("Changing the search text on filter bar '{0}' to '{1}'",this.getIdentifier(),s||"")).execute());};c.prototype.iResetSearchField=function(){var f=this.getBuilder();return this.prepareResult(f.doResetSearch().description(U.formatMessage("Resetting the search field on filter bar '{0}'",this.getIdentifier())).execute());};c.prototype.iChangeEditingStatus=function(e){var f=this.getBuilder();return this.prepareResult(f.doChangeEditingStatus(e&&E[e]).description(U.formatMessage("Changing the editing status on filter bar '{0}' to '{1}'",this.getIdentifier(),e&&E[e].display)).execute());};c.prototype.iExecuteSearch=function(){var f=this.getBuilder();return this.prepareResult(f.doSearch().description(U.formatMessage("Executing search on filter bar '{0}'",this.getIdentifier())).execute());};c.prototype.iAddAdaptationFilterField=function(f){return this.filterFieldAdaptation(f,{selected:false},b.Actions.press("selectMulti"),U.formatMessage("Adding field '{1}' to filter bar '{0}'",this.getIdentifier(),f));};c.prototype.iRemoveAdaptationFilterField=function(f){return this.filterFieldAdaptation(f,{selected:true},b.Actions.press("selectMulti"),U.formatMessage("Removing field '{1}' to filter bar '{0}'",this.getIdentifier(),f));};c.prototype.iExecuteKeyboardShortcut=function(s,f){var B=f?F.createFilterFieldBuilder(this.getBuilder(),f):this.getBuilder();return this.prepareResult(B.doPressKeyboardShortcut(s).description(U.formatMessage("Execute keyboard shortcut '{1}' on filter bar '{0}' on field '{2}'",this.getIdentifier(),s,f)).execute());};c.prototype.iSaveVariant=function(v,s,A){var S=U.isOfType(v,String)?function(f){return V.create(this).hasId(f.getId()+"::VariantManagement").doSaveAs(v,s,A).description(U.formatMessage("Saving variant for '{0}' as '{1}' with default='{2}' and applyAutomatically='{3}'",this.getIdentifier(),v,!!s,!!A)).execute();}:function(f){return V.create(this).hasId(f.getId()+"::VariantManagement").doSave().description(U.formatMessage("Saving current variant for '{0}'",this.getIdentifier())).execute();};return this.prepareResult(this.getBuilder().success(S.bind(this)).execute());};c.prototype.iSelectVariant=function(v){return this.prepareResult(this.getBuilder().success(function(f){return V.create(this).hasId(f.getId()+"::VariantManagement").doSelectVariant(v).description(U.formatMessage("Selecting variant '{1}' from '{0}'",this.getIdentifier(),v)).execute();}.bind(this)).execute());};c.prototype.iSelectVisualFilter=function(v,l,i){return this.prepareResult(b.create(this).hasType("sap.fe.core.controls.filterbar.VisualFilter").hasId(new RegExp(v,"i")).success(function(d){var o=d[0];var s;var I=o.getItems()[1].getItems()[0];var e=(I.isA("sap.suite.ui.microchart.InteractiveLineChart")&&I.getPoints())||(I.isA("sap.suite.ui.microchart.InteractiveBarChart")&&I.getBars());e.forEach(function(f){if(f.getLabel()==l){s=f;}});if(!s){s=e[0];}if(I.isA("sap.suite.ui.microchart.InteractiveLineChart")){var p=I.getSelectedPoints();return I.fireSelectionChanged({selectedPoints:p,point:s,selected:i});}else if(I.isA("sap.suite.ui.microchart.InteractiveBarChart")){var p=I.getSelectedBars();return I.fireSelectionChanged({selectedPoints:p,point:s,selected:i});}}).description("Selecting an item in "+v+" VisualFilter").execute());};c.prototype.iOpenVisualFilterValueHelp=function(v){return this.prepareResult(b.create(this).hasType("sap.fe.core.controls.filterbar.VisualFilter").hasId(new RegExp(v,"i")).success(function(d){var s=d[0].getId();b.create(this).hasType("sap.m.Button").hasId(s+"::VisualFilterValueHelpButton").doPress().execute();}).description("Open ValueHelp Dialog "+v+" VisualFilter").execute());};return c;});

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

@@ -172,10 +172,39 @@ sap.ui.define(
 			return this.iCheckField(aArguments[0], aArguments[1], Utils.mergeObjects({ controlType: "sap.m.Link" }, aArguments[2]));
 		};
 
-		FormAssertions.prototype.iCheckElement = function(sId, oProperties) {
-			return OpaBuilder.create(this)
-				.hasId(sId)
-				.hasProperties(oProperties);
+		FormAssertions.prototype.iCheckFormContainersElementCount = function(sFormContainer, iCount, mState) {
+			var aArguments = Utils.parseArguments([String, Number, Object], arguments),
+				fullSubSectionId = this.getIdentifier().fullSubSectionId,
+				mFormState = aArguments[2],
+				sView = fullSubSectionId.split("--")[0],
+				sForm = fullSubSectionId.split("--")[1].split("::")[2],
+				sFormContainerId = sView + "--" + "fe::FormContainer::" + aArguments[0];
+			return this.prepareResult(
+				this.getBuilder()
+					.hasId(sFormContainerId)
+					.has(function(oFormContainer) {
+						var oMatchingFormContainers;
+						if (Object.keys(mFormState).length) {
+							oMatchingFormContainers = oFormContainer.getFormElements().filter(function(oFormElement) {
+								return Object.keys(mFormState).every(function(sFormElementKey) {
+									return mFormState[sFormElementKey] === oFormElement.getProperty(sFormElementKey);
+								});
+							});
+						} else {
+							oMatchingFormContainers = oFormContainer.getFormElements();
+						}
+						return oMatchingFormContainers.length === iCount;
+					})
+					.description(
+						Utils.formatMessage(
+							"Form Container '{0}' on Form '{1}' has '{2}' Form Elements.",
+							aArguments[0],
+							sForm,
+							aArguments[1]
+						)
+					)
+					.execute()
+			);
 		};
 		return FormAssertions;
 	}

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./FormAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/fe/test/builder/MacroFieldBuilder"],function(F,U,O,a,M){"use strict";var b=function(f,v){return F.call(this,f,v);};b.prototype=Object.create(F.prototype);b.prototype.constructor=b;b.prototype.isAction=false;function _(o,s,S){var f=o.getBuilder(),c,B=s?"--seeMore":"--seeLess";f.has(function(e){c=e.getId().substring(e.getId().lastIndexOf("::")+2);return true;}).execute();return o.prepareResult(a.create(o).hasId(new RegExp(U.formatMessage("{0}$",B))).has(function(e){return e.getId().substring(e.getId().lastIndexOf("::")+2)===c+B;}).hasState(S).description(U.formatMessage("Checking '{0}' action with state='{1}'",B,S)).execute());}b.prototype.iCheckState=function(s){var f=this.getBuilder();return this.prepareResult(f.hasState(s).description(U.formatMessage("Checking Form '{0}'{1}",this.getIdentifier(),s?U.formatMessage(" in state '{0}'",s):"")).execute());};b.prototype.iCheckAction=function(A,s){var c=U.parseArguments([[Object,String],Object],arguments),f=this.getBuilder();return this.prepareResult(f.hasAggregation("actions",[this.createActionMatcher(A),a.Matchers.states(s)]).description(U.formatMessage("Checking custom action '{0}' with state='{1}'",c[0],c[1])).execute());};b.prototype.iCheckShowMore=function(s){return _(this,true,s);};b.prototype.iCheckShowLess=function(s){return _(this,false,s);};b.prototype.iCheckField=function(f,v,s){var A=U.parseArguments([[Object,String],[String,Array,Object],Object],arguments);return this.prepareResult(this.createFieldBuilder(f).hasValue(A[1]).hasState(A[2]).description(U.formatMessage("Checking field '{1}' on form '{0}' with value '{2}' and state='{3}'",this.getIdentifier(),A[0],A[1],A[2])).execute());};b.prototype.iCheckLink=function(f,t,s){var A=U.parseArguments([[Object,String],String,Object],arguments);return this.iCheckField(A[0],A[1],U.mergeObjects({controlType:"sap.m.Link"},A[2]));};b.prototype.iCheckElement=function(i,p){return O.create(this).hasId(i).hasProperties(p);};return b;});
+sap.ui.define(["./FormAPI","sap/fe/test/Utils","sap/ui/test/OpaBuilder","sap/fe/test/builder/FEBuilder","sap/fe/test/builder/MacroFieldBuilder"],function(F,U,O,a,M){"use strict";var b=function(f,v){return F.call(this,f,v);};b.prototype=Object.create(F.prototype);b.prototype.constructor=b;b.prototype.isAction=false;function _(o,s,S){var f=o.getBuilder(),c,B=s?"--seeMore":"--seeLess";f.has(function(e){c=e.getId().substring(e.getId().lastIndexOf("::")+2);return true;}).execute();return o.prepareResult(a.create(o).hasId(new RegExp(U.formatMessage("{0}$",B))).has(function(e){return e.getId().substring(e.getId().lastIndexOf("::")+2)===c+B;}).hasState(S).description(U.formatMessage("Checking '{0}' action with state='{1}'",B,S)).execute());}b.prototype.iCheckState=function(s){var f=this.getBuilder();return this.prepareResult(f.hasState(s).description(U.formatMessage("Checking Form '{0}'{1}",this.getIdentifier(),s?U.formatMessage(" in state '{0}'",s):"")).execute());};b.prototype.iCheckAction=function(A,s){var c=U.parseArguments([[Object,String],Object],arguments),f=this.getBuilder();return this.prepareResult(f.hasAggregation("actions",[this.createActionMatcher(A),a.Matchers.states(s)]).description(U.formatMessage("Checking custom action '{0}' with state='{1}'",c[0],c[1])).execute());};b.prototype.iCheckShowMore=function(s){return _(this,true,s);};b.prototype.iCheckShowLess=function(s){return _(this,false,s);};b.prototype.iCheckField=function(f,v,s){var A=U.parseArguments([[Object,String],[String,Array,Object],Object],arguments);return this.prepareResult(this.createFieldBuilder(f).hasValue(A[1]).hasState(A[2]).description(U.formatMessage("Checking field '{1}' on form '{0}' with value '{2}' and state='{3}'",this.getIdentifier(),A[0],A[1],A[2])).execute());};b.prototype.iCheckLink=function(f,t,s){var A=U.parseArguments([[Object,String],String,Object],arguments);return this.iCheckField(A[0],A[1],U.mergeObjects({controlType:"sap.m.Link"},A[2]));};b.prototype.iCheckFormContainersElementCount=function(f,c,s){var A=U.parseArguments([String,Number,Object],arguments),d=this.getIdentifier().fullSubSectionId,m=A[2],v=d.split("--")[0],e=d.split("--")[1].split("::")[2],g=v+"--"+"fe::FormContainer::"+A[0];return this.prepareResult(this.getBuilder().hasId(g).has(function(o){var h;if(Object.keys(m).length){h=o.getFormElements().filter(function(i){return Object.keys(m).every(function(j){return m[j]===i.getProperty(j);});});}else{h=o.getFormElements();}return h.length===c;}).description(U.formatMessage("Form Container '{0}' on Form '{1}' has '{2}' Form Elements.",A[0],e,A[1])).execute());};return b;});

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

@@ -598,7 +598,7 @@ sap.ui.define(
 		};
 
 		/**
-		 * Selects the variant of the given name.
+		 * Selects the chosen variant.
 		 *
 		 * @param {string} sVariantName The name of the variant to be selected
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements

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

@@ -28,7 +28,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.96.0",
+			version: "1.97.0",
 			noLibraryCSS: true
 		});
 

package/packages/sap.fe.test/src/sap/fe/test/library-h2-preload.js

@@ -4,9 +4,9 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.predefine('sap/fe/test/library',["sap/ui/core/Core","sap/ui/core/library"],function(){"use strict";sap.ui.getCore().initLibrary({name:"sap.fe.test",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],version:"1.96.0",noLibraryCSS:true});return sap.fe.test;});
+sap.ui.predefine('sap/fe/test/library',["sap/ui/core/Core","sap/ui/core/library"],function(){"use strict";sap.ui.getCore().initLibrary({name:"sap.fe.test",dependencies:["sap.ui.core"],types:[],interfaces:[],controls:[],elements:[],version:"1.97.0",noLibraryCSS:true});return sap.fe.test;});
 sap.ui.require.preload({
-	"sap/fe/test/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"sap.fe.test","type":"library","embeds":[],"applicationVersion":{"version":"1.96.0"},"title":"UI5 library: sap.fe.test","description":"UI5 library: sap.fe.test","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"minUI5Version":"1.96","libs":{"sap.ui.core":{"minVersion":"1.96.0"}}},"library":{"i18n":false,"css":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}'
+	"sap/fe/test/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"sap.fe.test","type":"library","embeds":[],"applicationVersion":{"version":"1.97.0"},"title":"UI5 library: sap.fe.test","description":"UI5 library: sap.fe.test","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"minUI5Version":"1.97","libs":{"sap.ui.core":{"minVersion":"1.97.0"}}},"library":{"i18n":false,"css":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}'
 },"sap/fe/test/library-h2-preload"
 );
 sap.ui.loader.config({depCacheUI5:{
@@ -17,7 +17,7 @@ sap.ui.loader.config({depCacheUI5:{
 "sap/fe/test/FCLView.js":["sap/ui/test/OpaBuilder.js"],
 "sap/fe/test/Flexibility.js":["sap/ui/qunit/QUnitUtils.js","sap/ui/test/Opa5.js","sap/ui/test/OpaBuilder.js"],
 "sap/fe/test/FlexibleColumnLayout.js":["sap/base/util/merge.js","sap/fe/test/TemplatePage.js","sap/m/library.js","sap/ui/test/OpaBuilder.js"],
-"sap/fe/test/JestTemplatingHelper.js":["@sap/cds-compiler.js","fs.js","path.js","prettier.js","sap/base/Log.js","sap/base/util/merge.js","sap/fe/core/converters/ConverterContext.js","sap/fe/core/services/SideEffectsServiceFactory.js","sap/fe/macros/PhantomUtil.js","sap/ui/base/BindingParser.js","sap/ui/core/InvisibleText.js","sap/ui/core/util/XMLPreprocessor.js","sap/ui/model/json/JSONModel.js","sap/ui/model/odata/v4/ODataMetaModel.js","sap/ui/model/odata/v4/lib/_MetadataRequestor.js","xpath.js"],
+"sap/fe/test/JestTemplatingHelper.js":["@sap/cds-compiler.js","fs.js","path.js","prettier.js","sap/base/Log.js","sap/base/util/merge.js","sap/fe/core/TemplateModel.js","sap/fe/core/converters/ConverterContext.js","sap/fe/core/services/SideEffectsServiceFactory.js","sap/fe/macros/PhantomUtil.js","sap/ui/base/BindingParser.js","sap/ui/core/InvisibleText.js","sap/ui/core/util/XMLPreprocessor.js","sap/ui/model/json/JSONModel.js","sap/ui/model/odata/v4/ODataMetaModel.js","sap/ui/model/odata/v4/lib/_MetadataRequestor.js","xpath.js"],
 "sap/fe/test/JourneyRunner.js":["sap/base/Log.js","sap/base/util/ObjectPath.js","sap/fe/test/BaseActions.js","sap/fe/test/BaseArrangements.js","sap/fe/test/BaseAssertions.js","sap/fe/test/Shell.js","sap/fe/test/Utils.js","sap/ui/base/Object.js","sap/ui/test/Opa5.js","sap/ui/test/opaQunit.js"],
 "sap/fe/test/ListReport.js":["sap/fe/test/TemplatePage.js","sap/fe/test/Utils.js","sap/fe/test/api/FooterActionsBase.js","sap/fe/test/api/FooterAssertionsBase.js","sap/fe/test/api/HeaderActionsLR.js","sap/fe/test/api/HeaderAssertionsLR.js","sap/fe/test/api/KPICardAssertions.js","sap/fe/test/builder/FEBuilder.js","sap/fe/test/builder/KPIBuilder.js","sap/fe/test/builder/MacroFieldBuilder.js","sap/fe/test/builder/OverflowToolbarBuilder.js","sap/fe/test/builder/VMBuilder.js","sap/ui/test/Opa5.js","sap/ui/test/OpaBuilder.js"],
 "sap/fe/test/LocationUtil.js":["sap/fe/test/Utils.js","sap/ui/test/Opa5.js","sap/ui/test/OpaBuilder.js"],