@openui5/sap.ui.core 1.123.0 → 1.124.0

package/test/sap/ui/core/qunit/CompositeBinding.qunit.js

@@ -3,6 +3,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/i18n/Localization",
 	"sap/base/util/deepEqual",
+	"sap/ui/base/DataType",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/CompositeBinding",
@@ -17,7 +18,7 @@ sap.ui.define([
 	"sap/ui/model/type/Float",
 	"sap/ui/model/type/Integer",
 	"sap/ui/model/type/String"
-], function (Log, Localization, deepEqual, UI5Date, BindingMode, CompositeBinding, CompositeType,
+], function (Log, Localization, deepEqual, DataType, UI5Date, BindingMode, CompositeBinding, CompositeType,
 		Context, ParseException, PropertyBinding, StaticBinding, ValidateException, JSONModel,
 		TypeDate, TypeFloat, TypeInteger, TypeString
 ) {
@@ -165,6 +166,171 @@ sap.ui.define([
 			"setExternalValue() does change model values for contained bindings");
 	});
 
+	//*********************************************************************************************
+[{
+	sMethod: "_setRawValue",
+	bInternalValues: false,
+	bRawValues: true
+}, {
+	sMethod: "_setInternalValue",
+	bInternalValues: true,
+	bRawValues: false
+}, {
+	sMethod: "_setExternalValue",
+	bInternalValues: false,
+	bRawValues: false
+}].forEach(function (oFixture) {
+	QUnit.test(`setExternalValue /w async type and context changed for method ${oFixture.sMethod}`, function (assert) {
+		const oBinding1 = {
+			getBindingMode() {},
+			getContext() {}
+		};
+		const oBinding2 = {
+			getBindingMode() {},
+			getContext() {}
+		};
+		const oCompositeBinding = {
+			aBindings: [oBinding1, oBinding2],
+			sInternalType: "string",
+			bInternalValues: oFixture.bInternalValues,
+			bRawValues: oFixture.bRawValues,
+			oType: {
+				getParseWithValues() {},
+				parseValue() {},
+				validateValue() {}
+			},
+			getDataState() {},
+			getValidateValues() {},
+			getValue() {}
+		};
+		const oDataState = {
+			setInvalidValue() {},
+			setValue() {}
+		};
+		this.mock(DataType).expects("getType").withExactArgs("string").returns("~oType");
+		const oCompositeBindingMock = this.mock(oCompositeBinding);
+		oCompositeBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oBindingMock1 = this.mock(oBinding1);
+		oBindingMock1.expects("getContext").withExactArgs().returns("~oUpdateContext1");
+		const oBindingMock2 = this.mock(oBinding2);
+		oBindingMock2.expects("getContext").withExactArgs().returns("~oUpdateContext2");
+		const oTypeMock = this.mock(oCompositeBinding.oType);
+		oTypeMock.expects("getParseWithValues").withExactArgs().returns(false);
+		oTypeMock.expects("parseValue")
+			.withExactArgs("~vValue", "string", undefined)
+			.returns(["~vParsedValue1", "~vParsedValue2"]);
+		oCompositeBindingMock.expects("getValidateValues")
+			.withExactArgs(["~vParsedValue1", "~vParsedValue2"])
+			.returns("~aValidateValues");
+		oTypeMock.expects("validateValue")
+			.withExactArgs("~aValidateValues").returns(Promise.resolve());
+
+		// code under test
+		const oPromise = CompositeBinding.prototype.setExternalValue.call(oCompositeBinding, "~vValue");
+
+		// After validation the contexts have changed due to the async nature of the type's validation
+		oBindingMock1.expects("getContext").withExactArgs().returns("~oNewContext1");
+		oBindingMock2.expects("getContext").withExactArgs().returns("~oNewContext1");
+		oBinding1[oFixture.sMethod] = () => {};
+		oBinding2[oFixture.sMethod] = () => {};
+		oBindingMock1.expects("getBindingMode").withExactArgs().returns(BindingMode.TwoWay);
+		oBindingMock1.expects(oFixture.sMethod).withExactArgs("~vParsedValue1" , "~oUpdateContext1");
+		oBindingMock2.expects("getBindingMode").withExactArgs().returns(BindingMode.TwoWay);
+		oBindingMock2.expects(oFixture.sMethod).withExactArgs("~vParsedValue2" , "~oUpdateContext2");
+		const oDataStateMock = this.mock(oDataState);
+		oDataStateMock.expects("setInvalidValue").withExactArgs(undefined);
+		oCompositeBindingMock.expects("getValue").withExactArgs().returns("~vValue");
+		oDataStateMock.expects("setValue").withExactArgs("~vValue");
+
+		return oPromise.then((vResult) => {
+			assert.strictEqual(vResult, undefined);
+		});
+	});
+});
+
+//*********************************************************************************************
+[{
+	sMethod: "_setRawValue",
+	bInternalValues: false,
+	bRawValues: true
+}, {
+	sMethod: "_setInternalValue",
+	bInternalValues: true,
+	bRawValues: false
+}, {
+	sMethod: "_setExternalValue",
+	bInternalValues: false,
+	bRawValues: false
+}].forEach(function (oFixture) {
+	const sTitle = `setExternalValue /w async type and w/o context changed for method ${oFixture.sMethod}`;
+	QUnit.test(sTitle, function (assert) {
+		const oBinding1 = {
+			getBindingMode() {},
+			getContext() {}
+		};
+		const oBinding2 = {
+			getBindingMode() {},
+			getContext() {}
+		};
+		const oCompositeBinding = {
+			aBindings: [oBinding1, oBinding2],
+			sInternalType: "string",
+			bInternalValues: oFixture.bInternalValues,
+			bRawValues: oFixture.bRawValues,
+			oType: {
+				getParseWithValues() {},
+				parseValue() {},
+				validateValue() {}
+			},
+			getDataState() {},
+			getValidateValues() {},
+			getValue() {}
+		};
+		const oDataState = {
+			setInvalidValue() {},
+			setValue() {}
+		};
+		this.mock(DataType).expects("getType").withExactArgs("string").returns("~oType");
+		const oCompositeBindingMock = this.mock(oCompositeBinding);
+		oCompositeBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oBindingMock1 = this.mock(oBinding1);
+		oBindingMock1.expects("getContext").withExactArgs().returns("~oUpdateContext1");
+		const oBindingMock2 = this.mock(oBinding2);
+		oBindingMock2.expects("getContext").withExactArgs().returns("~oUpdateContext2");
+		const oTypeMock = this.mock(oCompositeBinding.oType);
+		oTypeMock.expects("getParseWithValues").withExactArgs().returns(false);
+		oTypeMock.expects("parseValue")
+			.withExactArgs("~vValue", "string", undefined)
+			.returns(["~vParsedValue1", "~vParsedValue2"]);
+		oCompositeBindingMock.expects("getValidateValues")
+			.withExactArgs(["~vParsedValue1", "~vParsedValue2"])
+			.returns("~aValidateValues");
+		oTypeMock.expects("validateValue")
+			.withExactArgs("~aValidateValues").returns(Promise.resolve());
+
+		// code under test
+		const oPromise = CompositeBinding.prototype.setExternalValue.call(oCompositeBinding, "~vValue");
+
+		// After validation the contexts have changed due to the async nature of the type's validation
+		oBindingMock1.expects("getContext").withExactArgs().returns("~oUpdateContext1");
+		oBindingMock2.expects("getContext").withExactArgs().returns("~oUpdateContext2");
+		oBinding1[oFixture.sMethod] = () => {};
+		oBinding2[oFixture.sMethod] = () => {};
+		oBindingMock1.expects("getBindingMode").withExactArgs().returns(BindingMode.TwoWay);
+		oBindingMock1.expects(oFixture.sMethod).withExactArgs("~vParsedValue1" , undefined);
+		oBindingMock2.expects("getBindingMode").withExactArgs().returns(BindingMode.TwoWay);
+		oBindingMock2.expects(oFixture.sMethod).withExactArgs("~vParsedValue2" , undefined);
+		const oDataStateMock = this.mock(oDataState);
+		oDataStateMock.expects("setInvalidValue").withExactArgs(undefined);
+		oCompositeBindingMock.expects("getValue").withExactArgs().returns("~vValue");
+		oDataStateMock.expects("setValue").withExactArgs("~vValue");
+
+		return oPromise.then((vResult) => {
+			assert.strictEqual(vResult, undefined);
+		});
+	});
+});
+
 	QUnit.test("disabled methods", function(assert) {
 		assert.equal(this.composite.getContext(), null, "getContext() always returns null");
 		assert.equal(this.composite.getModel(), null, "getModel() always returns null");
@@ -746,17 +912,17 @@ sap.ui.define([
 	});
 
 	QUnit.test("Call setInternalValue()", function(assert) {
-		var oSpy1 = this.spy(this.binding1, "setInternalValue");
-		var oSpy2 = this.spy(this.binding2, "setInternalValue");
-		var oSpy3 = this.spy(this.binding3, "setInternalValue");
+		var oSpy1 = this.spy(this.binding1, "_setInternalValue");
+		var oSpy2 = this.spy(this.binding2, "_setInternalValue");
+		var oSpy3 = this.spy(this.binding3, "_setInternalValue");
 
 		var oTypeSpy = this.spy(this.type, "getModelFormat");
 
 		this.compositeUseInternalValue.setExternalValue("1 2 3");
 
-		assert.equal(oSpy1.callCount, 1, "setInternalValue() function should be called");
-		assert.equal(oSpy2.callCount, 1, "setInternalValue() function should be called");
-		assert.equal(oSpy3.callCount, 1, "setInternalValue() function should be called");
+		assert.equal(oSpy1.callCount, 1, "_setInternalValue() function should be called");
+		assert.equal(oSpy2.callCount, 1, "_setInternalValue() function should be called");
+		assert.equal(oSpy3.callCount, 1, "_setInternalValue() function should be called");
 		assert.equal(oTypeSpy.callCount, 1, "getModelFormat() function should be called");
 	});
 

package/test/sap/ui/core/qunit/Core.qunit.js

@@ -22,7 +22,10 @@ sap.ui.define([
 ], function(Log, Localization, ResourceBundle, LoaderExtensions, ObjectPath, Device, Interface, VersionInfo, oCore, Supportability, UIArea, Element, Configuration, Library, RenderManager, Theming, ThemeManager, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
-	var privateLoaderAPI = sap.ui.loader._;
+	/**
+	 * @deprecated As of version 1.120 as it is used by deprecated tests only
+	 */
+	const privateLoaderAPI = sap.ui.loader._;
 
 	function _providesPublicMethods(/**sap.ui.base.Object*/oObject, /** function */ fnClass, /**boolean*/ bFailEarly) {
 		var aMethodNames = fnClass.getMetadata().getAllPublicMethods(),
@@ -45,41 +48,90 @@ sap.ui.define([
 	// lazy dependency
 	var TestButton;
 
-	// custom assertion
-	QUnit.assert.equalControls = function(actual, expected, message) {
-		this.ok(actual === expected, message);
-	};
 
-	QUnit.assert.isLibLoaded = function(libName) {
-		this.ok(ObjectPath.get(libName), "namespace for " + libName + " should exist");
-		this.ok(Library.all()[libName], "Core should know and list " + libName + " as 'loaded'");
-	};
+	// ---------------------------------------------------------------------------
+	// Basic functionality
+	// ---------------------------------------------------------------------------
+
+	QUnit.module("Basic");
+
+	QUnit.test("Browser Version Test", function(assert) {
+		assert.expect(4);
+		var browser = Device.browser;
+		var value = document.documentElement.getAttribute("data-sap-ui-browser");
+		assert.ok(typeof value === "string" && value, "Data attribute is set and is not empty");
+
+		var version = browser.version;
+		assert.ok(typeof version === "number", "Browser version is set");
+
+		if (browser.firefox) {
+			assert.ok(value.indexOf("ff") === 0, "Browser is Firefox and data attribute is set right");
+		} else if (browser.webkit) {
+			if (browser.chrome) {
+				assert.ok(value.indexOf("cr") === 0, "Browser is Chrome and data attribute is set right");
+			}
+			// Those tests should not be called anymore
+			if (browser.safari && browser.mobile) {
+				assert.ok(value.indexOf("msf") === 0, "Browser is Mobile Safari and data attribute is set right");
+			} else if (browser.safari) {
+				assert.ok(value.indexOf("sf") === 0, "Browser is Safari and data attribute is set right");
+			}
+		}
+
+		if (!browser.safari || (!browser.fullscreen && !browser.webview)) {
+			assert.ok(value.indexOf(Math.floor(version)) != -1, "Version is set right in data attribute");
+		} else {
+			assert.ok(!/[0-9]+$/.test(value), "unknown browser versions shouldn't be added to the data attribute");
+		}
+
+	});
 
-	// used to get access to the non-public core parts
-	var oRealCore;
-	var TestCorePlugin = function() {};
-	TestCorePlugin.prototype.startPlugin = function(oCore, bOnInit) {
-		oRealCore = oCore;
-	};
-	oCore.registerPlugin(new TestCorePlugin());
+	QUnit.test("Locale configuration (via Localization)", function(assert) {
+		var oHtml = document.documentElement;
+		var sLocale = Localization.getLanguageTag().toString();
+
+		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
+
+		sLocale = "de";
+		Localization.setLanguage(sLocale);
+		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
+	});
 
 
 	// ---------------------------------------------------------------------------
-	// Basic functionality
+	// Basic functionality, deprecated
 	// ---------------------------------------------------------------------------
 
-	QUnit.module("Basic");
+	/**
+	 * @deprecated
+	 */
+	QUnit.module("Basic (deprecated)", {
+		before() {
+			// custom assertion
+			QUnit.assert.equalControls = function(actual, expected, message) {
+				this.ok(actual === expected, message);
+			};
+			// used to get access to the non-public core parts
+			const DummyCorePlugin = {
+				startPlugin: (oCore, _bOnInit) => {
+					this.oRealCore = oCore;
+				}
+			};
+			oCore.registerPlugin(DummyCorePlugin);
+			oCore.unregisterPlugin(DummyCorePlugin);
+		}
+	});
 
 	/**
 	 * @deprecated As of version 1.111, Core facade will be abandoned
 	 */
 	QUnit.test("facade", function(assert) {
-		assert.notStrictEqual(sap.ui.getCore(), oRealCore, "Facade should be different from the implementation");
-		assert.notOk(sap.ui.getCore() instanceof oRealCore.constructor, "Facade should not be an instance of sap.ui.core.Core");
+		assert.notStrictEqual(sap.ui.getCore(), this.oRealCore, "Facade should be different from the implementation");
+		assert.notOk(sap.ui.getCore() instanceof this.oRealCore.constructor, "Facade should not be an instance of sap.ui.core.Core");
 		assert.ok(sap.ui.getCore() instanceof Interface, "Facade should be an instance of sap.ui.base.Interface");
 		assert.strictEqual(sap.ui.getCore(), sap.ui.getCore(), "consecutive calls to sap.ui.getCore() should return the exact same facade");
 
-		var aMethodNames = oRealCore.getMetadata().getAllPublicMethods(),
+		var aMethodNames = this.oRealCore.getMetadata().getAllPublicMethods(),
 			oCoreInterface = sap.ui.getCore(),
 			i;
 
@@ -114,12 +166,12 @@ sap.ui.define([
 	});
 
 	/**
-	 * @deprecated Since 1.118, sap.ui.getCore and the  constructor are deprecated
+	 * @deprecated Since 1.118, sap.ui.getCore and the constructor are deprecated
 	 */
 	QUnit.test("repeated instantiation", function(assert) {
 		this.spy(Log, 'error');
 
-		assert.strictEqual(new oRealCore.constructor(), sap.ui.getCore(), "consecutive calls to the constructor should return the facade");
+		assert.strictEqual(new this.oRealCore.constructor(), sap.ui.getCore(), "consecutive calls to the constructor should return the facade");
 		sinon.assert.calledWith(Log.error, sinon.match(/Only.*must create an instance of .*Core/).and(sinon.match(/use the module export directly without using 'new'/)));
 	});
 
@@ -304,37 +356,6 @@ sap.ui.define([
 		assert.equal(corePath, "http://third.preconfig.com/ui5-themes/sap/ui/core/themes/my_third_preconfigured_theme/", "path should be as configured");
 	});
 
-	QUnit.test("Browser Version Test", function(assert) {
-		assert.expect(4);
-		var browser = Device.browser;
-		var value = document.documentElement.getAttribute("data-sap-ui-browser");
-		assert.ok(typeof value === "string" && value, "Data attribute is set and is not empty");
-
-		var version = browser.version;
-		assert.ok(typeof version === "number", "Browser version is set");
-
-		if (browser.firefox) {
-			assert.ok(value.indexOf("ff") === 0, "Browser is Firefox and data attribute is set right");
-		} else if (browser.webkit) {
-			if (browser.chrome) {
-				assert.ok(value.indexOf("cr") === 0, "Browser is Chrome and data attribute is set right");
-			}
-			// Those tests should not be called anymore
-			if (browser.safari && browser.mobile) {
-				assert.ok(value.indexOf("msf") === 0, "Browser is Mobile Safari and data attribute is set right");
-			} else if (browser.safari) {
-				assert.ok(value.indexOf("sf") === 0, "Browser is Safari and data attribute is set right");
-			}
-		}
-
-		if (!browser.safari || (!browser.fullscreen && !browser.webview)) {
-			assert.ok(value.indexOf(Math.floor(version)) != -1, "Version is set right in data attribute");
-		} else {
-			assert.ok(!/[0-9]+$/.test(value), "unknown browser versions shouldn't be added to the data attribute");
-		}
-
-	});
-
 	// now check the locale configuration to be applied as lang attribute
 	/**
 	 * @deprecated As of Version 1.120.
@@ -352,21 +373,16 @@ sap.ui.define([
 		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
 	});
 
-	QUnit.test("Locale configuration (via Localization)", function(assert) {
-		var oHtml = document.documentElement;
-		var sLocale = Localization.getLanguageTag().toString();
 
-		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
 
-		sLocale = "de";
-		Localization.setLanguage(sLocale);
-		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
-	});
+	// ---------------------------------------------------------------------------
+	// Library Resource Bundles, deprecated
+	// ---------------------------------------------------------------------------
 
 	/**
 	 * @deprecated Since 1.119.
 	 */
-	QUnit.module('getLibraryResourceBundle');
+	QUnit.module('getLibraryResourceBundle (deprecated)');
 
 	QUnit.test("async: testGetLibraryResourceBundle", function(assert) {
 		var oSpy = this.spy(ResourceBundle, 'create'),
@@ -574,14 +590,22 @@ sap.ui.define([
 		return pBundle;
 	});
 
+
+
 	// ---------------------------------------------------------------------------
-	// loadLibrary
+	// loadLibrary, deprecated
 	// ---------------------------------------------------------------------------
 
 	/**
 	 * @deprecated Since 1.119.
 	 */
-	QUnit.module("loadLibrary", {
+	QUnit.module("loadLibrary (deprecated)", {
+		before() {
+			QUnit.assert.isLibLoaded = function(libName) {
+				this.ok(ObjectPath.get(libName), "namespace for " + libName + " should exist");
+				this.ok(Library.all()[libName], "Core should know and list " + libName + " as 'loaded'");
+			};
+		},
 		beforeEach: function(assert) {
 			assert.notOk(Supportability.isDebugModeEnabled(), "debug mode must be deactivated to properly test library loading");
 			this.oLibraryGetPreloadStub = this.stub(Library, "getPreloadMode").returns("sync");
@@ -589,6 +613,9 @@ sap.ui.define([
 		afterEach: function(assert) {
 			this.oLibraryGetPreloadStub.restore();
 			delete window.testlibs;
+		},
+		after() {
+			delete QUnit.assert.isLibLoaded;
 		}
 	});
 

package/test/sap/ui/core/qunit/CustomStyleClassSupport.qunit.js

@@ -16,13 +16,15 @@ sap.ui.define([
 	// this should normally happen in the control which listens to the event
 	// also wait for the result so that the scope check in CustomStyleClassSupport can work
 	await new Promise((resolve) => {
-		const value = Parameters.get({
-			name : "sapUiBrand",
-			callback: resolve
+		Theming.attachApplied(() => {
+			const value = Parameters.get({
+				name : "sapUiTstTextColor", // a parameter which is defined by sap.ui.testlib only
+				callback: resolve
+			});
+			if ( value !== undefined ) {
+				resolve();
+			}
 		});
-		if ( value !== undefined ) {
-			resolve();
-		}
 	});
 
 	// define control

package/test/sap/ui/core/qunit/Element_closestTo.qunit.js

@@ -1,10 +1,11 @@
 /*global QUnit, sinon*/
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/ui/core/Element",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/thirdparty/jquery"
-], function(Log, Element, createAndAppendDiv, jQuery) {
+], function(future, Log, Element, createAndAppendDiv, jQuery) {
 	"use strict";
 
 	QUnit.module("Element.closestTo()");
@@ -125,7 +126,11 @@ sap.ui.define([
 		oUI5Element.destroy();
 	});
 
-	QUnit.test("Should support jQuery object given as parameter", function(assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should support jQuery object given as parameter (future=false)", function(assert) {
+		future.active = false;
 		var oErrorLogSpy = this.spy(Log, "error");
 		var sId = "el1";
 		var oContainer = createAndAppendDiv(sId);
@@ -139,11 +144,27 @@ sap.ui.define([
 		var oUI5ElementFound = Element.closestTo(jQuery("#startPoint"));
 		assert.strictEqual(oUI5ElementFound, oUI5Element);
 
-		sinon.assert.calledWithExactly(oErrorLogSpy, "[FUTURE FATAL] Do not call Element.closestTo() with jQuery object as parameter. \
-				The function should be called with either a DOM Element or a CSS selector. \
-				(future error, ignored for now)");
+		sinon.assert.calledWithExactly(oErrorLogSpy, "[FUTURE FATAL] Do not call Element.closestTo() with jQuery object as parameter. The function should be called with either a DOM Element or a CSS selector.");
 
 		oContainer.remove();
 		oUI5Element.destroy();
+		future.active = undefined;
+	});
+
+	QUnit.test("Should support jQuery object given as parameter (future=true)", function(assert) {
+		future.active = true;
+		var sId = "el1";
+		var oContainer = createAndAppendDiv(sId);
+		oContainer.setAttribute("data-sap-ui", sId);
+		oContainer.innerHTML = "<div id='el2' data-sap-ui-related='el2'> \
+									<span id='startPoint'></span> \
+								</div>";
+
+		assert.throws(() => {
+			Element.closestTo(jQuery("#startPoint"));
+		}, new Error("Do not call Element.closestTo() with jQuery object as parameter. The function should be called with either a DOM Element or a CSS selector."), "Error thrown because jQuery object is provided as argument.");
+
+		oContainer.remove();
+		future.active = undefined;
 	});
 });

package/test/sap/ui/core/qunit/Element_data.qunit.js

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/ui/core/Element",
 	"sap/ui/core/library",
@@ -7,7 +8,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/m/Button",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, Element, library, View, JSONModel, Button, nextUIUpdate) {
+], function(future, Log, Element, library, View, JSONModel, Button, nextUIUpdate) {
 	"use strict";
 
 	var ViewType = library.mvc.ViewType;
@@ -173,7 +174,12 @@ sap.ui.define([
 		assert.equal(object_data_ori.two, 3, "The object data of the original object should be changed as well, as only the reference to it is cloned");
 	});
 
-	QUnit.test("Calling data() after destroy", function(assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Calling data() after destroy (future=false)", function(assert) {
+		future.active = false;
+
 		// Setup: create an element, add some custom data and destroy it
 		this.stub(Log, "error");
 		var element = new Element();
@@ -227,6 +233,62 @@ sap.ui.define([
 		assert.strictEqual(element.data({a:"b",b:"c"}), element, "data({data}) should return the element itself");
 		assert.strictEqual(element.getAggregation("customData"), null, "data({data}) should not have modified aggregation 'customData'");
 		assert.ok(Log.error.calledWith(sinon.match(/Cannot create custom data on an already destroyed element/)));
+
+		future.active = undefined;
+	});
+
+	QUnit.test("Calling data() after destroy (future=true)", function(assert) {
+		future.active = true;
+		// Setup: create an element, add some custom data and destroy it
+
+		this.stub(Log, "error");
+		var element = new Element({
+			id: "myElement"
+		});
+		element.data("test", "value");
+		element.destroy();
+
+		// Act/Assert
+
+		// get value for a single key
+		Log.error.resetHistory();
+		assert.strictEqual(element.data("test"), null, "no more custom data after destroy");
+		assert.strictEqual(Log.error.callCount, 0);
+
+		// get all key/value pairs
+		Log.error.resetHistory();
+		assert.deepEqual(element.data(), {}, "no more custom data after destroy");
+		assert.strictEqual(Log.error.callCount, 0);
+
+		// destroy  all
+		Log.error.resetHistory();
+		assert.strictEqual(element.data(null), element, "data(null) should return the element itself");
+		assert.strictEqual(element.getAggregation("customData"), null, "data(null) should not have modified aggregation 'customData'");
+		assert.strictEqual(Log.error.callCount, 0);
+
+		// add single key/value pairs
+		Log.error.resetHistory();
+		assert.throws(() => { element.data("a", "b"); }, new Error("Cannot create custom data on an already destroyed element 'Element sap.ui.core.Element#myElement'"), "Error thrown because calling data(key,value) after destroy");
+
+		// remove single key/value pairs
+		Log.error.resetHistory();
+		assert.strictEqual(element.data("a", null), element, "data(key,null) should return the element itself");
+		assert.strictEqual(element.getAggregation("customData"), null, "data(key,value) should not have modified aggregation 'customData'");
+		assert.strictEqual(Log.error.callCount, 0);
+
+		// add single key/value pair with DOM
+		Log.error.resetHistory();
+		assert.throws(() => { element.data("a", "b", false); }, new Error("Cannot create custom data on an already destroyed element 'Element sap.ui.core.Element#myElement'"), "Error thrown because calling data(key,value,bool) after destroy");
+
+		// add single key/value pair with DOM
+		Log.error.resetHistory();
+		assert.throws(() => { element.data("a", "b", true); }, new Error("Cannot create custom data on an already destroyed element 'Element sap.ui.core.Element#myElement'"), "Error thrown because calling data(key,value,bool) after destroy");
+
+		// add multiple key/value pairs
+		Log.error.resetHistory();
+		assert.throws(() => { element.data({a:"b",b:"c"}); }, new Error("Cannot create custom data on an already destroyed element 'Element sap.ui.core.Element#myElement'"), "Error thrown because calling data({data}) after destroy");
+
+		future.active = undefined;
 	});
 
 	// Data Binding
@@ -283,8 +345,12 @@ sap.ui.define([
 
 	});
 
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Write Data to HTML (future=false)", async function(assert) {
+		future.active = false;
 
-	QUnit.test("Write Data to HTML", async function(assert) {
 		var btn = new Button({text:"Hello"});
 
 		btn.data("test", "some payload", true);
@@ -302,6 +368,23 @@ sap.ui.define([
 		assert.equal($btn.attr("data-test3"), undefined, "the 'test3' data should NOT be written to DOM");
 		assert.equal($btn.attr("data-test4"), undefined, "the 'test4' data should NOT be written to DOM");
 		assert.equal($btn.attr("data-test5"), undefined, "the 'test5' data should NOT be written to DOM");
+
+		future.active = undefined;
 	});
 
+	QUnit.test("Write Data to HTML (future=true)", async function(assert) {
+		future.active = true;
+		var btn = new Button({text:"Hello"});
+
+		btn.data("test", "some payload", true);
+		btn.data("test2", "some other payload");
+		btn.data("test3", 42, true);
+		btn.data("test4", true, true);
+		btn.data("test5", {"test":"nope"}, true);
+
+		btn.placeAt("content");
+		await assert.rejects(nextUIUpdate(), "nextUIUpdate rejected because no string value was provided to CustomData");
+
+		future.active = undefined;
+	});
 });

package/test/sap/ui/core/qunit/Fragment.qunit.js

@@ -688,7 +688,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Fragment.load with properties 'name' and 'definition' provided at the same time", function (assert) {
-		var myXml = '<Button xmlns="sap.m" id="xmlfragbtn2" text="This is an XML Fragment" press="doSomething"></Button>';
+		var myXml = '<Button xmlns="sap.m" id="xmlfragbtn2" text="This is an XML Fragment"></Button>';
 		var oLogErrorSpy = this.spy(Log, "error");
 		return Fragment.load({
 			name: "testdata.fragments.XMLTestFragmentNoController",