@openui5/sap.ui.core 1.119.0 → 1.120.0

package/src/sap/ui/qunit/QUnitUtils.js

@@ -16,30 +16,33 @@
 // The module ID argument is given because QUnitUtils.js often was included as a script Element in the past.
 // It is now recommended to use it via a module dependency (sap.ui.define).
 sap.ui.define('sap/ui/qunit/QUnitUtils', [
-	'jquery.sap.global',
-	'sap/base/util/ObjectPath',
-	'sap/ui/base/DataType',
-	'sap/ui/events/KeyCodes',
+	"sap/base/Log",
 	"sap/base/strings/camelize",
 	"sap/base/strings/capitalize",
-	"sap/base/util/UriParameters",
-	"sap/base/Log",
+	"sap/base/util/extend",
+	"sap/base/util/ObjectPath",
+	"sap/ui/base/DataType",
 	"sap/ui/core/Element",
+	"sap/ui/events/KeyCodes",
+	"sap/ui/thirdparty/jquery",
 	"sap/ui/dom/jquery/control" // jQuery Plugin "control"
 ],
 	function(
-		jQuery,
+		Log,
+		camelize,
+		capitalize,
+		extend,
 		ObjectPath,
 		DataType,
+		Element,
 		KeyCodes,
-		camelize,
-		capitalize,
-		UriParameters,
-		Log,
-		Element
+		jQuery
 	) {
 	"use strict";
 
+	/**
+	 * @deprecated As of 1.120
+	 */
 	if ( typeof QUnit !== 'undefined' ) {
 
 		// any version < 2.0 activates legacy support
@@ -47,11 +50,11 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 		var bLegacySupport = !(parseFloat(QUnit.version) >= 2.0);
 
 		// extract the URL parameters
-		var mParams = UriParameters.fromQuery(window.location.search);
+		var mParams = new URLSearchParams(window.location.search);
 
 		if ( bLegacySupport ) {
-		// TODO: Remove deprecated code once all projects adapted
-		QUnit.equals = window.equals = window.equal;
+			// TODO: Remove deprecated code once all projects adapted
+			QUnit.equals = window.equals = window.equal;
 		}
 
 		// Set a timeout for all tests, either to a value given via URL
@@ -65,8 +68,8 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 		}
 
 		if ( bLegacySupport ) {
-		// Do not reorder tests, as most of the tests depend on each other
-		QUnit.config.reorder = false;
+			// Do not reorder tests, as most of the tests depend on each other
+			QUnit.config.reorder = false;
 		}
 
 		// only when instrumentation is done on server-side blanket itself doesn't
@@ -117,6 +120,8 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 	 * @param {int} [iDelay] optional delay in milliseconds
 	 *
 	 * @public
+	 * @deprecated As of version 1.120, not needed with property async test design. If tests depend on theming,
+	 *    they rather should use the waitForTheme option or module <code>waitForThemeApplied</code>.
 	 */
 	QUtils.delayTestStart = function(iDelay){
 		QUnit.config.autostart = false;
@@ -131,7 +136,9 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 		}
 	};
 
-	var fixOriginalEvent = jQuery.noop;
+	var noop = function() {};
+
+	var fixOriginalEvent = noop;
 
 	try {
 
@@ -143,15 +150,15 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 		// if so, we might be running on top of jQuery 2.2.0 or higher and we have to add the native Event methods to the 'originalEvent'
 		fixOriginalEvent = function(origEvent) {
 			if ( origEvent ) {
-				origEvent.preventDefault = origEvent.preventDefault || jQuery.noop;
-				origEvent.stopPropagation = origEvent.stopPropagation || jQuery.noop;
-				origEvent.stopImmediatePropagation = origEvent.stopImmediatePropagation || jQuery.noop;
+				origEvent.preventDefault = origEvent.preventDefault || noop;
+				origEvent.stopPropagation = origEvent.stopPropagation || noop;
+				origEvent.stopImmediatePropagation = origEvent.stopImmediatePropagation || noop;
 			}
 		};
 
-		var OrigjQEvent = jQuery.Event;
+		const OrigjQEvent = jQuery.Event;
 		jQuery.Event = function(src, props) {
-			var event = new OrigjQEvent(src, props);
+			const event = new OrigjQEvent(src, props);
 			fixOriginalEvent(event.originalEvent);
 			return event;
 		};
@@ -575,11 +582,17 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 
 	// --------------------------------------------------------------------------------------------------
 
+	/**
+	 * @deprecated No longer used in DIST layer
+	 */
 	var FONT_WEIGHTS = {
 		'normal': 400,
 		'bold': 700
 	};
 
+	/**
+	 * @deprecated No longer used in DIST layer
+	 */
 	jQuery.fn.extend({
 
 		/**
@@ -666,7 +679,7 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 			if ( typeof sType === "string" ) {
 				mDefaultTestValues[sType] = ensureArray(aValues);
 			} else if ( typeof sType === "object" ) {
-				jQuery.extend(mDefaultTestValues, sType);
+				extend(mDefaultTestValues, sType);
 			}
 		};
 
@@ -677,27 +690,27 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 		QUtils.createSettingsDomain = function(oClass, oPredefinedValues) {
 
 			function createValues(sType) {
-				if ( mDefaultTestValues[sType] ) {
-					return mDefaultTestValues[sType];
-				}
-
-				try {
-					//TODO: global jquery call found
-					jQuery.sap.require(sType);
-				} catch (e) {
-					//escape eslint check for empty block
-				}
-				var oType = ObjectPath.get(sType);
-				if ( !(oType instanceof DataType) ) {
-					var r = [];
-					for (var n in oType) {
-						r.push(oType[n]);
+				if ( !mDefaultTestValues[sType] ) {
+					var oType = DataType.getType(sType);
+					var oEnumValues = oType && oType.isEnum() ? oType.getEnumValues() : undefined;
+					/**
+					 * @deprecated As of 1.120
+					 */
+					if (!oType) {
+						try {
+							sap.ui.requireSync(sType.replace(/\./g, "/")); // legacy-relevant legacy fallback
+						} catch (e) {
+							// ignore
+						}
+						oEnumValues = ObjectPath.get(sType);
+					}
+					if (oEnumValues && !(oEnumValues instanceof DataType)) {
+						mDefaultTestValues[sType] = Object.keys(oEnumValues);
+					} else {
+						mDefaultTestValues[sType] = [];
 					}
-					mDefaultTestValues[sType] = r;
-					return r;
 				}
-				return [];
-
+				return mDefaultTestValues[sType];
 			}
 
 			oClass = new oClass().getMetadata().getClass(); // resolves proxy
@@ -1080,9 +1093,15 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 
 	}());
 
-	// export
-	// TODO: Get rid of the old namespace and adapt the existing tests accordingly
+	// legacy global exports
+	/**
+	 *  TODO: Get rid of the old namespace and adapt the existing tests accordingly
+	 * @deprecated
+	 */
 	ObjectPath.set("sap.ui.test.qunit", QUtils);
+	/**
+	 * @deprecated
+	 */
 	window.qutils = QUtils;
 
 	return QUtils;

package/src/sap/ui/qunit/qunit-coverage.js

@@ -5,6 +5,12 @@
  */
 
 /*global jQuery, QUnit, URI, XMLHttpRequest, blanket, sap */// declare unusual global vars for JSLint/SAPUI5 validation
+/**
+ * @fileoverview
+ * @deprecated As of version 1.120, support for blanket-based instrumentation has been deprecated. As an alternative,
+ *    you might use the {@link https://github.com/SAP/ui5-tooling-extensions/tree/main/packages/middleware-code-coverage
+ *    @ui5/middleware-code-coverage}.
+ */
 (function() {
 	"use strict";
 

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

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @public
 	 * @since 1.48.0
@@ -87,12 +87,27 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 		"sap.ui.comp.smartform.Group",
 		"sap.ui.comp.smartform.GroupElement",
 		"sap.ui.comp.valuehelpdialog.ValueHelpDialog",
+		/**
+		 * @deprecated since 1.108
+		 */
 		"sap.ui.core.mvc.HTMLView",
+		/**
+		 * @deprecated since 1.120
+		 */
 		"sap.ui.core.mvc.JSONView",
+		/**
+		 * @deprecated since 1.90
+		 */
 		"sap.ui.core.mvc.JSView",
+		/**
+		 * @deprecated since 1.56
+		 */
 		"sap.ui.core.mvc.TemplateView",
 		"sap.ui.core.mvc.View",
 		"sap.ui.core.mvc.XMLView",
+		/**
+		 * @deprecated since 1.56
+		 */
 		"sap.ui.core.tmpl.Template",
 		"sap.ui.core.UIComponent",
 		"sap.ui.core.util.Export",
@@ -152,12 +167,27 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 		"sap.ui.commons.Tab",
 		"sap.ui.comp.transport.TransportDialog",
 		"sap.ui.core.ComponentContainer",
+		/**
+		 * @deprecated since 1.108
+		 */
 		"sap.ui.core.mvc.HTMLView",
+		/**
+		 * @deprecated since 1.120
+		 */
 		"sap.ui.core.mvc.JSONView",
+		/**
+		 * @deprecated since 1.90
+		 */
 		"sap.ui.core.mvc.JSView",
+		/**
+		 * @deprecated since 1.56
+		 */
 		"sap.ui.core.mvc.TemplateView",
 		"sap.ui.core.mvc.View",
 		"sap.ui.core.mvc.XMLView",
+		/**
+		 * @deprecated since 1.56
+		 */
 		"sap.ui.core.XMLComposite",
 		"sap.ui.mdc.BaseControl", // should be abstract?
 		"sap.ui.mdc.odata.v4.microchart.MicroChart", //The control only runs in views with XML pre-processor. The test can't provide this environment

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

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', "sap/ui/qunit/util
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/security/Security.js

@@ -0,0 +1,128 @@
+/*!
+ * copyright
+ */
+
+sap.ui.define([
+	"sap/base/config"
+], function(
+	BaseConfig
+) {
+	"use strict";
+
+	const oWritableConfig = BaseConfig.getWritableInstance();
+
+	/**
+	 * Helper function for getting the config option 'allowListService'
+	 * For legacy reasons configuration option provided via the global window object
+	 * are treated different compared to the option provided using bootstrap or meta
+	 * tag. Configuration options provided via globalThis/window object are always
+	 * prefixed with 'sapUi' therefore first check for param starting with 'sapUi'.
+	 * In case there is no param found check for param prefixed only with 'sap'.
+	 * @private
+	 * @since 1.120.0
+	 * @return {Object} An object containing the value of configuration
+	 * parameter allowListService and a flag whether the parameter is derived
+	 * from global provider or not.
+	 */
+	const getAllowlistService = () => {
+		let bGlobalProvider = true;
+		let sAllowlistService = oWritableConfig.get({
+			name: "sapUiAllowlistService",
+			type: oWritableConfig.Type.String,
+			defaultValue: oWritableConfig.get({
+				name: "sapUiWhitelistService",
+				type: oWritableConfig.Type.String,
+				defaultValue: undefined
+			})
+		});
+		if (!sAllowlistService) {
+			sAllowlistService = oWritableConfig.get({
+				name: "sapAllowlistService",
+				type: oWritableConfig.Type.String,
+				defaultValue: oWritableConfig.get({
+					name: "sapWhitelistService",
+					type: oWritableConfig.Type.String
+				})
+			});
+			bGlobalProvider = false;
+		}
+		return {
+			allowlistService: sAllowlistService,
+			globalProvider: bGlobalProvider
+		};
+	};
+	/**
+	 * Provides security related API
+	 *
+	 * @alias module:sap/ui/security/Security
+	 * @namespace
+	 * @public
+	 * @since 1.120.0
+	 */
+	const Security = {
+		/**
+		 * URL of the allowlist service.
+		 *
+		 * @return {string} allowlist service URL
+		 * @public
+		 * @since 1.120.0
+		*/
+		getAllowlistService: () => getAllowlistService().allowlistService,
+
+		/**
+		 * frameOptions mode (allow/deny/trusted).
+		 *
+		 * @return {string} frameOptions mode
+		 * @public
+		 * @since 1.120.0
+		 */
+		getFrameOptions() {
+			var sFrameOptions = oWritableConfig.get({
+				name: "sapUiFrameOptions",
+				type: oWritableConfig.Type.String,
+				defaultValue: "default"
+			});
+
+			if (sFrameOptions === "default") {
+				const oAllowlistService = getAllowlistService();
+				sFrameOptions = oAllowlistService.allowlistService && !oAllowlistService.globalProvider ? "trusted" : "allow";
+			}
+			return sFrameOptions;
+		},
+
+		/**
+		 * Returns the security token handlers of an OData V4 model.
+		 *
+		 * @returns {Array<function(sap.ui.core.URI):Promise>} the security token handlers (an empty array if there are none)
+		 * @public
+		 * @since 1.120.0
+		 * @see #setSecurityTokenHandlers
+		 */
+		getSecurityTokenHandlers() {
+			return oWritableConfig.get({
+				name: "sapUiSecurityTokenHandlers",
+				type: oWritableConfig.Type.FunctionArray
+			});
+		},
+
+		/**
+		 * Sets the security token handlers for an OData V4 model. See chapter
+		 * {@link topic:9613f1f2d88747cab21896f7216afdac/section_STH Security Token Handling}.
+		 *
+		 * @param {Array<function(sap.ui.core.URI):Promise>} aSecurityTokenHandlers - The security token handlers
+		 * @public
+		 * @since 1.120.0
+		 * @see #getSecurityTokenHandlers
+		 */
+		setSecurityTokenHandlers(aSecurityTokenHandlers) {
+			aSecurityTokenHandlers.forEach(function (fnSecurityTokenHandler) {
+				if (typeof fnSecurityTokenHandler !== "function") {
+					throw new Error("Not a function: " + fnSecurityTokenHandler);
+				}
+			});
+			oWritableConfig.set("sapUiSecurityTokenHandlers", aSecurityTokenHandlers.slice());
+		}
+	};
+
+	return Security;
+});

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

@@ -11,9 +11,8 @@ sap.ui.define([
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterType",
 	"sap/ui/model/json/JSONModel",
-	"sap/base/util/UriParameters",
 	"sap/base/security/encodeXML"
-], function (jQuery, Controller, XMLView, Filter, FilterType, JSONModel, UriParameters, encodeXML) {
+], function (jQuery, Controller, XMLView, Filter, FilterType, JSONModel, encodeXML) {
 	"use strict";
 
 	// lower case package names, UpperCamelCase class name, optional lowerCamelCase method name
@@ -463,7 +462,7 @@ sap.ui.define([
 
 	return function (iLinesOfContext, iThreshold, fnGetTestedModules, oCoverageData) {
 		var oDiv, oModel, aTestedModules,
-			oUriParameters = UriParameters.fromQuery(window.location.search);
+			oUriParameters = new URLSearchParams(window.location.search);
 
 		/*
 		 * Tells whether the given module corresponds 1:1 to a single class.

package/src/sap/ui/test/BlanketReporterUI.view.xml

@@ -104,7 +104,7 @@
 							preserveDecimals : false}}"/>
 				</table:template>
 			</table:Column>
-			<table:Column filterProperty="name" sortProperty="name" sorted="true">
+			<table:Column filterProperty="name" sortProperty="name" sorted="true" sortOrder="Ascending">
 				<table:label>
 					<Text text="File"/>
 				</table:label>

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

@@ -645,10 +645,9 @@
 		QUnit.module = module;
 		sap.ui.require([
 			"sap/base/Log",
-			"sap/base/util/UriParameters",
 			"sap/ui/base/SyncPromise"
-		], function (Log, UriParameters, SyncPromise) {
-			var oUriParameters = UriParameters.fromQuery(window.location.search);
+		], function (Log, SyncPromise) {
+			var oUriParameters = new URLSearchParams(window.location.search);
 
 			bInfo = Log.isLoggable(Log.Level.INFO, sClassName);
 			sFilter = oUriParameters.get("filter");

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

@@ -144,9 +144,16 @@
 	const bTestsFiltered = /(testId|filter)=/.test(window.location.search);
 
 	function filterCoverage() {
-		// only keep the coverage for the actually tested modules
-		if (window.__coverage__ && Object.keys(mCoverageSnapshotByModule ).length) {
-			window.__coverage__ = mCoverageSnapshotByModule;
+		if (window.__coverage__ && Object.keys(mCoverageSnapshotByModule).length) {
+			if (window.location.search.includes("moduleId=")) {
+				// only keep the coverage for the actually tested modules
+				window.__coverage__ = mCoverageSnapshotByModule;
+			} else {
+				// replace globally measured code coverage by isolated code coverage results
+				for (const [sModuleName, oCounts] of Object.entries(mCoverageSnapshotByModule)) {
+					setModuleCoverage(sModuleName, oCounts);
+				}
+			}
 		}
 	}
 
@@ -154,37 +161,58 @@
 		if (!window.__coverage__) {
 			return undefined;
 		}
+		if (sModuleName.endsWith(".js")) {
+			return sModuleName;
+		}
 		const sPath = `${sModuleName.replace(/\./g, "/")}.js`;
 		return Object.keys(window.__coverage__)
 			.find((sResourceName) => sResourceName.endsWith(sPath));
 	}
 
-	function resetBranchCounts(oCurrent, oInitial) {
-		const oCurrentCounts = oCurrent.b;
-		const oInitialCounts = oInitial.b;
-		for (const [sKey, aInitialCounts] of Object.entries(oInitialCounts)) {
-			const aCurrentCounts = oCurrentCounts[sKey];
+	/**
+	 * Replaces the current code coverage counts for branches by the given counts.
+	 *
+	 * @param {object} oCurrent The current branch counts
+	 * @param {object} oCounts The branch counts to be used
+	 */
+	function setBranchCounts(oCurrent, oCounts) {
+		const oCurrentBranchCounts = oCurrent.b;
+		const oBranchCounts = oCounts.b;
+		for (const [sKey, aInitialCounts] of Object.entries(oBranchCounts)) {
+			const aCurrentCounts = oCurrentBranchCounts[sKey];
 			aInitialCounts.forEach((iCount, i) => { aCurrentCounts[i] = iCount; });
 		}
 	}
 
-	function resetCounts(oCurrent, oInitial, sList) {
-		const oCurrentCounts = oCurrent[sList];
-		const oInitialCounts = oInitial[sList];
-		for (const [sKey, iCount] of Object.entries(oInitialCounts)) {
+	/**
+	 * Replaces the current code coverage counts by the given counts.
+	 *
+	 * @param {object} oCurrentCounts The current counts
+	 * @param {object} oCounts The counts to be used
+	 */
+	function setCounts(oCurrentCounts, oCounts) {
+		for (const [sKey, iCount] of Object.entries(oCounts)) {
 			oCurrentCounts[sKey] = iCount;
 		}
 	}
 
-	function resetModuleCoverage(sModuleName) {
+	/**
+	 * Sets the measured counts to the given values, or to the initial values if isolated counts
+	 * are not set.
+	 *
+	 * @param {string} sModuleName
+	 *   The module name
+	 * @param {object} [oIsolatedCounts]
+	 *   The measured isolated counts; if not given the initial counts are used
+	 */
+	function setModuleCoverage(sModuleName, oIsolatedCounts) {
 		const sResourceName = getResourceName(sModuleName);
 		if (sResourceName) {
-			// keep only coverage for the module loading
-			const oCurrent = window.__coverage__[sResourceName];
-			const oInitial = mInitialCoverageByModule[sResourceName];
-			resetBranchCounts(oCurrent, oInitial);
-			resetCounts(oCurrent, oInitial, "f");
-			resetCounts(oCurrent, oInitial, "s");
+			const oGlobalCounts = window.__coverage__[sResourceName];
+			const oCounts = oIsolatedCounts || mInitialCoverageByModule[sResourceName];
+			setBranchCounts(oGlobalCounts, oCounts);
+			setCounts(oGlobalCounts.f, oCounts.f);
+			setCounts(oGlobalCounts.s, oCounts.s);
 		}
 	}
 
@@ -273,7 +301,7 @@
 		mHooks.before = function () {
 			const oResult = fnBefore.apply(this, arguments);
 			if (!this.__ignoreIsolatedCoverage__) {
-				resetModuleCoverage(sTitle);
+				setModuleCoverage(sTitle);
 			}
 			return oResult;
 		};

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

@@ -96,9 +96,9 @@ sap.ui.define(['sap/ui/base/Object'],function(Ui5Object) {
          * <pre>
          *     <code>
          *      sap.ui.define([
-         *          'jquery.sap.global',
-         *          'sap/ui/test/OpaExtension'
-         *      ],function($, OpaExtension) {
+         *          'sap/ui/test/OpaExtension',
+         *          'sap/ui/thirdparty/jquery'
+         *      ],function(OpaExtension, $) {
          *          "use strict";
          *
          *          var customExtension = OpaExtension.extend("sap.ui.test.sample.CustomOpaExtension", {

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

@@ -24,12 +24,13 @@ sap.ui.define([
 	'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, View, Ancestor, MatcherFactory,
+], function (extend, ObjectPath, $, Global, UI5Object, UI5Element, StaticArea, View, Ancestor, MatcherFactory,
 			MatcherPipeline, _OpaLogger) {
 
 		/**
@@ -43,6 +44,7 @@ sap.ui.define([
 		var OpaPlugin = UI5Object.extend("sap.ui.test.OpaPlugin", /** @lends sap.ui.test.OpaPlugin.prototype */ {
 
 			constructor : function() {
+				UI5Object.call(this);
 				this._oLogger = _OpaLogger.getLogger("sap.ui.test.Opa5");
 				this._oMatcherFactory = new MatcherFactory();
 			},
@@ -145,8 +147,12 @@ sap.ui.define([
 			 * @public
 			 */
 			getControlInView : function (oOptions) {
-				var oView = this._getMatchingView(oOptions);
-				var bSearchForSingleControl = typeof oOptions.id === "string";
+				var bSearchForSingleControl = typeof oOptions.id === "string",
+					oView;
+
+				if (oOptions.viewName || oOptions.viewId) {
+					oView = this._getMatchingView(oOptions);
+				}
 
 				if (!oView) {
 					return bSearchForSingleControl ? null : [];
@@ -237,13 +243,17 @@ 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 = $(sap.ui.getCore().getStaticAreaRef());
+				var oStaticArea = $(StaticArea.getDomRef());
 				var vControls = this._getControlsInContainer(oStaticArea) || [];
 
 				if (oOptions.id) {
 					vControls = this._filterUniqueControlsByCondition(vControls, function (oControl) {
-						var sUnprefixedControlId = oControl.getId();
-						var oView = this._getMatchingView(oOptions);
+						var sUnprefixedControlId = oControl.getId(),
+							oView;
+
+						if (oOptions.viewName || oOptions.viewId) {
+							oView = this._getMatchingView(oOptions);
+						}
 
 						if (oView) {
 							// the view could be set globally or from page object. in this case, search inside open dialogs should take priority:

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

@@ -7,12 +7,11 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/merge",
-	"sap/base/util/UriParameters",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Lib",
 	"sap/ui/core/Rendering",
 	"sap/ui/thirdparty/jquery"
-], function (Log, merge, UriParameters, SyncPromise, Library, Rendering, jQuery) {
+], function (Log, merge, SyncPromise, Library, Rendering, jQuery) {
 	"use strict";
 	/*global QUnit, sinon */
 	// Note: The dependency to Sinon.JS has been omitted deliberately. Most test files load it via
@@ -26,7 +25,7 @@ sap.ui.define([
 		sMimeHeaders = "\r\nContent-Type: application/http\r\n"
 			+ "Content-Transfer-Encoding: binary\r\n",
 		rMultipartHeader = /^Content-Type:\s*multipart\/mixed;\s*boundary=/i,
-		oUriParameters = UriParameters.fromQuery(window.location.search),
+		oUriParameters = new URLSearchParams(window.location.search),
 		sAutoRespondAfter = oUriParameters.get("autoRespondAfter"),
 		sRealOData = oUriParameters.get("realOData"),
 		rRequestKey = /^(\S+) (\S+)$/,
@@ -587,7 +586,11 @@ sap.ui.define([
 					oResponse = aResponses[0];
 					if (typeof oResponse.buildResponse === "function") {
 						oResponse = merge({}, oResponse);
-						oResponse.buildResponse(oMatch.match, oResponse, oRequest);
+						try {
+							oResponse.buildResponse(oMatch.match, oResponse, oRequest);
+						} catch (oError) {
+							oResponse = error(500, oRequest, oError.stack);
+						}
 					}
 					if (oMatch.responses.length > 1) {
 						iAlternative = oMatch.responses.indexOf(oResponse);