@openui5/sap.ui.core 1.120.7 → 1.121.0

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
-		function(oCore, VersionInfo) {
+sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
+		function(oCore, VersionInfo, Lib) {
 	"use strict";
 
 	/**
@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.48.0
@@ -266,7 +266,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 			})
 			.then(function() {
 				// get a shallow copy the loaded library metadata
-				var mLibraries = oCore.getLoadedLibraries();
+				var mLibraries = Lib.all();
 				// filter libraries out that have not been requested
 				for (var sLibName in mLibraries) {
 					if (!fnFilter(sLibName)) {

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.48.0
@@ -118,7 +118,8 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 				oControl2.placeAt("qunit-fixture");
 				await nextUIUpdate();
 
-				oControl2.rerender(); // just re-render again - this finds problems
+				oControl2.invalidate(); // just re-render again - this finds problems
+				await nextUIUpdate();
 			}
 
 			if (fnSomeAdditionalFunction) {

package/src/sap/ui/qunit/utils/nextUIUpdate.js

@@ -19,17 +19,27 @@ sap.ui.define([
      * @namespace
      * @alias module:sap/ui/qunit/utils/nextUIUpdate
      * @public
-     * @returns {Promise<undefined>} A promise resolving when the next UI update is finished
+     * @param {sinon.clock} [clock] A sinon clock. When using sinon faketimers the clock must be ticked to ensure async rendering.
+     *  Async rendering is done with a setTimeout(0) so we tick a given clock by 1.
+     * @returns {Promise<undefined>} A promise resolving when the next UI update is finished or rejecting when the next update fails.
      */
-    function nextUIUpdate() {
-        return new Promise(function(resolve) {
-            function isUpdated() {
+    function nextUIUpdate(clock) {
+        return new Promise(function(resolve, reject) {
+            function isUpdated(oEvent) {
                 Rendering.detachUIUpdated(isUpdated);
-                resolve();
+                const error = oEvent.getParameter("failed");
+                if (error) {
+                    // prevent default: Rendering will not rethrow the error wich breaks a unit test even if the rejection is properly catched.
+                    oEvent.preventDefault();
+                    reject(error);
+                } else {
+                    resolve();
+                }
             }
 
             if (Rendering.isPending()) {
                 Rendering.attachUIUpdated(isUpdated);
+                clock?.tick?.();
             } else {
                 resolve();
             }

package/src/sap/ui/test/OpaBuilder.js

@@ -9,6 +9,7 @@ sap.ui.define(
         "sap/base/util/merge",
         "sap/base/strings/capitalize",
         "sap/base/Log",
+        "sap/ui/core/Lib",
         "sap/ui/test/Opa5",
         "sap/ui/test/actions/Action",
         "sap/ui/test/actions/Press",
@@ -22,6 +23,7 @@ sap.ui.define(
         mergeObjects,
         capitalize,
         Log,
+        Library,
         Opa5,
         Action,
         Press,
@@ -990,7 +992,7 @@ sap.ui.define(
                     aParameters = Array.prototype.slice.call(arguments, 3);
                 }
                 return function (oControl) {
-                    var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle(sLibrary),
+                    var oResourceBundle = Library.getResourceBundleFor(sLibrary),
                         sText = oResourceBundle.getText(sToken, aParameters),
                         oProperties = {};
 

package/src/sap/ui/test/OpaPlugin.js

@@ -23,14 +23,12 @@ sap.ui.define([
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/Global',
 	'sap/ui/base/Object',
-	'sap/ui/core/Element',
-	'sap/ui/core/StaticArea',
 	'sap/ui/core/mvc/View',
 	'sap/ui/test/matchers/Ancestor',
 	'sap/ui/test/matchers/MatcherFactory',
 	'sap/ui/test/pipelines/MatcherPipeline',
 	'sap/ui/test/_OpaLogger'
-], function (extend, ObjectPath, $, Global, UI5Object, UI5Element, StaticArea, View, Ancestor, MatcherFactory,
+], function (extend, ObjectPath, $, Global, UI5Object, View, Ancestor, MatcherFactory,
 			MatcherPipeline, _OpaLogger) {
 
 		/**
@@ -59,7 +57,7 @@ sap.ui.define([
 			 * @public
 			 */
 			getAllControls : function (fnConstructorType, sControlType) {
-				var aControls = UI5Element.registry.filter( makeTypeFilterFn(fnConstructorType) );
+				var aControls = OpaPlugin.getElementRegistry().filter( makeTypeFilterFn(fnConstructorType) );
 				this._oLogger.debug("Found " + aControls.length + " controls" +
 					(fnConstructorType ? " of type '" + (sControlType || fnConstructorType) + "'" : "") + " in page");
 				return aControls;
@@ -109,7 +107,7 @@ sap.ui.define([
 				}
 
 				if (oOptions.viewId) {
-					var oCoreElement = UI5Element.getElementById(oOptions.viewId);
+					var oCoreElement = OpaPlugin.getElementById(oOptions.viewId);
 					if (oCoreElement instanceof View && (!sViewName || oCoreElement.getViewName() === sViewName)) {
 						oView = oCoreElement;
 					}
@@ -243,8 +241,8 @@ sap.ui.define([
 
 			// get control in static area that matches a control type, ID (string, array, regex), viewId, viewName, fragmentId
 			_getControlsInStaticArea: function (oOptions) {
-				var oStaticArea = $(StaticArea.getDomRef());
-				var vControls = this._getControlsInContainer(oStaticArea) || [];
+				var oStaticAreaDomRef = $(OpaPlugin.getStaticAreaDomRef());
+				var vControls = this._getControlsInContainer(oStaticAreaDomRef) || [];
 
 				if (oOptions.id) {
 					vControls = this._filterUniqueControlsByCondition(vControls, function (oControl) {
@@ -519,7 +517,7 @@ sap.ui.define([
 				var hasExpectedType = makeTypeFilterFn(oOptions.controlType);
 
 				if (typeof oOptions.id === "string") {
-					var oControl = UI5Element.getElementById(oOptions.id) || null;
+					var oControl = OpaPlugin.getElementById(oOptions.id) || null;
 
 					if (oControl && !hasExpectedType(oControl)) {
 						this._oLogger.error("A control with global ID '" + oOptions.id + "' is found but does not have required controlType '" +
@@ -536,7 +534,7 @@ sap.ui.define([
 
 				if (bMatchById) {
 					//Performance critical
-					UI5Element.registry.forEach(function(oElement, sId) {
+					OpaPlugin.getElementRegistry().forEach(function(oElement, sId) {
 						if (oOptions.id.test(sId)) {
 							aMatchIds.push(sId);
 						}
@@ -549,7 +547,7 @@ sap.ui.define([
 				var aUnmatchedIds = [];
 
 				aMatchIds.forEach(function (sId) {
-					var oControl = UI5Element.getElementById(sId);
+					var oControl = OpaPlugin.getElementById(sId);
 					// only return defined controls
 					if (oControl && hasExpectedType(oControl) && !oControl.bIsDestroyed) {
 						aMatchingControls.push(oControl);
@@ -713,6 +711,101 @@ sap.ui.define([
 		// delimiter after view or fragment prefix in control IDs
 		OpaPlugin.VIEW_ID_DELIMITER = "--";
 
+		/**
+		 * Returns <code>true</code> if there are any pending rendering tasks or when
+		 * such rendering tasks are currently being executed.
+		 * Internally forwards to {@link sap.ui.core.Rendering#isPending} or the corresponsing legacy API.
+		 * The legacy API is used when the tested app is loaded in an iframe that uses a lower UI5 version.
+		 *
+		 * @returns {boolean} true if there are pending (or executing) rendering tasks.
+		 * @protected
+		 */
+		OpaPlugin.isUIDirty = function() {
+			var oRendering = sap.ui.require("sap/ui/core/Rendering");
+			if (typeof oRendering?.isPending === "function") {
+				return oRendering.isPending();
+			}
+			var oCore = sap.ui.require("sap/ui/core/Core");
+			if (typeof oCore?.getUIDirty === "function") {
+				return oCore.getUIDirty();
+			}
+		};
+
+		/**
+		 * Retrieves a resource bundle for the given library and locale.
+		 * Internally forwards to {@link sap.ui.core.Lib#getResourceBundleFor} or the corresponsing legacy API.
+		 * The legacy API is used when the tested app is loaded in an iframe that uses a lower UI5 version.
+		 *
+		 * @param {string} sLibraryName
+		 * @protected
+		 */
+		OpaPlugin.getLibraryResourceBundle = function(sLibraryName) {
+			var oLibrary = sap.ui.require("sap/ui/core/Lib");
+			if (typeof oLibrary?.getResourceBundleFor === "function") {
+				return oLibrary.getResourceBundleFor(sLibraryName);
+			}
+			var oCore = sap.ui.require("sap/ui/core/Core");
+			if (typeof oCore?.getLibraryResourceBundle === "function") {
+				return oCore.getLibraryResourceBundle(sLibraryName);
+			}
+		};
+
+		/**
+		 * Returns the registered element with the given ID, if any.
+		 * Internally forwards to {@link sap.ui.core.Element#getElementById} or the corresponsing legacy API.
+		 * The legacy API is used when the tested app is loaded in an iframe that uses a lower UI5 version.
+		 *
+		 * @param {sap.ui.core.ID|null|undefined} sId ID of the element to search for
+		 * @returns {sap.ui.core.Element|undefined} Element with the given ID or <code>undefined</code>
+		 * @protected
+		 */
+		OpaPlugin.getElementById = function(sId) {
+			var oUI5Element = sap.ui.require("sap/ui/core/Element");
+
+			if (typeof oUI5Element.getElementById === "function") {
+				return oUI5Element.getElementById(sId);
+			}
+			if (typeof oUI5Element.registry?.get === "function") {
+				return oUI5Element.registry.get(sId);
+			}
+		};
+
+		/**
+		 * Returns the root element of the static, hidden area.
+		 * Internally forwards to {@link sap.ui.core.StaticArea#getDomRef} or the corresponsing legacy API.
+		 * The legacy API is used when the tested app is loaded in an iframe that uses a lower UI5 version.
+		 *
+		 * @returns {Element} the root DOM element of the static, hidden area
+		 * @protected
+		 */
+		OpaPlugin.getStaticAreaDomRef = function() {
+			var oStaticArea = sap.ui.require("sap/ui/core/StaticArea");
+			if (typeof oStaticArea?.getDomRef === "function") {
+				return oStaticArea.getDomRef();
+			}
+			var oCore = sap.ui.require("sap/ui/core/Core");
+			if (typeof oCore?.getStaticAreaRef === "function") {
+				return oCore.getStaticAreaRef();
+			}
+		};
+
+		/**
+		 * Return an object with all instances of <code>sap.ui.core.Element</code>,
+	 	 * keyed by their ID.
+		 * Internally requires {@link sap.ui.core.ElementRegistry} or the corresponsing legacy API.
+		 * The legacy API is used when the tested app is loaded in an iframe that uses a lower UI5 version.
+		 *
+		 * @returns {Object<sap.ui.core.ID,sap.ui.core.Element>}
+		 */
+		OpaPlugin.getElementRegistry = function() {
+			var oElementRegistry = sap.ui.require("sap/ui/core/ElementRegistry");
+
+			if (oElementRegistry) {
+				return oElementRegistry;
+			}
+			return sap.ui.require("sap/ui/core/Element").registry;
+		};
+
 		return OpaPlugin;
 	});
 

package/src/sap/ui/test/autowaiter/_UIUpdatesWaiter.js

@@ -5,16 +5,16 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Rendering",
-	"./WaiterBase"
-], function (Rendering, WaiterBase) {
+	"./WaiterBase",
+	"../OpaPlugin"
+], function (WaiterBase, OpaPlugin) {
 	"use strict";
 
 	var UIUpdatesWaiter = WaiterBase.extend("sap.ui.test.autowaiter._UIUpdatesWaiter", {
 		// ensure that timeouts set by control inner updates are not hooked into by _timeoutWaiter
 		// if an update is continuously made by the UI, at some point it will be ignored by this validation
 		hasPending: function () {
-			var bUIDirty = Rendering.isPending();
+			var bUIDirty = OpaPlugin.isUIDirty();
 			if (bUIDirty) {
 				this._oHasPendingLogger.debug("The UI needs rerendering");
 			}

package/src/sap/ui/test/autowaiter/_navigationContainerWaiter.js

@@ -5,9 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Element",
+	"sap/ui/test/OpaPlugin",
 	"./WaiterBase"
-], function(Element, WaiterBase) {
+], function(OpaPlugin, WaiterBase) {
 	"use strict";
 
 	var NavigationContainerWaiter = WaiterBase.extend("sap.ui.test.autowaiter._navigationContainerWaiter", {
@@ -22,7 +22,7 @@ sap.ui.define([
 				return oControl instanceof fnNavContainer;
 			}
 
-			return Element.registry.filter(isNavContainer).some(function (oNavContainer) {
+			return OpaPlugin.getElementRegistry().filter(isNavContainer).some(function (oNavContainer) {
 				if (oNavContainer._bNavigating) {
 					this._oHasPendingLogger.debug("The NavContainer " + oNavContainer + " is currently navigating");
 				}

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/test/launchers/iFrameLauncher.js

@@ -94,12 +94,22 @@ sap.ui.define([
 			return true;
 		}
 
-		if (oFrameWindow && oFrameWindow.sap && oFrameWindow.sap.ui && oFrameWindow.sap.ui.getCore) {
-			if (!bRegisteredToUI5Init) {
-				oFrameWindow.sap.ui.getCore().attachInit(handleUi5Loaded);
-			}
+		if (!bRegisteredToUI5Init && oFrameWindow?.sap?.ui) {
+			if ( oFrameWindow.sap.ui.require ) {
+				// use the more modern Core.ready, if available
+				const oFrameCore = oFrameWindow.sap.ui.require("sap/ui/core/Core");
+				if (typeof oFrameCore?.ready === "function") {
+					oFrameCore.ready(handleUi5Loaded);
+					bRegisteredToUI5Init = true;
+					return bUi5Loaded;
+				}
 
-			bRegisteredToUI5Init = true;
+				// otherwise, fall back to the older sap.ui.getCore().attachInit
+				if (typeof oFrameCore?.attachInit === "function") {
+					oFrameCore.attachInit(handleUi5Loaded);
+					bRegisteredToUI5Init = true;
+				}
+			}
 		}
 
 		return bUi5Loaded;
@@ -144,7 +154,6 @@ sap.ui.define([
 	}
 
 	function registerFrameResourcePaths () {
-		oFrameJQuery = oFrameWindow.jQuery;
 		//All Opa related resources in the iframe should be the same version
 		//that is running in the test and not the (evtl. not available) version of Opa of the running App.
 		registerAbsoluteResourcePathInIframe("sap/ui/test");
@@ -269,6 +278,7 @@ sap.ui.define([
 			"sap/ui/test/autowaiter/_autoWaiter",
 			"sap/ui/test/_OpaLogger",
 			"sap/ui/qunit/QUnitUtils",
+			"sap/ui/thirdparty/jquery",
 			"sap/ui/thirdparty/hasher",
 			"sap/ui/core/routing/History",
 			"sap/ui/core/routing/HashChanger"
@@ -278,6 +288,7 @@ sap.ui.define([
 			_autoWaiter,
 			_OpaLogger,
 			QUnitUtils,
+			frameJQuery,
 			hasher,
 			History,
 			HashChanger
@@ -286,6 +297,7 @@ sap.ui.define([
 			oFramePlugin = new OpaPlugin();
 			oAutoWaiter = _autoWaiter;
 			oFrameUtils = QUnitUtils;
+			oFrameJQuery = frameJQuery;
 			if (!bDisableHistoryOverride) {
 				modifyIFrameNavigation(hasher, History, HashChanger);
 			}

package/src/sap/ui/test/matchers/Descendant.js

@@ -42,7 +42,8 @@ sap.ui.define([
 			var oDescendantControl;
 			if (typeof vDescendantControl === "string") {
 				var oAppWindow = oVisitor._getApplicationWindow();
-				oDescendantControl = oAppWindow.sap.ui.require("sap/ui/core/Element").getElementById(vDescendantControl);
+				oDescendantControl = oAppWindow.sap.ui.require("sap/ui/test/OpaPlugin")
+					.getElementById(vDescendantControl);
 			} else {
 				oDescendantControl = vDescendantControl;
 			}

package/src/sap/ui/test/matchers/I18NText.js

@@ -3,7 +3,10 @@
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], function (Matcher, capitalize) {
+sap.ui.define([
+	"sap/ui/test/matchers/Matcher",
+	"sap/base/strings/capitalize"
+], function (Matcher, capitalize) {
 	"use strict";
 
 	/**
@@ -118,7 +121,8 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 			if (bUseLibraryBundle) {
 				var sLibraryName = oControl.getMetadata().getLibraryName();
 
-				oBundle = sap.ui.getCore().getLibraryResourceBundle(sLibraryName);
+				oBundle = sap.ui.require("sap/ui/test/OpaPlugin")
+					.getLibraryResourceBundle(sLibraryName);
 			} else {
 				oBundle = oModel.getResourceBundle();
 

package/src/sap/ui/test/matchers/Interactable.js

@@ -79,9 +79,8 @@ sap.ui.define([
 				return false;
 			}
 
-			var oAppWindowJQuery = this._getApplicationWindow().jQuery;
-			var oStaticArea = this._getApplicationWindow().sap.ui.require("sap/ui/core/Core").getStaticAreaRef();
-			var bControlIsInStaticArea = oAppWindowJQuery.contains(oStaticArea, oControl.getDomRef());
+			var oAppWindowJQuery = this._getApplicationWindowJQuery();
+			var bControlIsInStaticArea = this._isInStaticArea(oControl.getDomRef());
 			var bOpenStaticBlockingLayer = oAppWindowJQuery("#sap-ui-blocklayer-popup").is(":visible");
 
 			if (!bControlIsInStaticArea && bOpenStaticBlockingLayer) {

package/src/sap/ui/test/matchers/LabelFor.js

@@ -145,9 +145,11 @@ sap.ui.define([
 			}
 
 			var fnLabelType = this._getApplicationWindow().sap.ui.require("sap/m/Label");
-			var aLabelsInPage = this._getApplicationWindow().sap.ui.require("sap/ui/core/Element").registry.filter(function (oElement) {
-				return oElement instanceof fnLabelType;
-			});
+			var aLabelsInPage = this._getApplicationWindow().sap.ui.require("sap/ui/test/OpaPlugin")
+				.getElementRegistry()
+				.filter(function (oElement) {
+					return oElement instanceof fnLabelType;
+				});
 
 			oI18nMatcher.applySettings({
 				key: sKey,

package/src/sap/ui/test/matchers/Matcher.js

@@ -58,6 +58,26 @@ sap.ui.define([
 				// matcher context === app context
 				return window;
 			}
+		},
+
+		_getApplicationWindowJQuery: function () {
+			var Opa5 = sap.ui.require("sap/ui/test/Opa5");
+			if (Opa5) {
+				// matcher context === test context, because Opa5 is loaded
+				return Opa5.getJQuery();
+			} else {
+				// matcher context === app context
+				return sap.ui.require("sap/ui/thirdparty/jquery");
+			}
+		},
+
+		_isInStaticArea: function(oDomElement) {
+			var oAppWindow = this._getApplicationWindow(),
+				oAppWindowJQuery = this._getApplicationWindowJQuery(),
+				oStaticArea = oAppWindow.sap.ui.require("sap/ui/test/OpaPlugin")
+					.getStaticAreaDomRef();
+
+			return oAppWindowJQuery.contains(oStaticArea, oDomElement);
 		}
 
 	});

package/src/sap/ui/test/matchers/Sibling.js

@@ -47,7 +47,8 @@ sap.ui.define([
 				// declarative matchers:
 				// sibling is already resolved by opa or controlfinder - here we deal only with the id
 				var oAppWindow = oMatcher._getApplicationWindow();
-				oSiblingControl = oAppWindow.sap.ui.require("sap/ui/core/Element").getElementById(vSibling);
+				oSiblingControl = oAppWindow.sap.ui.require("sap/ui/test/OpaPlugin")
+					.getElementById(vSibling);
 			} else {
 				oSiblingControl = vSibling;
 			}

package/src/sap/ui/test/matchers/_Visitor.js

@@ -19,9 +19,6 @@ sap.ui.define([
 				return true;
 			}
 
-			var oAppWindow = this._getApplicationWindow(),
-			oAppWindowJQuery = oAppWindow.jQuery,
-			oStaticArea = oAppWindow.sap.ui.require("sap/ui/core/Core").getStaticAreaRef();
 
 			var oParent = oControl.getParent();
 			if (bDirect) {
@@ -32,7 +29,8 @@ sap.ui.define([
 				if (fnMatch(oParent)) {
 					return true;
 				}
-				oParent = (oParent.isA("sap.ui.core.UIComponent") &&  !oAppWindowJQuery.contains(oStaticArea, oControl.getDomRef()))
+				oParent = (oParent.isA("sap.ui.core.UIComponent")
+					&&  !this._isInStaticArea(oControl.getDomRef()))
 					? oParent.oContainer : oParent.getParent();
 			}
 

package/src/sap/ui/test/qunitPause.js

@@ -5,8 +5,7 @@
  */
 
 /*global QUnit */
-sap.ui.define("sap/ui/test/qunitPause", [
-], function () {
+(function() {
 	"use strict";
 
 	var PAUSE_RULES = {
@@ -225,7 +224,7 @@ sap.ui.define("sap/ui/test/qunitPause", [
 		});
 	}
 
-	return {
+	const qunitPause = {
 		PAUSE_RULES: PAUSE_RULES,
 		paused: paused,
 		get pauseRule() {
@@ -250,4 +249,7 @@ sap.ui.define("sap/ui/test/qunitPause", [
 		emitResume: emitResume,
 		pollForQUnitDone: pollForQUnitDone
 	};
-}, true);
+
+	setupBeforeQUnit();
+	sap.ui.define("sap/ui/test/qunitPause", [], qunitPause, true);
+}());

package/src/sap/ui/test/selectors/_ControlSelectorGenerator.js

@@ -457,14 +457,15 @@
     };
 
      /**
-     * Iterate through all controls a a given level and attempt to generate a unique selector for each one.
+     * Iterate through all controls at a given level and attempt to generate a unique selector for each one.
      * stop the cycle as soon as one unique selector is found
      * @param {object} oOptions Object with options
-     * @param {Array} oOptions.siblings the children at a given tree level
+     * @param {array} oOptions.siblings the children at a given tree level
      * @param {object} oOptions.options filter options
      * @param {number} oOptions.index index of the child for which to start the search
      * @param {object} oOptions.targetMultiSelector intermediate selector for the target - not unique
-     * @param {object} oOptions.level.siblings siblings at the current level
+     * @param {object} oOptions.level options related to the current level
+     * @param {array} oOptions.level.siblings siblings at the current level
      * @param {number} oOptions.level.number the current level
      * @param {number} oOptions.level.width maximum width to search for the current level
      * @returns {object} a selector

package/src/sap/ui/test/selectors/_Selector.js

@@ -9,10 +9,10 @@ sap.ui.define([
     "sap/ui/base/ManagedObject",
     "sap/ui/test/_OpaLogger",
     'sap/ui/test/_ControlFinder',
-    'sap/ui/core/Element',
+    'sap/ui/core/ElementRegistry',
     'sap/ui/core/mvc/View',
     'sap/ui/base/ManagedObjectMetadata'
-], function (extend, ManagedObject, _OpaLogger, _ControlFinder, UI5Element, View, ManagedObjectMetadata) {
+], function (extend, ManagedObject, _OpaLogger, _ControlFinder, UI5ElementRegistry, View, ManagedObjectMetadata) {
     "use strict";
 
     /**
@@ -138,7 +138,7 @@ sap.ui.define([
             var sViewName = oView.getViewName();
 
             if (ManagedObjectMetadata.isGeneratedId(sViewId)) {
-                var aViewsWithSameName = UI5Element.registry.filter(function (oElement) {
+                var aViewsWithSameName = UI5ElementRegistry.filter(function (oElement) {
                     return oElement instanceof View;
                 }).filter(function (oElement) {
                     return oElement.getViewName() === sViewName;

package/src/sap/ui/test/starter/_setupAndStart.js

@@ -132,7 +132,7 @@ sap.ui.define([
 
 	function initTestModule(oConfig) {
 		var pAfterLoader, pQUnit, pSinon, pSinonQUnitBridge, pSinonConfig, pCoverage, pTestEnv,
-			oQUnitConfig, aJUnitDoneCallbacks;
+			oQUnitConfig;
 
 		document.title = oConfig.title;
 
@@ -164,22 +164,7 @@ sap.ui.define([
 				utils.addStylesheet(oQUnitConfig.css);
 				return requireP(oQUnitConfig.module);
 			}).then(function() {
-
-				// install a mock version of the qunit-reporter-junit API to collect jUnitDone callbacks
-				aJUnitDoneCallbacks = [];
-				QUnit.jUnitDone = function(cb) {
-					aJUnitDoneCallbacks.push(cb);
-				};
 				return requireP("sap/ui/qunit/qunit-junit");
-			}).then(function() {
-				delete QUnit.jUnitDone;
-				return requireP("sap/ui/thirdparty/qunit-reporter-junit");
-			}).then(function() {
-				// now register the collected callbacks with the real qunit-reporter-junit API
-				aJUnitDoneCallbacks.forEach(function(cb) {
-					QUnit.jUnitDone(cb);
-				});
-				aJUnitDoneCallbacks = undefined;
 			});
 		}
 
@@ -425,8 +410,8 @@ sap.ui.define([
 			pTestEnv = pTestEnv.then(function() {
 				return new Promise(function(resolve, reject) {
 					sap.ui.require(["sap/ui/core/Core"], function(core) {
-						core.boot();
-						core.attachInit(resolve);
+						core.boot?.(); // method no longer exists with new bootstrap
+						core.ready(resolve);
 					}, reject);
 				});
 			});
@@ -468,6 +453,8 @@ sap.ui.define([
 
 	}
 
+	utils.registerResourceRoots();
+
 	var oParams = new URLSearchParams(window.location.search),
 		sSuiteName = utils.getAttribute('data-sap-ui-testsuite') || oParams.get("testsuite"),
 		sTestName = utils.getAttribute('data-sap-ui-test') || oParams.get("test");