@openui5/sap.ui.core 1.118.0 → 1.119.0

package/test/sap/ui/core/qunit/opa/selectors/_Selector.js

@@ -1,12 +1,13 @@
 /*global QUnit, sinon*/
 sap.ui.define([
 	"sap/ui/test/selectors/_Selector",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
 	"sap/m/Button",
 	"sap/m/Dialog",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function (_Selector, View, XMLView, Button, Dialog, nextUIUpdate) {
+], function (_Selector, Element, View, XMLView, Button, Dialog, nextUIUpdate) {
 	"use strict";
 
 	var singleStub = sinon.stub();
@@ -193,7 +194,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Should skip viewName when multiple views will match", function (assert) {
-		var oTile = sap.ui.getCore().byId("tile-0");
+		var oTile = Element.getElementById("tile-0");
 		singleStub.returns({
 			property: "value"
 		});

package/test/sap/ui/core/qunit/opa/selectors/_TableRowItem.js

@@ -2,10 +2,11 @@
 sap.ui.define([
 	"sap/ui/test/selectors/_TableRowItem",
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function (_TableRowItem, _ControlSelectorGenerator, XMLView, JSONModel, nextUIUpdate) {
+], function (_TableRowItem, _ControlSelectorGenerator, Element, XMLView, JSONModel, nextUIUpdate) {
 	"use strict";
 
 	function getViewContent() {
@@ -55,7 +56,7 @@ sap.ui.define([
 
 	QUnit.test("Should select a control in table row", function (assert) {
 		var fnDone = assert.async();
-		var oControl = sap.ui.getCore().byId("myView--objectId-myView--myTable-0");
+		var oControl = Element.getElementById("myView--objectId-myView--myTable-0");
 		_ControlSelectorGenerator._generate({control: oControl._getTextControl(), includeAll: true})
 			.then(function (aSelectors) {
 				var mTableSelector = aSelectors[1][0];
@@ -68,7 +69,7 @@ sap.ui.define([
 
 	QUnit.test("Should find control table and row", function (assert) {
 		var oGenerator = new _TableRowItem();
-		var oControl = sap.ui.getCore().byId("myView--objectId-myView--myTable-0");
+		var oControl = Element.getElementById("myView--objectId-myView--myTable-0");
 		var oRow = oGenerator._getValidationRoot(oControl);
 		var oTable = oGenerator._getAncestor(oControl);
 		assert.ok(oGenerator._isAncestorRequired());

package/test/sap/ui/core/qunit/rule/app/deprecatedJSViewUsage.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 sap.ui.define(["sap/base/Log",
 	"test-resources/sap/ui/support/TestHelper",
 	"sap/ui/core/mvc/View",

package/test/sap/ui/core/qunit/rule/app/globalApiUsage.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 sap.ui.define(["sap/base/Log", "test-resources/sap/ui/support/TestHelper"], function(Log, testRule) {
 	"use strict";
 

package/test/sap/ui/core/qunit/rule/app/jquerySapUsage.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 sap.ui.define(["sap/base/Log", "test-resources/sap/ui/support/TestHelper"], function(Log, testRule) {
 	"use strict";
 

package/test/sap/ui/core/qunit/rule/app/syncXHR.qunit.js

@@ -1,4 +1,8 @@
 /* global QUnit */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Control",

package/test/sap/ui/core/qunit/rule/app/syncXHRBootstrap.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit, sinon */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 (function() {
 	"use strict";
 

package/test/sap/ui/core/qunit/rule/app/syncXHRBootstrapDebug.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit, sinon */
+/**
+ * @fileoverview
+ * @deprecated
+ */
 (function() {
 	"use strict";
 

package/test/sap/ui/core/qunit/rule/app/syncXHRBootstrapDebugBeforeBootstrap.js

@@ -1,3 +1,7 @@
+/**
+ * @fileoverview
+ * @deprecated
+ */
 (function() {
 	"use strict";
 	window["sap-ui-config"] = {debug: true};

package/test/sap/ui/core/qunit/rule/config/asynchronousXMLViews.qunit.js

@@ -1,5 +1,8 @@
 /*global QUnit*/
-
+/**
+ * @fileoverview
+ * @deprecated
+ */
 sap.ui.define([
 	"jquery.sap.global",
 	"sap/base/Log",

package/test/sap/ui/core/qunit/rule/misc/silentEventBus.qunit.js

@@ -2,9 +2,10 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/EventBus",
 	"jquery.sap.global",
 	"test-resources/sap/ui/support/TestHelper"
-], function(Log, jQuery, testRule) {
+], function(Log, EventBus, jQuery, testRule) {
 	"use strict";
 
 	// the rules rely on a certain log level for analyzing issues
@@ -14,20 +15,20 @@ sap.ui.define([
 
 		beforeEach: function() {
 			this.listener = function(){};
-			sap.ui.getCore().getEventBus().subscribe("myChannel", "myEvent", this.listener);
+			EventBus.getInstance().subscribe("myChannel", "myEvent", this.listener);
 
 			//these 2 publications should be responsible for 2 issues being found
-			sap.ui.getCore().getEventBus().publish("otherChannel", "myEvent", {data: 47});
-			sap.ui.getCore().getEventBus().publish("myListener", {data: 47});
+			EventBus.getInstance().publish("otherChannel", "myEvent", {data: 47});
+			EventBus.getInstance().publish("myListener", {data: 47});
 
 			//event should be excluded as it starts with sap
-			sap.ui.getCore().getEventBus().publish("sap.ui", "__fireUpdate", {data: 47});
+			EventBus.getInstance().publish("sap.ui", "__fireUpdate", {data: 47});
 
 			//event should not be counted as it successfully is subscribed to
-			sap.ui.getCore().getEventBus().publish("myChannel", "myEvent", {data: 47});
+			EventBus.getInstance().publish("myChannel", "myEvent", {data: 47});
 		},
 		afterEach: function() {
-			sap.ui.getCore().getEventBus().unsubscribe("myChannel", "myEvent", this.listener);
+			EventBus.getInstance().unsubscribe("myChannel", "myEvent", this.listener);
 		}
 	});
 

package/test/sap/ui/core/qunit/rule/model/modelSupport.qunit.js

@@ -16,6 +16,7 @@ sap.ui.define([
 	"sap/ui/test/TestUtils"
 ], function(Log, Button, StandardListItem, Table, Text, VBox, JSONModel, CountMode, ODataV2Model, ODataV4Model,
 		SupportLib, RuleAnalyzer, TestUtils) {
+	/*global sinon*/
 	"use strict";
 
 	QUnit.module("sap.ui.core.rules.Model.support", {
@@ -50,8 +51,16 @@ sap.ui.define([
 					: oEmptyV4Response
 			});
 			this.oLogMock = this.mock(Log);
-			this.oLogMock.expects("warning").never();
-			this.oLogMock.expects("error").never();
+			this.oLogMock.expects("warning")
+				.withExactArgs(
+					sinon.match((sMsg) => /retry loading JavaScript resource: .*library\.support\.js/.test(sMsg)),
+					undefined, "sap.ui.ModuleSystem", undefined)
+				.atLeast(0);
+			this.oLogMock.expects("error")
+				.withExactArgs(
+					sinon.match((sMsg) => /failed to load JavaScript resource: .*library\.support\.js/.test(sMsg)),
+					undefined, "sap.ui.ModuleSystem", undefined)
+				.atLeast(0);
 			this.oLogMock.expects("fatal").never();
 		}
 	});

package/test/sap/ui/core/qunit/rule/testsuite.rule.qunit.js

@@ -15,6 +15,9 @@ sap.ui.define(function () {
 			}
 		},
 		tests: {
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"config/asynchronousXMLViews": {
 				title: "QUnit Tests for 'async XML Views' rules",
 				loader: {
@@ -43,23 +46,38 @@ sap.ui.define(function () {
 			"app/globalApiUsage": {
 				title: "QUnit Tests for 'global api usage' rules"
 			},
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"app/jquerySapUsage": {
 				title: "QUnit Tests for 'jquery sap usage' rules"
 			},
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"app/syncFactoryLoading": {
 				title: "QUnit Tests for 'sync fragment loading' rules"
 			},
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"app/syncXHR": {
 				title: "QUnit Tests for 'sync XHR' rules",
 				qunit: {
 					reorder: false
 				}
 			},
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"app/syncXHRBootstrap": {
 				title: "QUnit Tests for 'sync XHR bootstrap' rules",
 				bootCore: false,
 				page: "test-resources/sap/ui/core/qunit/rule/app/syncXHRBootstrap.qunit.html?sap-language=en"
 			},
+			/**
+			 * @deprecated As of version 1.119
+			 */
 			"app/syncXHRBootstrapDebug": {
 				/*
 				 * Test never worked as expected as the debug mode could not be activated via window["sap-ui-config"].

package/test/sap/ui/core/qunit/test/starter/find/main.js

@@ -20,8 +20,10 @@ sap.ui.define([
 	"sap/m/Text",
 	"sap/m/Toolbar",
 	"sap/ui/core/Core",
+	"sap/ui/core/Element",
 	"sap/ui/table/Table",
 	"sap/ui/table/Column",
+	"sap/ui/table/rowmodes/Auto",
 	"sap/ui/model/Filter",
 	"sap/ui/model/json/JSONModel",
 	"sap/base/Log",
@@ -31,7 +33,7 @@ sap.ui.define([
 	"require",
 	"./discovery",
 	"./filter"
-], function(App, Bar, HBox, Label, Link, Page, SearchField, SegmentedButton, SegmentedButtonItem, Text, Toolbar, Core, Table, Column, Filter, JSONModel, Log, includeStylesheet, Storage, _utils, require, discovery, makeFilterFunction) {
+], function(App, Bar, HBox, Label, Link, Page, SearchField, SegmentedButton, SegmentedButtonItem, Text, Toolbar, Core, Element, Table, Column, AutoRowMode, Filter, JSONModel, Log, includeStylesheet, Storage, _utils, require, discovery, makeFilterFunction) {
 	"use strict";
 
 	function compare(s1,s2) {
@@ -207,8 +209,9 @@ sap.ui.define([
 							selectionMode: "None",
 							columnHeaderHeight: 24,
 							columnHeaderVisible: true,
-							visibleRowCountMode: "Auto",
-							rowHeight: 20,
+							rowMode: new AutoRowMode({
+								rowContentHeight: 20
+							}),
 							columns: [
 								new Column("test",{
 									//width: "85px",
@@ -318,16 +321,16 @@ sap.ui.define([
 
 	uiCreated.then(() => {
 
-		const search = sap.ui.getCore().byId("search");
+		const search = Element.getElementById("search");
 		search.setValue( cleanURL(url.searchParams.get("testpage")) || "");
 		const entryPage = cleanURL(url.searchParams.get("root")) || _utils.getAttribute("data-sap-ui-root-testsuite") || "test-resources/qunit/testsuite.qunit.html";
 
 		if ( restoreData(entryPage) ) {
-			sap.ui.getCore().byId("app").setBusy(false);
+			Element.getElementById("app").setBusy(false);
 		}
 
 		discovery.findTests( entryPage, progress ).then( (aTests) => {
-			sap.ui.getCore().byId("app").setBusy(false);
+			Element.getElementById("app").setBusy(false);
 			oTable.setFooter("Refresh: done.");
 			const aTestPageUrls = [];
 			// filter duplicate tests and sort them
@@ -358,8 +361,8 @@ sap.ui.define([
 						id: "chart",
 						visible: false
 					});
-					sap.ui.getCore().byId("page").addContent(oTreeMapChart);
-					sap.ui.getCore().byId("view").getItems()[1].setEnabled(true);
+					Element.getElementById("page").addContent(oTreeMapChart);
+					Element.getElementById("view").getItems()[1].setEnabled(true);
 				}
 			});
 		}

package/test/sap/ui/core/qunit/testsuites/testsuite.databinding.qunit.js

@@ -51,6 +51,12 @@ sap.ui.define(function() {
 					language: "en-US"
 				}
 			},
+			ClientPropertyBinding : {
+				title: "sap.ui.model.ClientPropertyBinding - QUnit Tests",
+				module: [
+					"test-resources/sap/ui/core/qunit/model/ClientPropertyBinding.qunit"
+				]
+			},
 			ClientTreeBinding: {
 				title: "sap.ui.model.ClientTreeBinding - QUnit Tests",
 				module: ["test-resources/sap/ui/core/qunit/model/ClientTreeBinding.qunit"]

package/test/sap/ui/core/qunit/testsuites/testsuite.foundation.enablement.qunit.js

@@ -103,8 +103,14 @@ sap.ui.define(function() {
 			"base/util/uid": {
 				title: "QUnit Page for uid"
 			},
+			/**
+			 * @deprecated as of version 1.119
+			 */
 			"base/util/UriParameters": {
-				title: "QUnit Page for UriParameters"
+				title: "QUnit Page for UriParameters",
+				coverage: {
+					only: ["sap/base/util/UriParameters"]
+				}
 			},
 			/**
 			 * @deprecated as of version 1.90

package/test/sap/ui/core/qunit/testsuites/testsuite.theming.qunit.js

@@ -52,10 +52,12 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 					}
 				}
 			},
-			ThemeParameters: {
+			/**
+			 * Note: Contains tests for sync and async APIs, combined with legacy Core#loadLibrary.
+			 */
+			"ThemeParameters_legacyAPIs": {
 				title: "sap.ui.core.theming.Parameters",
 				ui5: {
-					libs: "sap.ui.legacy.testlib",
 					theme: "sap_hcb"
 				},
 				qunit: {
@@ -68,6 +70,23 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 					}
 				}
 			},
+			/**
+			 * Note: Only contains modern non-deprecated APIs.
+			 */
+			ThemeParameters: {
+				title: "sap.ui.core.theming.Parameters - Async Only",
+				ui5: {
+					theme: "sap_hcb"
+				},
+				qunit: {
+					reorder: false
+				},
+				loader: {
+					paths: {
+						"testlibs/themeParameters": "test-resources/sap/ui/core/qunit/testdata/libraries/themeParameters"
+					}
+				}
+			},
 			"ThemeHelper": {
 				title: "sap.ui.core.theming.ThemeHelper",
 				ui5: {

package/test/sap/ui/core/qunit/util/XMLPreprocessor.qunit.js

@@ -704,9 +704,8 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Note: "X" is really nothing special
-[false, true].forEach(function (bAsync) {
 	["true", true, 1, "X"].forEach(function (oFlag) {
-		QUnit.test("XML with template:if test='{/flag}', truthy, flag = " + oFlag,
+		QUnit.test("XML with template:if test='{/flag}', truthy, async = true, flag = " + oFlag,
 			function (assert) {
 				this.oSapUiMock.expects("require").on(sap.ui)
 					.atLeast(0) // only for the 1st run
@@ -719,11 +718,34 @@ sap.ui.define([
 					'</mvc:View>'
 				], {
 					models: new JSONModel({flag: oFlag})
-				}, undefined, /*bAsync*/bAsync);
+				}, undefined, true);
+			}
+		);
+	});
+
+	//*********************************************************************************************
+	// Note: "X" is really nothing special
+	["true", true, 1, "X"].forEach(function (oFlag) {
+		/**
+		 * @deprecated since 1.119.0
+		 */
+		QUnit.test("XML with template:if test='{/flag}', truthy, async = false, flag = " + oFlag,
+			function (assert) {
+				this.oSapUiMock.expects("require").on(sap.ui)
+					.atLeast(0) // only for the 1st run
+					.withArgs(["sap/ui/model/type/Boolean"]).callThrough();
+				return this.check(assert, [
+					mvcView("t"),
+					'<t:if test="{path: \'/flag\', type: \'sap.ui.model.type.Boolean\'}">',
+					'<In id="flag"/>',
+					'</t:if>',
+					'</mvc:View>'
+				], {
+					models: new JSONModel({flag: oFlag})
+				}, undefined, false);
 			}
 		);
 	});
-});
 
 	//*********************************************************************************************
 	// Note: " " intentionally not included yet, should not matter for OData!

package/test/sap/ui/core/qunit/util/jQuery.sap.Version.qunit.js

@@ -5,13 +5,13 @@ sap.ui.define([
 	"jquery.sap.global", // provides jQuery.sap.Version
 	"sap/base/config/GlobalConfigurationProvider",
 	"sap/ui/core/Core",
-	"sap/ui/core/Configuration"
+	"sap/ui/core/getCompatibilityVersion"
 ], function(
 	BaseConfig,
 	jQuery,
 	GlobalConfigurationProvider,
 	Core,
-	Configuration
+	getCompatibilityVersion
 ) {
 	"use strict";
 
@@ -69,9 +69,9 @@ sap.ui.define([
 			BaseConfig._.invalidate();
 			mConfigStubValues = oConf;
 			var dflt = jQuery.sap.Version(sExp1).toString();
-			assert.equal(Configuration.getCompatibilityVersion("").toString(), dflt, sText + ": Default (feature='')");
-			assert.equal(Configuration.getCompatibilityVersion("xx-test2").toString(), dflt, sText + ": Default (undef. feature)");
-			assert.equal(Configuration.getCompatibilityVersion("xx-test").toString(), jQuery.sap.Version(sExp2).toString(), sText + ": Result (avail. feature)");
+			assert.equal(getCompatibilityVersion("").toString(), dflt, sText + ": Default (feature='')");
+			assert.equal(getCompatibilityVersion("xx-test2").toString(), dflt, sText + ": Default (undef. feature)");
+			assert.equal(getCompatibilityVersion("xx-test").toString(), jQuery.sap.Version(sExp2).toString(), sText + ": Result (avail. feature)");
 		}
 
 		var currentVersion = jQuery.sap.Version(config.getVersion().getMajor(), config.getVersion().getMinor()).toString();

package/test/sap/ui/core/qunit/util/reflection/JsControlTreeModifier.qunit.js

@@ -226,6 +226,23 @@ sap.ui.define([
 			});
 		});
 
+		QUnit.test("moveAggregation in the same aggregation of the parent control", async function(assert) {
+			const oHBox = this.oXmlView.byId("hbox1");
+			const oMovedButton = this.oXmlView.byId("button1");
+			await JsControlTreeModifier.moveAggregation(oHBox, "items", oHBox, "items", oMovedButton, 2);
+			const oContentAggregation = await JsControlTreeModifier.getAggregation(oHBox, "items");
+			assert.strictEqual(oContentAggregation[2], oMovedButton);
+		});
+
+		QUnit.test("moveAggregation between different controls", async function(assert) {
+			const oSourceHBox = this.oXmlView.byId("hbox1");
+			const oTargetHBox = this.oXmlView.byId("hbox2");
+			const oMovedButton = this.oXmlView.byId("button1");
+			await JsControlTreeModifier.moveAggregation(oSourceHBox, "items", oTargetHBox, "items", oMovedButton, 1);
+			const oContentAggregation = await JsControlTreeModifier.getAggregation(oTargetHBox, "items");
+			assert.strictEqual(oContentAggregation[1], oMovedButton);
+		});
+
 		QUnit.test("createAndAddCustomData adds Custom Data properly", function(assert) {
 			var oCreateStub = sandbox.stub(JsControlTreeModifier, "createControl").resolves("foo");
 			var oSetPropertyStub = sandbox.stub(JsControlTreeModifier, "setProperty");
@@ -693,7 +710,7 @@ sap.ui.define([
 		}
 	}, function () {
 		QUnit.test("attachEvent() — basic case", function (assert) {
-			return JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1", { foo: "bar" }])
+			return JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1", { foo: "bar" }], window.$sap__qunit_presshandler1)
 				.then(function () {
 					this.oButton.firePress();
 					assert.strictEqual(this.oSpy1.callCount, 1);
@@ -703,8 +720,8 @@ sap.ui.define([
 
 		QUnit.test("attachEvent() — two different event handlers with different set of parameters for the same event name", function (assert) {
 			return Promise.all([
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1"]),
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param2", "param3"])
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1"], window.$sap__qunit_presshandler1),
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param2", "param3"], window.$sap__qunit_presshandler2)
 			]).then(function () {
 				this.oButton.firePress();
 				assert.strictEqual(this.oSpy1.callCount, 1);
@@ -717,14 +734,14 @@ sap.ui.define([
 		QUnit.test("attachEvent() — attempt to attach non-existent function", function (assert) {
 			return JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_non_existent_handler")
 				.catch(function (vError) {
-					assert.ok(vError.message.indexOf("function is not found") > -1, "then an exception is thrown");
+					assert.ok(vError.message.indexOf("fnCallback parameter missing or not a function") > -1, "then an exception is thrown");
 				});
 		});
 
 		QUnit.test("attachEvent() — two equal event handler functions with a different set of parameters", function (assert) {
 			return Promise.all([
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1"]),
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param2", "param3"])
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param0", "param1"], window.$sap__qunit_presshandler1),
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", ["param2", "param3"], window.$sap__qunit_presshandler1)
 			]).then(function () {
 				this.oButton.firePress();
 				assert.strictEqual(this.oSpy1.callCount, 2);
@@ -734,9 +751,9 @@ sap.ui.define([
 		});
 
 		QUnit.test("detachEvent() — basic case", function (assert) {
-			return JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1")
+			return JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", null, window.$sap__qunit_presshandler1)
 				.then(function () {
-					return JsControlTreeModifier.detachEvent(this.oButton, "press", "$sap__qunit_presshandler1");
+					return JsControlTreeModifier.detachEvent(this.oButton, "press", "$sap__qunit_presshandler1", window.$sap__qunit_presshandler1);
 				}.bind(this))
 				.then(function () {
 					this.oButton.firePress();
@@ -746,11 +763,11 @@ sap.ui.define([
 
 		QUnit.test("detachEvent() — three event handlers, two of them are with a different set of parameters", function (assert) {
 			return Promise.all([
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1"),
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param0", "param1"]),
-				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param2", "param3"])
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler1", null, window.$sap__qunit_presshandler1),
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param0", "param1"], window.$sap__qunit_presshandler2),
+				JsControlTreeModifier.attachEvent(this.oButton, "press", "$sap__qunit_presshandler2", ["param2", "param3"], window.$sap__qunit_presshandler2)
 			]).then(function () {
-				return JsControlTreeModifier.detachEvent(this.oButton, "press", "$sap__qunit_presshandler2");
+				return JsControlTreeModifier.detachEvent(this.oButton, "press", "$sap__qunit_presshandler2", window.$sap__qunit_presshandler2);
 			}.bind(this))
 			.then(function () {
 				this.oButton.firePress();
@@ -764,7 +781,7 @@ sap.ui.define([
 		QUnit.test("detachEvent() — attempt to detach non-existent function", function (assert) {
 			return JsControlTreeModifier.detachEvent(this.oButton, "press", "$sap__qunit_non_existent_handler")
 				.catch(function (vError) {
-					assert.ok(vError.message.indexOf("function is not found") > -1);
+					assert.ok(vError.message.indexOf("fnCallback parameter missing or not a function") > -1);
 				});
 		});
 	});