@sapui5/sap.fe.test 1.111.1 → 1.113.0

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

@@ -491,10 +491,10 @@ sap.ui.predefine("sap/fe/test/CollaborationClient", ["sap/fe/core/controllerexte
             CollaborationAPI.discardDraft();
           }).description("Remote session discarding draft").execute();
         },
-        iDeleteDraft: function () {
+        iDeleteObject: function (objectPath) {
           return OpaBuilder.create(this).do(function () {
-            CollaborationAPI.deleteDraft();
-          }).description("Remote session deleting draft").execute();
+            CollaborationAPI.deleteObject(objectPath);
+          }).description(`Remote session deleting object ${objectPath}`).execute();
         }
       },
       assertions: {
@@ -704,7 +704,7 @@ sap.ui.predefine("sap/fe/test/FCLView", ["sap/ui/test/OpaBuilder"], function (Op
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "sap/fe/core/controllerextensions/InternalEditFlow", "sap/fe/core/PageController", "sap/ui/mdc/FilterBar"], function (generic, InternalEditFlow, PageController, FilterBar) {
+sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "sap/fe/core/controllerextensions/EditFlow", "sap/fe/core/PageController", "sap/ui/mdc/FilterBar"], function (generic, EditFlow, PageController, FilterBar) {
   "use strict";
 
   var _exports = {};
@@ -722,8 +722,8 @@ sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "
       _shouldAutoTriggerSearch: jest.fn(),
       _getTable: jest.fn(),
       getExtensionAPI: jest.fn(),
-      _editFlow: mock(InternalEditFlow),
-      getChartControl: jest.fn()
+      getChartControl: jest.fn(),
+      editFlow: mock(EditFlow)
     };
     return Object.assign(mock(PageController), listReport);
   }
@@ -733,7 +733,7 @@ sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "
     const objectPage = {
       getStickyEditMode: jest.fn(),
       getExtensionAPI: jest.fn(),
-      _editFlow: mock(InternalEditFlow)
+      editFlow: mock(EditFlow)
     };
     return Object.assign(mock(PageController), objectPage);
   }
@@ -1788,12 +1788,12 @@ sap.ui.predefine("sap/fe/test/JestFlexibilityHelper", [], function () {
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs", "@prettier/plugin-xml", "path", "prettier", "sap/base/Log", "sap/base/util/LoaderExtensions", "sap/base/util/merge", "sap/fe/core/buildingBlocks/BuildingBlockRuntime", "sap/fe/core/converters/ConverterContext", "sap/fe/core/services/SideEffectsServiceFactory", "sap/fe/core/TemplateModel", "sap/ui/base/BindingParser", "sap/ui/base/ManagedObjectMetadata", "sap/ui/core/Component", "sap/ui/core/InvisibleText", "sap/ui/core/util/serializer/Serializer", "sap/ui/core/util/XMLPreprocessor", "sap/ui/fl/apply/_internal/flexState/FlexState", "sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor", "sap/ui/fl/initial/_internal/Storage", "sap/ui/fl/Utils", "sap/ui/model/json/JSONModel", "sap/ui/model/odata/v4/lib/_MetadataRequestor", "sap/ui/model/odata/v4/ODataMetaModel", "xpath", "./JestFlexibilityHelper"], function (compiler, fs, plugin, path, prettier, Log, LoaderExtensions, merge, BuildingBlockRuntime, ConverterContext, SideEffectsFactory, TemplateModel, BindingParser, ManagedObjectMetadata, Component, InvisibleText, Serializer, XMLPreprocessor, FlexState, XmlPreprocessor, AppStorage, Utils, JSONModel, _MetadataRequestor, ODataMetaModel, xpath, JestFlexibilityHelper) {
+sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs", "@prettier/plugin-xml", "path", "prettier", "sap/base/Log", "sap/base/util/LoaderExtensions", "sap/base/util/merge", "sap/fe/core/converters/ConverterContext", "sap/fe/core/services/SideEffectsServiceFactory", "sap/fe/core/TemplateModel", "sap/fe/test/UI5MockHelper", "sap/ui/base/BindingParser", "sap/ui/base/ManagedObjectMetadata", "sap/ui/core/Component", "sap/ui/core/InvisibleText", "sap/ui/core/util/serializer/Serializer", "sap/ui/core/util/XMLPreprocessor", "sap/ui/fl/apply/_internal/flexState/FlexState", "sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor", "sap/ui/fl/initial/_internal/Storage", "sap/ui/fl/Utils", "sap/ui/model/json/JSONModel", "sap/ui/model/odata/v4/lib/_MetadataRequestor", "sap/ui/model/odata/v4/ODataMetaModel", "xpath", "./JestFlexibilityHelper"], function (compiler, fs, plugin, path, prettier, Log, LoaderExtensions, merge, ConverterContext, SideEffectsFactory, TemplateModel, UI5MockHelper, BindingParser, ManagedObjectMetadata, Component, InvisibleText, Serializer, XMLPreprocessor, FlexState, XmlPreprocessor, AppStorage, Utils, JSONModel, _MetadataRequestor, ODataMetaModel, xpath, JestFlexibilityHelper) {
   "use strict";
 
   var _exports = {};
   var createFlexibilityChangesObject = JestFlexibilityHelper.createFlexibilityChangesObject;
-  var registerBuildingBlock = BuildingBlockRuntime.registerBuildingBlock;
+  var createMockResourceModel = UI5MockHelper.createMockResourceModel;
   var format = prettier.format;
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const formatXml = require("xml-formatter");
@@ -1807,6 +1807,7 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     log: "http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1",
     unittest: "http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1",
     control: "sap.fe.core.controls",
+    controls: "sap.fe.macros.controls",
     core: "sap.ui.core",
     dt: "sap.ui.dt",
     m: "sap.m",
@@ -1823,6 +1824,9 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     macroTable: "sap.fe.macros.table"
   };
   const select = xpath.useNamespaces(nameSpaceMap);
+  const defaultFakeSideEffectService = {
+    computeFieldGroupIds: () => []
+  };
   function _getTemplatedSelector(xmldom, selector) {
     /**
      * if a root element has been added during the templating by our Jest Templating methods
@@ -1831,7 +1835,7 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     const rootPath = "/root";
     return `${xmldom.nodeName === "root" && !selector.startsWith(rootPath) ? rootPath : ""}${selector}`;
   }
-  async function _buildPreProcessorSettings(sMetadataUrl, mBindingContexts, mModels) {
+  async function _buildPreProcessorSettings(sMetadataUrl, mBindingContexts, mModels, fakeSideEffectService) {
     const oMetaModel = await getMetaModel(sMetadataUrl);
 
     // To ensure our macro can use #setBindingContext we ensure there is a pre existing JSONModel for converterContext
@@ -1850,9 +1854,13 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
       models: Object.assign({
         metaModel: oMetaModel
       }, mModels),
-      bindingContexts: {}
+      bindingContexts: {},
+      appComponent: {
+        getSideEffectsService: jest.fn(),
+        getDiagnostics: () => undefined
+      }
     };
-
+    settings.appComponent.getSideEffectsService.mockReturnValue(fakeSideEffectService ?? defaultFakeSideEffectService);
     //Inject models and bindingContexts
     Object.keys(mBindingContexts).forEach(function (sKey) {
       /* Assert to make sure the annotations are in the test metadata -> avoid misleading tests */
@@ -1873,17 +1881,6 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     const view = LoaderExtensions.loadResource(name);
     return view.documentElement;
   }
-  const registerMacro = function (macroMetadata) {
-    registerBuildingBlock(macroMetadata);
-  };
-  _exports.registerMacro = registerMacro;
-  const unregisterMacro = function (macroMetadata) {
-    XMLPreprocessor.plugIn(null, macroMetadata.namespace, macroMetadata.name);
-    if (macroMetadata.publicNamespace) {
-      XMLPreprocessor.plugIn(null, macroMetadata.publicNamespace, macroMetadata.name);
-    }
-  };
-  _exports.unregisterMacro = unregisterMacro;
   const runXPathQuery = function (selector, xmldom) {
     return select(selector, xmldom);
   };
@@ -1907,6 +1904,38 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
         },
         pass: nodes && nodes.length === 0
       };
+    },
+    /**
+     * Checks for errors in `xml` created during templating of an XML string or
+     * an XML node.
+     *
+     * This function checkes for the xml errors created by the
+     * function [BuildingBlockTemplateProcessor.createErrorXML]{@link sap.fe.core.buildingBlocks.BuildingBlockTemplateProcessor#createErrorXML}.
+     *
+     * @param xml XML String or XML Node to be tested for errors
+     * @returns Jest Matcher result object
+     */
+    toHaveTemplatingErrors(xml) {
+      const xmlText = typeof xml === "string" ? xml : serializeXML(xml);
+      const base64Entries = xmlText.match(/BBF\.base64Decode\('([^']*)'\)/gm) || [];
+      const errorMessages = base64Entries.map(message => {
+        if (message && message.length > 0) {
+          var _message$match, _message$match$;
+          return atob(((_message$match = message.match(/('[^']*)/)) === null || _message$match === void 0 ? void 0 : (_message$match$ = _message$match[0]) === null || _message$match$ === void 0 ? void 0 : _message$match$.slice(1)) || "");
+        }
+        return "";
+      });
+      if (errorMessages.length <= 0) {
+        return {
+          message: () => `XML Templating without errors`,
+          pass: false
+        };
+      } else {
+        return {
+          message: () => errorMessages.join("\n"),
+          pass: true
+        };
+      }
     }
   });
   _exports.runXPathQuery = runXPathQuery;
@@ -1915,7 +1944,7 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
       xmlString = xmlString.join("");
     }
     let xmlFormatted = formatXML(xmlString);
-    xmlFormatted = xmlFormatted.replace(/uid--id-[0-9]{13}-[0-9]{1,2}/g, "uid--id");
+    xmlFormatted = xmlFormatted.replace(/uid--id-[0-9]{13}-[0-9]{1,3}/g, "uid--id");
     return xmlFormatted;
   };
   _exports.formatBuildingBlockXML = formatBuildingBlockXML;
@@ -1923,10 +1952,24 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     const selector = `string(${_getTemplatedSelector(xmlDom, controlSelector)}/@${attributeName})`;
     return runXPathQuery(selector, xmlDom);
   };
+
+  /**
+   * Serialize the parts or the complete given XML DOM to string.
+   *
+   * @param xmlDom DOM node that is to be serialized.
+   * @param selector Optional selector of sub nodes
+   * @returns XML string
+   */
   _exports.getControlAttribute = getControlAttribute;
-  const serializeXML = function (xmlDom) {
+  const serializeXML = function (xmlDom, selector) {
     const serializer = new window.XMLSerializer();
-    const xmlString = serializer.serializeToString(xmlDom);
+    let xmlString;
+    if (selector) {
+      const nodes = runXPathQuery(selector, xmlDom);
+      xmlString = nodes.map(node => serializer.serializeToString(node)).join("\n");
+    } else {
+      xmlString = serializer.serializeToString(xmlDom);
+    }
     return formatXML(xmlString);
   };
   _exports.serializeXML = serializeXML;
@@ -2157,7 +2200,10 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
   };
   const getChangesFromXML = xml => [...xml.querySelectorAll("*")].flatMap(e => [...e.attributes].map(a => a.name)).filter(attr => attr.includes("sap.ui.fl.appliedChanges"));
   _exports.getChangesFromXML = getChangesFromXML;
-  const getTemplatingResult = async function (xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges) {
+  const getTemplatingResult = async function (xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges, fakeSideEffectService) {
+    if (!mModels["sap.fe.i18n"]) {
+      mModels["sap.fe.i18n"] = createMockResourceModel();
+    }
     const templatedXml = `<root>${xmlInput}</root>`;
     const parser = new window.DOMParser();
     const xmlDoc = parser.parseFromString(templatedXml, "text/xml");
@@ -2165,7 +2211,7 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     // if not already passed to teh templating
 
     const oMetaModel = await getMetaModel(sMetadataUrl);
-    const oPreprocessorSettings = await _buildPreProcessorSettings(sMetadataUrl, mBindingContexts, mModels);
+    const oPreprocessorSettings = await _buildPreProcessorSettings(sMetadataUrl, mBindingContexts, mModels, fakeSideEffectService);
 
     //This context for macro testing
     if (oPreprocessorSettings.models["this"]) {
@@ -2181,9 +2227,11 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     return resultXML;
   };
   _exports.getTemplatingResult = getTemplatingResult;
-  const getTemplatedXML = async function (xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges) {
-    const templatedXML = await getTemplatingResult(xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges);
-    return serializeXML(templatedXML);
+  const getTemplatedXML = async function (xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges, fakeSideEffectService) {
+    const templatedXML = await getTemplatingResult(xmlInput, sMetadataUrl, mBindingContexts, mModels, flexChanges, fakeSideEffectService);
+    const serialiedXML = serializeXML(templatedXML);
+    expect(serialiedXML).not.toHaveTemplatingErrors();
+    return serialiedXML;
   };
 
   /**
@@ -2230,7 +2278,11 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     // build model and bindings for given test data
     const settings = {
       models: {},
-      bindingContexts: {}
+      bindingContexts: {},
+      appComponent: {
+        getSideEffectsService: jest.fn(),
+        getDiagnostics: () => undefined
+      }
     };
     for (const model in testData) {
       const jsonModel = new JSONModel();
@@ -2238,6 +2290,7 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
       settings.models[model] = jsonModel;
       settings.bindingContexts[model] = settings.models[model].createBindingContext("/");
     }
+    settings.appComponent.getSideEffectsService.mockReturnValue(defaultFakeSideEffectService);
 
     // execute the pre-processor
     const resultDoc = await XMLPreprocessor.process(inputDoc.firstElementChild, {
@@ -2422,7 +2475,7 @@ sap.ui.predefine(
 			 * @param {string} [mSettings.launchUrl] The URL to the launching page (usually a FLP.html)
 			 * @param {object} [mSettings.launchParameters] The URL launch parameters
 			 * @param {boolean} [mSettings.async] If false (default), only one JourneyRunner is executed at a time
-			 * @param {Function[] | string[]} vJourneys The journeys to be executed. If a journey is represented as a string, it will be interpreted
+			 * @param {Function[] | string[]} _vJourneys The journeys to be executed. If a journey is represented as a string, it will be interpreted
 			 * as a module path to the file that should be loaded. Else it is expected to be a function.
 			 * Alternatively, instead of being wrapped in an array, the journeys can also be given as separate parameters:
 			 * <pre>.run(mSettings, Journey1, Journey2, ...)</pre>
@@ -2431,7 +2484,7 @@ sap.ui.predefine(
 			 * @name sap.fe.test.JourneyRunner#run
 			 * @public
 			 */
-			run: function (mSettings, vJourneys) {
+			run: function (mSettings, _vJourneys) {
 				var iJourneyParameterIndex = 1;
 				if (!Utils.isOfType(mSettings, Object)) {
 					iJourneyParameterIndex = 0;
@@ -2477,13 +2530,12 @@ sap.ui.predefine(
 			 *
 			 * By default, an instance of {@link sap.fe.test.BaseActions} will be returned.
 			 *
-			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base actions
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseActions
 			 * @protected
 			 */
-			getBaseActions: function (mSettings) {
+			getBaseActions: function () {
 				return new BaseActions();
 			},
 
@@ -2495,13 +2547,12 @@ sap.ui.predefine(
 			 *
 			 * By default, an instance of {@link sap.fe.test.BaseAssertions} will be returned.
 			 *
-			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base assertions
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseAssertions
 			 * @protected
 			 */
-			getBaseAssertions: function (mSettings) {
+			getBaseAssertions: function () {
 				return new BaseAssertions();
 			},
 
@@ -2546,7 +2597,7 @@ sap.ui.predefine(
 				aJourneys.forEach(function (vJourney) {
 					if (Utils.isOfType(vJourney, String)) {
 						pPromiseChain = pPromiseChain.then(function () {
-							return new Promise(function (resolve, reject) {
+							return new Promise(function (resolve) {
 								sap.ui.require([vJourney], function (oJourney) {
 									resolve(oJourney);
 								});
@@ -2735,13 +2786,13 @@ sap.ui.predefine(
 		 * @param {string} oPageDefinition.componentId The component id (defined in the target section for the list report within the manifest)
 		 * @param {string} oPageDefinition.entitySet The entitySet (optional)(defined in the settings of the corresponding target component within the manifest)
 		 * @param {string} oPageDefinition.contextPath The contextPath (optional)(defined in the settings of the corresponding target component within the manifest)
-		 * @param {...object} [aInAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
+		 * @param {...object} [_aInAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.ListReport} A list report page definition
 		 * @name sap.fe.test.ListReport
 		 * @extends sap.fe.test.TemplatePage
 		 * @public
 		 */
-		function ListReport(oPageDefinition, aInAdditionalPageDefinitions) {
+		function ListReport(oPageDefinition, _aInAdditionalPageDefinitions) {
 			var sAppId = oPageDefinition.appId,
 				sComponentId = oPageDefinition.componentId,
 				sContextPath = oPageDefinition.contextPath,
@@ -2915,11 +2966,10 @@ sap.ui.predefine(
 							/**
 							 * TODO This function is only here for legacy reasons and therefore private. Use iGoToView instead.
 							 *
-							 * @param {string} sName The name of the view within the List Report table
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 							 * @private
 							 */
-							iOpenIconTabWithTitle: function (sName) {
+							iOpenIconTabWithTitle: function () {
 								// return this.iGoToView(sName);
 								return OpaBuilder.create(this)
 									.timeout(1)
@@ -3289,11 +3339,10 @@ sap.ui.predefine(
 							/**
 							 * TODO This function is only here for legacy reasons and therefore private. Use iCheckView instead.
 							 *
-							 * @param {object} mProperties Object containing the text: property and any other properties to be checked
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 							 * @private
 							 */
-							iSeeIconTabWithProperties: function (mProperties) {
+							iSeeIconTabWithProperties: function () {
 								// return this.iCheckView(mProperties.text, mProperties);
 								return OpaBuilder.create(this)
 									.timeout(1)
@@ -3541,13 +3590,13 @@ sap.ui.predefine(
 		 * @param {string} oPageDefinition.componentId The component id (defined in the target section for the list report within the manifest)
 		 * @param {string} oPageDefinition.entitySet The entitySet (defined in the settings of the corresponding target component within the manifest)
 		 * @param {string} oPageDefinition.contextPath The contextPath (optional)(defined in the settings of the corresponding target component within the manifest)
-		 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
+		 * @param {...object} [_aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.ObjectPage} An object page page definition
 		 * @name sap.fe.test.ObjectPage
 		 * @extends sap.fe.test.TemplatePage
 		 * @public
 		 */
-		function ObjectPage(oPageDefinition, aAdditionalPageDefinitions) {
+		function ObjectPage(oPageDefinition, _aAdditionalPageDefinitions) {
 			var sAppId = oPageDefinition.appId,
 				sComponentId = oPageDefinition.componentId,
 				ViewId = sAppId + "::" + sComponentId,
@@ -4521,7 +4570,7 @@ sap.ui.predefine("sap/fe/test/Shell", ["sap/ui/test/OpaBuilder", "sap/ui/test/Op
 								actions: function (oTile) {
 									oTile.getTileViews()[0].$().trigger("tap");
 								},
-								success: function (oTile) {
+								success: function () {
 									Opa5.assert.ok(true, Utils.formatMessage("Clicking on tile with target '{0}'", sTarget));
 								},
 								errorMessage: "Could not find the tile"
@@ -4552,7 +4601,7 @@ sap.ui.predefine("sap/fe/test/Shell", ["sap/ui/test/OpaBuilder", "sap/ui/test/Op
 								.description("Selecting item: " + sOption)
 								.execute();
 						},
-						iLaunchExtendedParameterDialog: function (sProperty) {
+						iLaunchExtendedParameterDialog: function () {
 							return OpaBuilder.create(this)
 								.hasType("sap.m.Button")
 								.isDialogElement()
@@ -4710,7 +4759,7 @@ sap.ui.predefine("sap/fe/test/Shell", ["sap/ui/test/OpaBuilder", "sap/ui/test/Op
 /**
  * Actions and assertions to be used with a page hosted in an FCL
  */
-sap.ui.predefine("sap/fe/test/Stubs", ["sap/ui/test/OpaBuilder"], function (OpaBuilder) {
+sap.ui.predefine("sap/fe/test/Stubs", [], function () {
 	"use strict";
 	var Stubs = {
 		prepareStubs: function (oWindow) {
@@ -5044,13 +5093,13 @@ sap.ui.predefine(
 		/**
 		 * @class Provides a test page definition for a template page with the corresponding parameters.
 		 * @param {object | string} vViewId The viewId
-		 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
+		 * @param {...object} [_aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.TemplatePage} A list report page definition
 		 * @name sap.fe.test.TemplatePage
 		 * @hideconstructor
 		 * @public
 		 */
-		function TemplatePage(vViewId, aAdditionalPageDefinitions) {
+		function TemplatePage(vViewId, _aAdditionalPageDefinitions) {
 			var sViewId = Utils.isOfType(vViewId, String) ? vViewId : vViewId.viewId,
 				aAdditionalPages = Array.prototype.slice.call(arguments, 1);
 
@@ -5323,8 +5372,7 @@ sap.ui.predefine(
 		"sap/ui/core/util/XMLPreprocessor",
 		"sap/ui/core/XMLTemplateProcessor",
 		"sap/fe/macros/macroLibrary",
-		"sap/fe/core/TemplateModel",
-		"sap/fe/macros/ResourceModel"
+		"sap/fe/core/TemplateModel"
 	],
 	function (ODataMetaModel, XMLPreprocessor, XMLTemplateProcessor, macroLibrary, TemplateModel) {
 		"use strict";
@@ -5377,7 +5425,7 @@ sap.ui.predefine(
 				oMetaModel = new ODataMetaModel(oRequestor, sServiceUrl + "$metadata", undefined, null);
 
 			//Switch of all plugins as we only template individual fragments in the test
-			macroLibrary.deregister();
+			macroLibrary.unregister();
 			if (useMacros) {
 				//Force option to use macros for some tests
 				macroLibrary.register();
@@ -5559,7 +5607,7 @@ sap.ui.predefine(
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.predefine("sap/fe/test/UI5MockHelper", ["@sap-ux/jest-mock-ui5/dist/generic", "sap/fe/core/controllerextensions/EditFlow", "sap/fe/core/controllerextensions/InternalEditFlow", "sap/fe/core/controllerextensions/InternalRouting", "sap/fe/core/controllerextensions/Share", "sap/fe/core/controllerextensions/SideEffects", "sap/ui/base/Event", "sap/ui/core/mvc/Controller", "sap/ui/core/mvc/View", "sap/ui/model/CompositeBinding", "sap/ui/model/odata/v4/Context", "sap/ui/model/odata/v4/ODataContextBinding", "sap/ui/model/odata/v4/ODataListBinding", "sap/ui/model/odata/v4/ODataMetaModel", "sap/ui/model/odata/v4/ODataModel", "sap/ui/model/odata/v4/ODataPropertyBinding"], function (generic, EditFlow, InternalEditFlow, InternalRouting, Share, SideEffects, Event, Controller, View, CompositeBinding, Context, ODataContextBinding, ODataListBinding, ODataMetaModel, ODataModel, ODataPropertyBinding) {
+sap.ui.predefine("sap/fe/test/UI5MockHelper", ["@sap-ux/jest-mock-ui5/dist/generic", "sap/fe/core/controllerextensions/EditFlow", "sap/fe/core/controllerextensions/InternalRouting", "sap/fe/core/controllerextensions/Share", "sap/fe/core/controllerextensions/SideEffects", "sap/fe/core/ResourceModel", "sap/ui/base/Event", "sap/ui/core/mvc/Controller", "sap/ui/core/mvc/View", "sap/ui/model/CompositeBinding", "sap/ui/model/odata/v4/Context", "sap/ui/model/odata/v4/ODataContextBinding", "sap/ui/model/odata/v4/ODataListBinding", "sap/ui/model/odata/v4/ODataMetaModel", "sap/ui/model/odata/v4/ODataModel", "sap/ui/model/odata/v4/ODataPropertyBinding"], function (generic, EditFlow, InternalRouting, Share, SideEffects, ResourceModel, Event, Controller, View, CompositeBinding, Context, ODataContextBinding, ODataListBinding, ODataMetaModel, ODataModel, ODataPropertyBinding) {
   "use strict";
 
   var _exports = {};
@@ -5961,7 +6009,6 @@ sap.ui.predefine("sap/fe/test/UI5MockHelper", ["@sap-ux/jest-mock-ui5/dist/gener
   function createMockController() {
     const mocked = mock(Controller);
     mocked._routing = mock(InternalRouting);
-    mocked._editFlow = mock(InternalEditFlow);
     mocked._sideEffects = mock(SideEffects);
     mocked.editFlow = mock(EditFlow);
     mocked.share = mock(Share);
@@ -5996,7 +6043,44 @@ sap.ui.predefine("sap/fe/test/UI5MockHelper", ["@sap-ux/jest-mock-ui5/dist/gener
       controller
     };
   }
+
+  /**
+   * To be used to load messages bundles for tests without app/page component.
+   *
+   * @param textID ID of the Text
+   * @param parameters Array of parameters that are used to create the text
+   * @param metaPath Entity set name or action name to overload a text
+   * @returns Determined text
+   */
   _exports.mockMVC = mockMVC;
+  function getText(textID, parameters, metaPath) {
+    const resourceModel = new ResourceModel({
+      bundleName: "sap.fe.core.messagebundle",
+      enhanceWith: [{
+        bundleName: "sap.fe.macros.messagebundle"
+      }, {
+        bundleName: "sap.fe.templates.messagebundle"
+      }],
+      async: false
+    });
+    return resourceModel.getText(textID, parameters, metaPath);
+  }
+
+  /**
+   * Utility type to mock ResourceModel
+   */
+  _exports.getText = getText;
+  /**
+   * Factory function to create a new MockView.
+   *
+   * @returns A new MockView
+   */
+  function createMockResourceModel() {
+    const mocked = mock(ResourceModel);
+    mocked.getText = jest.fn().mockImplementation(getText);
+    return mocked;
+  }
+  _exports.createMockResourceModel = createMockResourceModel;
   return _exports;
 }, false);
 /*!
@@ -6736,7 +6820,7 @@ sap.ui.predefine(
 
 		Actions.prototype.iSelectItems = function (innerData, bClearSelection) {
 			if (typeof bClearSelection === "boolean") {
-				bClearSelection = bClearSelection;
+				bClearSelection = !!bClearSelection;
 			} else {
 				bClearSelection = true;
 			}
@@ -7081,25 +7165,17 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
       }
     },
     /**
-     * Simulates that the user has deleted the draft.
+     * Simulates that the user has deleted an object (child of draft root).
+     *
+     * @param objectPath The path of the object to delete
      */
-    deleteDraft: function () {
+    deleteObject: function (objectPath) {
       if (this._internalModel) {
-        const draftContext = this._getDraftContext();
-        let activeContext;
-        draftContext.requestProperty("IsActiveEntity").then(() => {
-          return draftContext.getModel().bindContext(`${this._rootPath}/SiblingEntity`).getBoundContext();
-        }).then(context => {
-          activeContext = context;
-          return context.requestCanonicalPath();
-        }).then(() => {
-          return draft.deleteDraft(draftContext);
-        }).then(() => {
-          activeContext.delete();
-          broadcastCollaborationMessage(Activity.Delete, this._rootPath, this._internalModel);
-          this._internalModel.destroy();
-          this._internalModel = undefined;
-        }).catch(function (err) {
+        const objectContext = this._getObjectContext(objectPath);
+        objectContext.requestProperty("IsActiveEntity").then(() => {
+          objectContext.delete();
+          broadcastCollaborationMessage(Activity.Delete, objectPath, this._internalModel);
+        }).catch(err => {
           Log.error(err);
         });
       }
@@ -7108,7 +7184,10 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
     // Private methods
 
     _getDraftContext: function () {
-      return this._oModel.bindContext(this._rootPath, undefined, {
+      return this._getObjectContext(this._rootPath);
+    },
+    _getObjectContext: function (path) {
+      return this._oModel.bindContext(path, undefined, {
         $$patchWithoutSideEffects: true,
         $$groupId: "$auto",
         $$updateGroupId: "$auto"
@@ -8720,53 +8799,94 @@ sap.ui.predefine(
 			);
 		};
 
-		function _checkTabBuilder(oApiInstance, sIdSuffix, mState) {
-			var oBuilder = FEBuilder.create(oApiInstance.getOpaInstance())
-					.isDialogElement()
-					.mustBeVisible(false)
-					.description(
-						Utils.formatMessage(
-							"Checking that the tab '{1}' on value help dialog '{0}' has state='{2}'",
-							oApiInstance.getIdentifier(),
-							sIdSuffix,
-							mState
-						)
-					),
-				oTabIdMatcher = FEBuilder.Matchers.id(RegExp(sIdSuffix + "$"));
+		function _checkIconTabBarBuilder(oValueHelpBuilder, idMatcher, mState) {
+			var bSuccess = true;
 
 			if (mState && mState.visible === false) {
-				oBuilder.hasType("sap.m.IconTabBar");
-				oBuilder.check(function (aIconTabFilters) {
-					return OpaBuilder.Matchers.filter(oTabIdMatcher)(aIconTabFilters).length === 0;
-				});
+				oValueHelpBuilder
+					.hasChildren(
+						OpaBuilder.create(this).hasConditional(
+							function (oControl) {
+								// in the visible=false case, there should never be a sap.m.IconTabBar --> let test fail
+								// if a sap.m.IconTabBar is found, both tabs are visible (SearchSelect and DefineConditions)
+								if (oControl.isA("sap.m.IconTabBar")) {
+									bSuccess = false;
+									return true;
+								} else {
+									return false;
+								}
+							},
+							function (oSuccess) {
+								return false;
+							},
+							function (oElse) {
+								return true;
+							}
+						),
+						false
+					)
+					.check(function () {
+						return bSuccess;
+					});
 			} else {
-				oBuilder.hasType("sap.m.IconTabFilter").has(oTabIdMatcher).hasState(mState);
+				oValueHelpBuilder.hasChildren(OpaBuilder.create(this).hasType("sap.m.IconTabFilter").has(idMatcher), false);
 			}
-
-			return oApiInstance.prepareResult(oBuilder.execute());
+			return oValueHelpBuilder;
 		}
 
 		/**
-		 * Checks the <code>Search and Select</code> tab.
+		 * Checks the <code>Define conditions</code> tab in a value help dialog.
+		 * Please be aware that the tab control of the toolbar is checked.
 		 *
 		 * @param {object} [mState] Defines the expected state of the filter bar
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
 		 * @public
 		 */
-		DialogValueHelpAssertions.prototype.iCheckSearchAndSelect = function (mState) {
-			return _checkTabBuilder(this, "-ITB--header-0", mState); // might be an issue, but there´s no stable id provided anymore
-		};
+		DialogValueHelpAssertions.prototype.iCheckDefineConditions = function (mState) {
+			var sIdSuffix = "-ITB--header-1",
+				idMatcher = FEBuilder.Matchers.id(RegExp(sIdSuffix + "$")),
+				oBuilder = _checkIconTabBarBuilder(this.getBuilder(), idMatcher, mState);
 
+			return this.prepareResult(
+				oBuilder
+					.description(
+						Utils.formatMessage(
+							"Checking that the Define Conditions tab '{1}' on value help dialog '{0}' has state='{2}'",
+							this.getIdentifier(),
+							sIdSuffix,
+							mState
+						)
+					)
+					.execute()
+			);
+		};
 		/**
-		 * Checks the <code>Define conditions</code> tab.
+		 * Checks the <code>Search and Select</code> tab in a value help dialog.
+		 * Please be aware that the tab control of the toolbar is checked.
 		 *
 		 * @param {object} [mState] Defines the expected state of the filter bar
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, that can be used for chaining statements
 		 * @public
 		 */
-		DialogValueHelpAssertions.prototype.iCheckDefineConditions = function (mState) {
-			return _checkTabBuilder(this, "-ITB--header-1", mState); // might be an issue, but there´s no stable id provided anymore
+		DialogValueHelpAssertions.prototype.iCheckSearchAndSelect = function (mState) {
+			var sIdSuffix = "-ITB--header-0",
+				idMatcher = FEBuilder.Matchers.id(RegExp(sIdSuffix + "$")),
+				oBuilder = _checkIconTabBarBuilder(this.getBuilder(), idMatcher, mState);
+
+			return this.prepareResult(
+				oBuilder
+					.description(
+						Utils.formatMessage(
+							"Checking that the Search and Select tab '{1}' on value help dialog '{0}' has state='{2}'",
+							this.getIdentifier(),
+							sIdSuffix,
+							mState
+						)
+					)
+					.execute()
+			);
 		};
+
 		/**
 		 * Checks the dialog.
 		 *
@@ -9530,9 +9650,9 @@ sap.ui.predefine(
 
 		/**
 		 * Checks if the focus is on the filter field.
-
+		 *
 		 * @param {string} [sFilterFieldLabel] The field label
-		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @returns {object} The result of the {@link sa p.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 * @public
 		 */
 
@@ -9548,7 +9668,7 @@ sap.ui.predefine(
 
 		/**
 		 * Checks if the focus is on the Go Button of the filter bar.
-
+		 *
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
 		 * @public
 		 */
@@ -15337,17 +15457,17 @@ sap.ui.predefine(
 				// we need to do this to be able to retrieve the child of the FormElementWrapper when its child is not visible
 				return _getMainControls(oContent.getContent());
 			}
-			if (oContent.isA("sap.fe.core.controls.FileWrapper")) {
+			if (oContent.isA("sap.fe.macros.controls.FileWrapper")) {
 				return _getMainControls(oContent.getAvatar());
 			}
-			if (oContent.isA("sap.fe.core.controls.FieldWrapper")) {
+			if (oContent.isA("sap.fe.macros.controls.FieldWrapper")) {
 				if (oContent.getEditMode() === "Display") {
 					return _getMainControls(oContent.getContentDisplay());
 				} else {
 					return _getMainControls(oContent.getContentEdit()[0]);
 				}
 			}
-			if (oContent.isA("sap.fe.core.controls.ConditionalWrapper")) {
+			if (oContent.isA("sap.fe.macros.controls.ConditionalWrapper")) {
 				var oLink = oContent.getCondition() ? oContent.getContentTrue() : oContent.getContentFalse();
 				return _getMainControls(oLink);
 			}
@@ -16011,6 +16131,15 @@ sap.ui.predefine(
 			return oMdcTable ? _getColumnIndex(vColumn, oMdcTable) : -1;
 		}
 
+		function _getTableForSelection(oRow) {
+			var oUIControl = oRow,
+				sTableType = oRow.getMetadata().getName() === "sap.ui.table.Row" ? "sap.ui.table.Table" : "sap.ui.mdc.Table";
+			while (oUIControl && !oUIControl.isA(sTableType)) {
+				oUIControl = oUIControl._feMdcTableWrapper || oUIControl.getParent();
+			}
+			return oUIControl;
+		}
+
 		function _getCell(oRow, iColumn) {
 			var oCell;
 			if (!oRow) {
@@ -16331,7 +16460,7 @@ sap.ui.predefine(
 
 		TableBuilder.prototype.doSelect = function (vRowMatcher) {
 			return this.doOnRows(vRowMatcher, function (oRow) {
-				var oTable = oRow.getParent();
+				var oTable = _getTableForSelection(oRow);
 				// if several rows are selected, the table may be blocked by other events, e.g. tableRuntime.js --> setContexts
 				if (oTable.getBusy()) {
 					oTable.setBusy(false);
@@ -17073,7 +17202,7 @@ sap.ui.predefine(
 							oCellControl = _getCell(oRow, iColumn);
 
 						// if the cellControl is a FieldWrapper replace it by its active control (edit or display)
-						if (oCellControl.isA("sap.fe.core.controls.FieldWrapper")) {
+						if (oCellControl.isA("sap.fe.macros.controls.FieldWrapper")) {
 							oCellControl =
 								oCellControl.getEditMode() === "Display"
 									? oCellControl.getContentDisplay()
@@ -17085,7 +17214,7 @@ sap.ui.predefine(
 									? oCellControl.getItems()[0].getContent().getContentDisplay()
 									: oCellControl.getItems()[0].getContent().getContentEdit()[0];
 						}
-						if (oCellControl.isA("sap.fe.core.controls.ConditionalWrapper")) {
+						if (oCellControl.isA("sap.fe.macros.controls.ConditionalWrapper")) {
 							oCellControl = oCellControl.getCondition() ? oCellControl.getContentTrue() : oCellControl.getContentFalse();
 						}
 
@@ -17839,11 +17968,15 @@ sap.ui.predefine(
 					oUriParams = new UriParameters(window.location.href),
 					sBackendUrl = oUriParams.get("useBackendUrl"),
 					sProxyPrefix = sBackendUrl ? "/databinding/proxy/" + sBackendUrl.replace("://", "/") : "",
-					bSuccess = false,
-					sTenantID =
-						window.__karma__ && window.__karma__.config && window.__karma__.config.ui5
-							? window.__karma__.config.ui5.shardIndex
-							: "default";
+					bSuccess = false;
+				var sTenantID = "";
+				if (window.__karma__ && window.__karma__.config && window.__karma__.config.ui5) {
+					sTenantID = window.__karma__.config.ui5.shardIndex;
+				} else {
+					sTenantID = window.location.href.includes("sap-client")
+						? new URL(window.location.href).searchParams.get("sap-client")
+						: "default";
+				}
 
 				return OpaBuilder.create(this)
 					.success(function () {
@@ -17982,12 +18115,12 @@ sap.ui.predefine("sap/fe/test/library", ["sap/ui/core/Core", "sap/ui/core/librar
     controls: [],
     elements: [],
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.111.1",
+    version: "1.113.0",
     noLibraryCSS: true
   });
   return thisLib;
 }, false);
 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.111.1"},"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":{"libs":{"sap.ui.core":{}}},"library":{"i18n":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.113.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":{"libs":{"sap.ui.core":{}}},"library":{"i18n":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}'
 });
 //# sourceMappingURL=library-preload.js.map