@openui5/sap.ui.core 1.119.0 → 1.120.0

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

@@ -8,7 +8,7 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Element",
 	"sap/ui/core/CustomData",
-	"sap/ui/core/Configuration",
+	"sap/ui/core/Lib",
 	"sap/ui/thirdparty/jquery"
 ],
 function(
@@ -16,7 +16,7 @@ function(
 	ManagedObject,
 	Element,
 	CustomData,
-	Configuration,
+	Library,
 	jQuery
 ) {
 	"use strict";
@@ -160,6 +160,9 @@ function(
 			this.oRequireStub.withArgs(["sap/test/otherInstanceSpecific.designtime"]).callsArgWithAsync(1, this.oDTForOtherInstance);
 			this.oRequireStub.withArgs(["sap/test/instanceSpecificFunction.designtime"]).callsArgWithAsync(1, this.oDTForInstanceFunction);
 			this.oRequireStub.withArgs(["sap/ui/dt/defaultDesigntime/defaultDT.designtime"]).callsArgWithAsync(1, this.oDTForPredefinedDefaultDT);
+			// For some reason sinon v1 must be used for this test which does not support callThrough on stubs therefore implemented a stub for
+			// the sap.ui.require(["sap/ui/core/Lib"]) call
+			this.oRequireStub.withArgs(["sap/ui/core/Lib"]).callsArgWithAsync(1, Library);
 
 			this.oInstanceWithoutSpecificDTMetadata = new Element();
 			this.oInstanceWithSpecificDTMetadata = new Element({
@@ -427,7 +430,7 @@ function(
 			]).then(function(aDesignTimes) {
 
 				// Only 3 require calls are expected, as one ManagedObject (NoDTManagedObjectChild2) does not have design time data
-				sinon.assert.callCount(this.oRequireStub, 3);
+				sinon.assert.callCount(this.oRequireStub, 6);
 
 				var oDTManagedObjectDesignTime = aDesignTimes[0];
 				assert.strictEqual(oDTManagedObjectDesignTime.metaProp1, "1", "DesignTime data was passed");
@@ -471,7 +474,7 @@ function(
 		QUnit.test("loadDesignTime - cache the results", function(assert) {
 			var oDTManagedObjectMetadata = DTManagedObjectChild3.getMetadata();
 			return oDTManagedObjectMetadata.loadDesignTime().then(function() {
-				sinon.assert.callCount(this.oRequireStub, 3);
+				sinon.assert.callCount(this.oRequireStub, 6);
 				this.oRequireStub.reset();
 				return oDTManagedObjectMetadata.loadDesignTime().then(function() {
 					assert.notOk(this.oRequireStub.called, "sap.ui.require was not called");
@@ -481,17 +484,17 @@ function(
 
 		QUnit.test("loadDesignTime - cache the results implicitly (parent first)", function(assert) {
 			return DTManagedObjectChild.getMetadata().loadDesignTime().then(function() {
-				sinon.assert.callCount(this.oRequireStub, 2);
+				sinon.assert.callCount(this.oRequireStub, 4);
 				this.oRequireStub.reset();
 				return DTManagedObjectChild3.getMetadata().loadDesignTime().then(function() {
-					sinon.assert.callCount(this.oRequireStub, 1);
+					sinon.assert.callCount(this.oRequireStub, 2);
 				}.bind(this));
 			}.bind(this));
 		});
 
 		QUnit.test("loadDesignTime - cache the results implicitly (child first)", function(assert) {
 			return DTManagedObjectChild3.getMetadata().loadDesignTime().then(function() {
-				sinon.assert.callCount(this.oRequireStub, 3);
+				sinon.assert.callCount(this.oRequireStub, 6);
 				this.oRequireStub.reset();
 				return DTManagedObjectChild.getMetadata().loadDesignTime().then(function() {
 					assert.notOk(this.oRequireStub.called, "sap.ui.require was not called");
@@ -499,38 +502,33 @@ function(
 			}.bind(this));
 		});
 
-		QUnit.test("loadDesignTime - cache the results implicitly (child  with parent + other child with same parent)", function(assert) {
-			return DTManagedObjectChild.getMetadata().loadDesignTime().then(function(oTestOuter) {
-				sinon.assert.callCount(this.oRequireStub, 2);
-				this.oRequireStub.reset();
-				//previously the issue was that a derived control deleted the parents designtimeModule.
-				//any other child did not set the correct designtimeModule path
-
-				//load derived metadata DTManagedObjectChild3 that inherits DTManagedObject
-				DTManagedObjectChild3.getMetadata().loadDesignTime().then(function(oTestOuter3) {
-					sinon.assert.callCount(this.oRequireStub, 1);
-					this.oRequireStub.reset();
-					return DTManagedObject.getMetadata().loadDesignTime().then(function(oTestInner) {
-						assert.strictEqual(oTestInner.designtimeModule, "DTManagedObject.designtime", "DesignTime module path defined DTManagedObjectChild");
-					}.bind(this)).then(function() {
-						assert.strictEqual(oTestOuter3.designtimeModule, "DTManagedObjectChild3.designtime", "DesignTime module path defined DTManagedObjectChild3");
-					});
-				}.bind(this));
-				//load derived metadata DTManagedObjectChild3 that inherits DTManagedObjectChild
-				DTManagedObjectChild.getMetadata().loadDesignTime().then(function(oTestInner) {
-					return DTManagedObject.getMetadata().loadDesignTime().then(function(oTestInner2) {
-						assert.strictEqual(oTestInner2.designtimeModule, "DTManagedObject.designtime", "DesignTime module path defined DTManagedObjectChild");
-					}.bind(this)).then(function() {
-						assert.strictEqual(oTestInner.designtimeModule, "DTManagedObjectChild.designtime", "DesignTime module path defined DTManagedObjectChild, parent still valid");
-					});
-				}.bind(this));
-			}.bind(this));
+		QUnit.test("loadDesignTime - cache the results implicitly (child  with parent + other child with same parent)", async function(assert) {
+			await DTManagedObjectChild.getMetadata().loadDesignTime();
+			sinon.assert.callCount(this.oRequireStub, 4);
+			this.oRequireStub.reset();
+
+			//previously the issue was that a derived control deleted the parents designtimeModule.
+			//any other child did not set the correct designtimeModule path
+
+			//load derived metadata DTManagedObjectChild3 that inherits DTManagedObject
+			const oTestOuter3 = await DTManagedObjectChild3.getMetadata().loadDesignTime();
+			sinon.assert.callCount(this.oRequireStub, 2);
+			this.oRequireStub.reset();
+
+			let oTestInner = await DTManagedObject.getMetadata().loadDesignTime();
+			assert.strictEqual(oTestInner.designtimeModule, "DTManagedObject.designtime", "DesignTime module path defined DTManagedObjectChild");
+			assert.strictEqual(oTestOuter3.designtimeModule, "DTManagedObjectChild3.designtime", "DesignTime module path defined DTManagedObjectChild3");
+
+			oTestInner = await DTManagedObjectChild.getMetadata().loadDesignTime();
+			const oTestInner2 = await DTManagedObject.getMetadata().loadDesignTime();
+			assert.strictEqual(oTestInner2.designtimeModule, "DTManagedObject.designtime", "DesignTime module path defined DTManagedObjectChild");
+			assert.strictEqual(oTestInner.designtimeModule, "DTManagedObjectChild.designtime", "DesignTime module path defined DTManagedObjectChild, parent still valid");
 		});
 
 		QUnit.test("loadDesignTime - cache the results with designtime only via inheritance", function(assert) {
 			var oDTManagedObjectMetadataChild = NoDTManagedObjectChild2.getMetadata();
 			return oDTManagedObjectMetadataChild.loadDesignTime().then(function(oDesignTime) {
-				sinon.assert.callCount(this.oRequireStub, 2);
+				sinon.assert.callCount(this.oRequireStub, 4);
 				this.oRequireStub.reset();
 				return oDTManagedObjectMetadataChild.loadDesignTime().then(function() {
 					assert.notOk(this.oRequireStub.called, "sap.ui.require was not called");
@@ -575,7 +573,7 @@ function(
 		}
 	}, function () {
 		QUnit.test("loadDesignTime - from core for custom data no preload", function(assert) {
-			this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("");
+			this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("");
 			this.spy(sap.ui, 'require');
 			this.spy(privateLoaderAPI, 'loadJSResourceAsync');
 			return this.oMetadata.loadDesignTime().then(function(oDesignTime) {
@@ -586,13 +584,13 @@ function(
 				assert.ok(sap.ui.require.calledWith(["sap/ui/core/designtime/CustomData.designtime"]), "CustomData.designtime.js was required");
 				assert.ok(oDesignTime._oLib !== undefined, "sap/ui/core/designtime/library.designtime.js is available in designtime object");
 			}.bind(this)).finally(function () {
-				this.oConfigurationGetPreloadStub.restore();
+				this.oLibraryGetPreloadStub.restore();
 			}.bind(this));
 		});
 
 		QUnit.test("loadDesignTime - from core for custom data with preload async", function(assert) {
 			//async configuration simulation
-			this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("async");
+			this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("async");
 			this.spy(sap.ui, 'require');
 			this.spy(privateLoaderAPI, 'loadJSResourceAsync');
 
@@ -608,13 +606,13 @@ function(
 				assert.ok(sap.ui.require.calledWith(["sap/ui/core/designtime/CustomData.designtime"]), "CustomData.designtime.js was required");
 				assert.ok(oDesignTime._oLib !== undefined, "sap/ui/core/designtime/library.designtime.js loaded");
 			}.bind(this)).finally(function () {
-				this.oConfigurationGetPreloadStub.restore();
+				this.oLibraryGetPreloadStub.restore();
 			}.bind(this));
 		});
 
 		QUnit.test("loadDesignTime - from core for custom data with preload sync", function(assert) {
 			//sync configuration simulation
-			this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+			this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 			this.spy(sap.ui, 'require');
 			this.spy(privateLoaderAPI, 'loadJSResourceAsync');
 
@@ -630,7 +628,7 @@ function(
 				assert.ok(sap.ui.require.calledWith(["sap/ui/core/designtime/CustomData.designtime"]), "CustomData.designtime.js was required");
 				assert.ok(oDesignTime._oLib !== undefined, "sap/ui/core/designtime/library.designtime.js loaded");
 			}.bind(this)).finally(function () {
-				this.oConfigurationGetPreloadStub.restore();
+				this.oLibraryGetPreloadStub.restore();
 			}.bind(this));
 		});
 	});
@@ -712,6 +710,9 @@ function(
 			this.oRequireStub.withArgs(["DTManagedObjectChild.designtime"]).callsArgWithAsync(1, this.oDTForManagedObjectChild);
 			this.oRequireStub.withArgs(["sap/test/instanceSpecific.designtime"]).callsArgWithAsync(1, this.oDTForInstance);
 			this.oRequireStub.withArgs(["sap/test/otherInstanceSpecific.designtime"]).callsArgWithAsync(1, this.oDTForOtherInstance);
+			// For some reason sinon v1 must be used for this test which does not support callThrough on stubs therefore implemented a stub for
+			// the sap.ui.require(["sap/ui/core/Lib"]) call
+			this.oRequireStub.withArgs(["sap/ui/core/Lib"]).callsArgWithAsync(1, Library);
 
 			this.oInstanceWithoutSpecificDTMetadata = new Element();
 			this.oInstanceWithSpecificDTMetadata = new Element({

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

@@ -11,12 +11,13 @@ sap.ui.define([
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/model/base/ManagedObjectModel",
 	"sap/ui/model/json/JSONModel",
+	"sap/ui/model/type/Boolean",
 	"sap/ui/model/type/Date",
 	"sap/ui/model/Context",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator"
 ], function (CustomListItem, DatePicker, Input, List, Select, Text, VBox, Element, Item, XMLView,
-			 ManagedObjectModel, JSONModel, DateType, Context, Filter, FilterOperator) {
+			 ManagedObjectModel, JSONModel, BooleanType, DateType, Context, Filter, FilterOperator) {
 	/*global QUnit */
 	/*eslint no-warning-comments: 0 */
 	"use strict";

package/test/sap/ui/core/qunit/{ManagedObject_noBoot.qunit.js → ManagedObject_BindingParser.qunit.js}

@@ -1,26 +1,27 @@
 /* global QUnit */
 sap.ui.define([
-	"sap/ui/core/Control"
-], function(Control) {
+	"sap/ui/base/BindingInfo",
+	"sap/ui/base/BindingParser"
+], function(
+	BindingInfo,
+	BindingParser
+) {
 	"use strict";
 
 	QUnit.module("FLP Boot Scenario");
 
-	QUnit.test("Check binding parser is set correctly after core is booted", function (assert) {
+	QUnit.test("Check binding parser is set correctly after core is booted and FLP changed the bindingSyntax configuration", function (assert) {
 		assert.expect(1);
 		var done = assert.async();
-
 		// load config file as in FLP boot scenario with specific config before core is loaded
 		sap.ui.require(["testdata/core/testdata/customboot/common.configure.ui5"], function () {
 			// load core and check that bindingparser is correctly derived from config after core was loaded
 			sap.ui.require(["sap/ui/core/Core"], function(Core) {
-				var oControl = new Control({
-					busy: "{ path: '/test'}"
-				});
-				assert.strictEqual(oControl.getBindingInfo("busy").parts[0].path, "/test", "Check that complex binding path was parsed corretly by complexparser");
+				assert.equal(BindingInfo.parse, BindingParser.complexParser, "compatversion set by 'FLP' results in a complexParser");
 				done();
 			}, function(oErr) {
-				assert.strictEqual(oErr, {}, "requiring the Core must not fail");
+				assert.ok(false, "requiring the Core must not fail");
+				done();
 			});
 		});
 	});

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

@@ -160,6 +160,9 @@ sap.ui.define([
 
 	QUnit.module("Base Class Functions");
 
+	/**
+	 * @deprecated As of version 1.120
+	 */
 	QUnit.test("isA static function", function(assert) {
 		var oIcon = new Icon();
 		assert.strictEqual(BaseObject.isA(oIcon, "sap.ui.core.Icon"), true, "self test: instance is a sap.ui.core.Icon");
@@ -192,4 +195,37 @@ sap.ui.define([
 		assert.strictEqual(BaseObject.isA(NaN, "sap.ui.base.Object"), false, "NaN is not BaseObject");
 		assert.strictEqual(BaseObject.isA("", "sap.ui.base.Object"), false, "Empty string is not BaseObject");
 	});
+
+	QUnit.test("isObjectA static function", function(assert) {
+		var oIcon = new Icon();
+		assert.strictEqual(BaseObject.isObjectA(oIcon, "sap.ui.core.Icon"), true, "self test: instance is a sap.ui.core.Icon");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, "sap.ui.base.ManagedObject"), true, "inheritance: instance is a ManagedObject");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, "sap.ui.base.Object"), true, "inheritance: instance is a BaseObject");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, [
+			"sap.ui.base.Object",
+			"sap.test.rainbow"
+		]), true, "multiple: instance is a 'sap.test.rainbow' (doesn't exist) or BaseObject");
+
+		assert.strictEqual(BaseObject.isObjectA(oIcon, "sap.ui.core.HTML"), false, "Icon is not HTML");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, null), false, "null check");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, ""), false, "'' check");
+		assert.strictEqual(BaseObject.isObjectA(oIcon), false, "undefined check");
+		assert.strictEqual(BaseObject.isObjectA(oIcon), false, "undefined check");
+		assert.strictEqual(BaseObject.isObjectA(oIcon, [
+			"sap.test.pony",
+			"sap.test.rainbow"
+		]), false, "multiple: instance is not 'sap.test.pony' or 'sap.test.rainbow'");
+
+		var MyClass = function() {};
+		MyClass.prototype.isA = function() {
+			assert.ok(false, "Custom 'isA' method should not be called");
+		};
+		var oMyObject = new MyClass();
+		assert.strictEqual(BaseObject.isObjectA(oMyObject, "sap.ui.base.Object"), false, "MyClass is not BaseObject");
+		assert.strictEqual(BaseObject.isObjectA({}, "sap.ui.base.Object"), false, "Plain Object is not BaseObject");
+		assert.strictEqual(BaseObject.isObjectA(null, "sap.ui.base.Object"), false, "null is not BaseObject");
+		assert.strictEqual(BaseObject.isObjectA(undefined, "sap.ui.base.Object"), false, "undefined is not BaseObject");
+		assert.strictEqual(BaseObject.isObjectA(NaN, "sap.ui.base.Object"), false, "NaN is not BaseObject");
+		assert.strictEqual(BaseObject.isObjectA("", "sap.ui.base.Object"), false, "Empty string is not BaseObject");
+	});
 });

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

@@ -1343,13 +1343,10 @@ sap.ui.define([
 		assert.equal(iCounter, 0, "Number of rerenderings of Ctrl2");
 	});
 
-	/**
-	 * @deprecated As of 1.92
-	 */
-	QUnit.test("RenderManager writeIcon with Icon URL", function(assert) {
+	QUnit.test("RenderManager.prototype.icon with Icon URL", function(assert) {
 		var rm = new RenderManager().getInterface();
 		var oIconInfo = IconPool.getIconInfo("wrench");
-		rm.writeIcon(oIconInfo.uri, ["classA", "classB"], {
+		rm.icon(oIconInfo.uri, ["classA", "classB"], {
 			id: "icon1",
 			propertyA: "valueA",
 			propertyB: "valueB"
@@ -1357,24 +1354,25 @@ sap.ui.define([
 		rm.flush(document.getElementById("area6"));
 		rm.destroy();
 
-		var $icon1 = jQueryById("icon1");
-		assert.ok($icon1[0], "icon should be rendered");
-		assert.ok($icon1.is("span"), "Icon URI should be rendered as a span");
-		assert.equal($icon1.css("font-family").replace(/"|'/g, ""), oIconInfo.fontFamily, "Icon's font family is rendered");
-		assert.equal($icon1.attr("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
-		assert.ok($icon1.hasClass("classA"), "icon has classA as a CSS class");
-		assert.ok($icon1.hasClass("classB"), "icon has classB as a CSS class");
-		assert.ok($icon1.hasClass("sapUiIcon"), "icon has sapUiIcon as a CSS class");
-		assert.ok($icon1.hasClass("sapUiIconMirrorInRTL"), "icon has sapUiIconMirrorInRTL as a CSS class");
-		assert.equal($icon1.attr("propertyA"), "valueA", "Attribute should be set");
-		assert.equal($icon1.attr("propertyB"), "valueB", "Attribute should be set");
-		assert.notEqual($icon1.attr("aria-label"), undefined, "Attribute aria-label should be set");
-
-		jQueryById("area6").empty();
+		var icon1 = document.getElementById("icon1");
+		assert.ok(icon1, "icon should be rendered");
+		assert.equal(icon1.tagName.toLowerCase(), "span", "Icon URI should be rendered as a span");
+		assert.equal(icon1.style["fontFamily"].replace(/"|'/g, ""), oIconInfo.fontFamily, "Icon's font family is rendered");
+		assert.equal(icon1.getAttribute("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
+		assert.ok(icon1.classList.contains("classA"), "icon has classA as a CSS class");
+		assert.ok(icon1.classList.contains("classB"), "icon has classB as a CSS class");
+		assert.ok(icon1.classList.contains("sapUiIcon"), "icon has sapUiIcon as a CSS class");
+		assert.ok(icon1.classList.contains("sapUiIconMirrorInRTL"), "icon has sapUiIconMirrorInRTL as a CSS class");
+		assert.equal(icon1.getAttribute("propertyA"), "valueA", "Attribute should be set");
+		assert.equal(icon1.getAttribute("propertyB"), "valueB", "Attribute should be set");
+		assert.equal(icon1.getAttribute("aria-hidden"), "true", "Attribute 'aria-hidden' should be set");
+		assert.notEqual(icon1.getAttribute("aria-label"), undefined, "Attribute aria-label should be set");
+
+		document.getElementById("area6").innerHTML = "";
 
 		rm = new RenderManager().getInterface();
 		oIconInfo = IconPool.getIconInfo("calendar");
-		rm.writeIcon(oIconInfo.uri, ["classA", "classB"], {
+		rm.icon(oIconInfo.uri, ["classA", "classB"], {
 			id: "icon1",
 			propertyA: "valueA",
 			propertyB: "valueB"
@@ -1382,54 +1380,50 @@ sap.ui.define([
 		rm.flush(document.getElementById("area6"));
 		rm.destroy();
 
-		$icon1 = jQueryById("icon1");
-		assert.ok($icon1[0], "icon should be rendered");
-		assert.ok($icon1.is("span"), "Icon URI should be rendered as a span");
-		assert.equal($icon1.css("font-family").replace(/"|'/g, ""), oIconInfo.fontFamily, "Icon's font family is rendered");
-		assert.equal($icon1.attr("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
-		assert.ok($icon1.hasClass("classA"), "icon has classA as a CSS class");
-		assert.ok($icon1.hasClass("classB"), "icon has classB as a CSS class");
-		assert.ok($icon1.hasClass("sapUiIcon"), "icon has sapUiIcon as a CSS class");
-		assert.ok(!$icon1.hasClass("sapUiIconMirrorInRTL"), "icon doesn't have sapUiIconMirrorInRTL as a CSS class");
-		assert.equal($icon1.attr("propertyA"), "valueA", "Attribute should be set");
-		assert.equal($icon1.attr("propertyB"), "valueB", "Attribute should be set");
-		assert.notEqual($icon1.attr("aria-label"), undefined, "Attribute aria-label should be set");
+		icon1 = document.getElementById("icon1");
+		assert.ok(icon1, "icon should be rendered");
+		assert.equal(icon1.tagName.toLowerCase(), "span", "Icon URI should be rendered as a span");
+		assert.equal(icon1.style["fontFamily"].replace(/"|'/g, ""), oIconInfo.fontFamily, "Icon's font family is rendered");
+		assert.equal(icon1.getAttribute("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
+		assert.ok(icon1.classList.contains("classA"), "icon has classA as a CSS class");
+		assert.ok(icon1.classList.contains("classB"), "icon has classB as a CSS class");
+		assert.ok(icon1.classList.contains("sapUiIcon"), "icon has sapUiIcon as a CSS class");
+		assert.ok(!icon1.classList.contains("sapUiIconMirrorInRTL"), "icon has sapUiIconMirrorInRTL as a CSS class");
+		assert.equal(icon1.getAttribute("propertyA"), "valueA", "Attribute should be set");
+		assert.equal(icon1.getAttribute("propertyB"), "valueB", "Attribute should be set");
+		assert.notEqual(icon1.getAttribute("aria-label"), undefined, "Attribute aria-label should be set");
 
-		jQueryById("area6").empty();
+		document.getElementById("area6").innerHTML = "";
 	});
 
-	/**
-	 * @deprecated As of 1.92
-	 */
-	QUnit.test("RenderManager writeIcon with Icon URL. aria-label and aria-labelledby are set to null", function(assert) {
+	QUnit.test("RenderManager.prototype.icon with Icon URL. aria-label and aria-labelledby are set to null", function(assert) {
 		var rm = new RenderManager().getInterface();
 		var oIconInfo = IconPool.getIconInfo("wrench");
-		rm.writeIcon(oIconInfo.uri, [], {
+		rm.icon(oIconInfo.uri, [], {
 			id: "icon1",
 			"aria-label": null,
-			"aria-labelledby": null
+			"aria-labelledby": null,
+			"role": "button"
 		});
 		rm.flush(document.getElementById("area6"));
 		rm.destroy();
 
-		var $icon1 = jQueryById("icon1"),
-			$invisibleText = jQueryById("icon1-label");
+		var icon1 = document.getElementById("icon1"),
+			invisibleText = document.getElementById("icon1-label");
 
-		assert.ok($icon1[0], "icon should be rendered");
-		assert.equal($icon1.attr("aria-label"), undefined, "Attribute aria-label should not be set");
-		assert.equal($icon1.attr("aria-labelledby"), undefined, "Attribute aria-labelledby should not be set");
-		assert.equal($invisibleText.length, 0, "No invisible text is rendered");
+		assert.ok(icon1, "icon should be rendered");
+		assert.equal(icon1.getAttribute("aria-label"), undefined, "Attribute aria-label should not be set");
+		assert.equal(icon1.getAttribute("aria-labelledby"), undefined, "Attribute aria-labelledby should not be set");
+		assert.notOk(icon1.hasAttribute("aria-hidden"), "'aria-hidden' should not be set when role isn't 'presentation'");
+		assert.notOk(invisibleText, "No invisible text is rendered");
 
-		jQueryById("area6").empty();
+		document.getElementById("area6").innerHTML = "";
 	});
 
-	/**
-	 * @deprecated As of 1.92
-	 */
-	QUnit.test("RenderManager writeIcon with Icon URL and aria-labelledby", function(assert) {
+	QUnit.test("RenderManager.prototype.icon with Icon URL and aria-labelledby", function(assert) {
 		var rm = new RenderManager().getInterface();
 		var oIconInfo = IconPool.getIconInfo("wrench");
-		rm.writeIcon(oIconInfo.uri, [], {
+		rm.icon(oIconInfo.uri, [], {
 			id: "icon1",
 			"aria-labelledby": "foo",
 			alt: "abc"
@@ -1437,22 +1431,19 @@ sap.ui.define([
 		rm.flush(document.getElementById("area6"));
 		rm.destroy();
 
-		var $icon1 = jQueryById("icon1"),
-			$invisibleText = jQueryById("icon1-label"),
-			sText = $invisibleText.text();
-		assert.ok($icon1[0], "icon should be rendered");
+		var icon1 = document.getElementById("icon1"),
+			invisibleText = document.getElementById("icon1-label"),
+			sText = invisibleText.textContent;
+		assert.ok(icon1, "icon should be rendered");
 
-		assert.equal($icon1.attr("aria-label"), undefined, "Attribute aria-label should not be set");
-		assert.equal($icon1.attr("aria-labelledby"), "foo icon1-label", "Attribute aria-labelledby should contain both the given id and the id of the invisible text");
+		assert.equal(icon1.getAttribute("aria-label"), undefined, "Attribute aria-label should not be set");
+		assert.equal(icon1.getAttribute("aria-labelledby"), "foo icon1-label", "Attribute aria-labelledby should contain both the given id and the id of the invisible text");
 		assert.equal(sText, "abc", "The content of invisible text should be set");
 
-		jQueryById("area6").empty();
+		document.getElementById("area6").innerHTML = "";
 	});
 
-	/**
-	 * @deprecated As of 1.92
-	 */
-	QUnit.test("RenderManager writeIcon with font-family which has space inside", function(assert) {
+	QUnit.test("RenderManager.prototype.icon with font-family which has space inside", function(assert) {
 		var fnOrigGetIconInfo = IconPool.getIconInfo,
 			sFontFamily = "fontfamily which has space inside";
 
@@ -1464,31 +1455,30 @@ sap.ui.define([
 
 		var rm = new RenderManager().getInterface();
 		var oIconInfo = IconPool.getIconInfo("wrench");
-		rm.writeIcon(oIconInfo.uri, [], {
+		rm.icon(oIconInfo.uri, [], {
 			id: "icon1"
 		});
 		rm.flush(document.getElementById("area6"));
 		rm.destroy();
 
-		var $icon1 = jQueryById("icon1");
-		assert.ok($icon1[0], "icon should be rendered");
-		assert.ok($icon1.is("span"), "Icon URI should be rendered as a span");
-		assert.equal($icon1.css("font-family"), "\"" + sFontFamily + "\"", "Icon's font family is rendered");
-		assert.equal($icon1.attr("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
-		assert.ok($icon1.hasClass("sapUiIcon"), "icon has sapUiIcon as a CSS class");
-		assert.ok($icon1.hasClass("sapUiIconMirrorInRTL"), "icon has sapUiIconMirrorInRTL as a CSS class");
-		assert.notEqual($icon1.attr("aria-label"), undefined, "Attribute aria-label should be set");
+		var icon1 = document.getElementById("icon1");
 
-		jQueryById("area6").empty();
+		assert.ok(icon1, "icon should be rendered");
+		assert.equal(icon1.tagName.toLowerCase(), "span", "Icon URI should be rendered as a span");
+		assert.equal(icon1.style["fontFamily"], "\"" + sFontFamily + "\"", "Icon's font family is rendered");
+		assert.equal(icon1.getAttribute("data-sap-ui-icon-content"), oIconInfo.content, "Icon content is rendered as attribute");
+		assert.ok(icon1.classList.contains("sapUiIcon"), "icon has sapUiIcon as a CSS class");
+		assert.ok(icon1.classList.contains("sapUiIconMirrorInRTL"), "icon has sapUiIconMirrorInRTL as a CSS class");
+		assert.notEqual(icon1.getAttribute("aria-label"), undefined, "Attribute aria-label should be set");
+
+		document.getElementById("area6").innerHTML = "";
 	});
 
-	/**
-	 * @deprecated As of 1.92
-	 */
 	QUnit.test("RenderManager writeIcon with Image URL", function(assert) {
 		var rm = new RenderManager().getInterface(),
 			sImgURL = sap.ui.require.toUrl("sap/ui/core/themes/base/img/Busy.gif");
-			rm.writeIcon(sImgURL, ["classA", "classB"], {
+
+		rm.icon(sImgURL, ["classA", "classB"], {
 			id: "img1",
 			propertyA: "valueA",
 			propertyB: "valueB"
@@ -1496,20 +1486,20 @@ sap.ui.define([
 		rm.flush(document.getElementById("area7"));
 		rm.destroy();
 
-		var $img1 = jQueryById("img1");
-		assert.ok($img1[0], "icon should be rendered");
-		assert.ok($img1.is("img"), "Image URI should be rendered as a img");
-		assert.ok($img1.hasClass("classA"), "img has classA as a CSS class");
-		assert.ok($img1.hasClass("classB"), "img has classB as a CSS class");
-		assert.equal($img1.attr("propertyA"), "valueA", "Attribute should be set");
-		assert.equal($img1.attr("propertyB"), "valueB", "Attribute should be set");
-		assert.equal($img1.attr("role"), "presentation", "Default attribute should be set");
-		assert.equal($img1.attr("alt"), "", "Default attribute should be set");
+		var img1 = document.getElementById("img1");
+		assert.ok(img1, "icon should be rendered");
+		assert.equal(img1.tagName.toLowerCase(), "img", "Image URI should be rendered as a img");
+		assert.ok(img1.classList.contains("classA"), "img has classA as a CSS class");
+		assert.ok(img1.classList.contains("classB"), "img has classB as a CSS class");
+		assert.equal(img1.getAttribute("propertyA"), "valueA", "Attribute should be set");
+		assert.equal(img1.getAttribute("propertyB"), "valueB", "Attribute should be set");
+		assert.equal(img1.getAttribute("role"), "presentation", "Default attribute should be set");
+		assert.equal(img1.getAttribute("alt"), "", "Default attribute should be set");
 
-		jQueryById("area7").empty();
+		document.getElementById("area7").innerHTML = "";
 
 		rm = new RenderManager().getInterface();
-		rm.writeIcon(sImgURL, ["classA", "classB"], {
+		rm.icon(sImgURL, ["classA", "classB"], {
 			id: "img1",
 			role: "",
 			alt: "test alt message"
@@ -1517,13 +1507,15 @@ sap.ui.define([
 		rm.flush(document.getElementById("area7"));
 		rm.destroy();
 
-		$img1 = jQueryById("img1");
-		assert.ok($img1[0], "icon should be rendered");
-		assert.ok($img1.is("img"), "Image URI should be rendered as a img");
-		assert.ok($img1.hasClass("classA"), "img has classA as a CSS class");
-		assert.ok($img1.hasClass("classB"), "img has classB as a CSS class");
-		assert.equal($img1.attr("role"), "", "Attribute should be changed");
-		assert.equal($img1.attr("alt"), "test alt message", "Attribute should be changed");
+		img1 = document.getElementById("img1");
+		assert.ok(img1, "icon should be rendered");
+		assert.equal(img1.tagName.toLowerCase(), "img", "Image URI should be rendered as a img");
+		assert.ok(img1.classList.contains("classA"), "img has classA as a CSS class");
+		assert.ok(img1.classList.contains("classB"), "img has classB as a CSS class");
+		assert.equal(img1.getAttribute("role"), "", "Attribute should be changed");
+		assert.equal(img1.getAttribute("alt"), "test alt message", "Attribute should be changed");
+
+		document.getElementById("area7").innerHTML = "";
 	});
 
 	QUnit.test("RenderManager should not break for controls with invalid renderer", async function(assert) {