@openui5/sap.ui.core 1.118.0 → 1.119.0

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

@@ -192,27 +192,27 @@ sap.ui.define([
 	});
 
 	QUnit.test("invalidate UIArea", function(assert) {
-		var oldDomRef = Element.registry.get("html2").getDomRef();
-		Element.registry.get("html2").getUIArea().invalidate();
+		var oldDomRef = Element.getElementById("html2").getDomRef();
+		Element.getElementById("html2").getUIArea().invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_2, "uiAreaA", "UIArea contains expected HTML fragment");
-			assert.notEqual(Element.registry.get("html2").getDomRef(), oldDomRef, "node has changed");
+			assert.notEqual(Element.getElementById("html2").getDomRef(), oldDomRef, "node has changed");
 		});
 	});
 
 	QUnit.test("invalidate parent control", function(assert) {
-		var oldDomRef = Element.registry.get("html2").getDomRef();
-		Element.registry.get("html2").getParent().invalidate();
+		var oldDomRef = Element.getElementById("html2").getDomRef();
+		Element.getElementById("html2").getParent().invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_2, "uiAreaA", "UIArea contains expected HTML fragment");
-			assert.notEqual(Element.registry.get("html2").getDomRef(), oldDomRef, "node has changed");
+			assert.notEqual(Element.getElementById("html2").getDomRef(), oldDomRef, "node has changed");
 		});
 	});
 
 	QUnit.test("invalidate HTML control", function(assert) {
-		Element.registry.get("html2").invalidate();
+		Element.getElementById("html2").invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_2, "uiAreaA", "UIArea contains expected HTML fragment");
@@ -220,11 +220,11 @@ sap.ui.define([
 	});
 
 	QUnit.test("setting content", async function(assert) {
-		Element.registry.get("html2").setContent("");
+		Element.getElementById("html2").setContent("");
 		await nextUIUpdate();
 		assert.equal(jQuery("#html2").length, 0, "html2 DOM must be empty");
 
-		Element.registry.get("html2").setContent(FRAGMENT_1.content);
+		Element.getElementById("html2").setContent(FRAGMENT_1.content);
 		await nextUIUpdate();
 
 		assert.equal(jQuery("#html2").length, 1, "content must have length 1");
@@ -232,24 +232,24 @@ sap.ui.define([
 		assert.equal(jQuery("#html2").css("height"), "64px", "fragment height");
 		assert.equal(normalize(jQuery("#html2").css("background-color")), "rgb(255,0,0)", "fragment bg color");
 
-		Element.registry.get("html2").setContent("someLeadingText" + FRAGMENT_2.content + "someTrailingText");
+		Element.getElementById("html2").setContent("someLeadingText" + FRAGMENT_2.content + "someTrailingText");
 		await nextUIUpdate();
 		okFragment(assert, FRAGMENT_2, "uiAreaA", "html2 DOM must be equal to FRAGMENT_2");
 		assert.ok(jQuery("#uiAreaA")[0].innerHTML.indexOf("someLeadingText") < 0, "rendered HTML does not contain leading text");
 		assert.ok(jQuery("#uiAreaA")[0].innerHTML.indexOf("someTrailingText") < 0, "rendered HTML does not contain trailing text");
 
-		Element.registry.get("html2").setContent(FRAGMENT_1.content);
+		Element.getElementById("html2").setContent(FRAGMENT_1.content);
 		await nextUIUpdate();
 		assert.equal(jQuery("#html2").length, 1, "content must have length 1");
 		assert.equal(jQuery("#html2").css("width"), "64px", "fragment width");
 		assert.equal(jQuery("#html2").css("height"), "64px", "fragment height");
 		assert.equal(normalize(jQuery("#html2").css("background-color")), "rgb(255,0,0)", "fragment bg color");
 
-		Element.registry.get("html2").setContent("somePureText");
+		Element.getElementById("html2").setContent("somePureText");
 		await nextUIUpdate();
 		assert.equal(jQuery("#html2").length, 0, "html2 DOM must be empty");
 
-		Element.registry.get("html2").setContent(FRAGMENT_2.content);
+		Element.getElementById("html2").setContent(FRAGMENT_2.content);
 		await nextUIUpdate();
 		okFragment(assert, FRAGMENT_2, "uiAreaA", "html2 DOM must be equal to FRAGMENT_2");
 	});
@@ -258,8 +258,8 @@ sap.ui.define([
 	QUnit.test("destroy", function(assert) {
 		assert.equal(jQuery("#html1").length, 1, "html1 DOM should exist");
 		assert.equal(jQuery("#html2").length, 1, "html2 DOM should exist");
-		Element.registry.get("html1").destroy();
-		Element.registry.get("html2").destroy();
+		Element.getElementById("html1").destroy();
+		Element.getElementById("html2").destroy();
 		assert.equal(jQuery("#html1").length, 0, "html2 DOM should have been deleted");
 		assert.equal(jQuery("#html2").length, 0, "html2 DOM should have been deleted");
 	});
@@ -285,52 +285,52 @@ sap.ui.define([
 	});
 
 	QUnit.test("content property + preferDOM, rerendering", function(assert) {
-		var oldDomRef = Element.registry.get("html3").getDomRef();
+		var oldDomRef = Element.getElementById("html3").getDomRef();
 
-		Element.registry.get("html3").invalidate();
+		Element.getElementById("html3").invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_1, "uiAreaA", "UIArea contains expected HTML fragment");
-			assert.equal(Element.registry.get("html3").getDomRef(), oldDomRef, "node after rendering is the same as before");
+			assert.equal(Element.getElementById("html3").getDomRef(), oldDomRef, "node after rendering is the same as before");
 		});
 	});
 
 	QUnit.test("setting content", async function(assert) {
-		Element.registry.get("html3").setContent("");
+		Element.getElementById("html3").setContent("");
 		await nextUIUpdate();
 		assert.equal(jQuery("#html3").length, 0, "html3 DOM must be empty");
 
-		Element.registry.get("html3").setContent(FRAGMENT_1.content);
+		Element.getElementById("html3").setContent(FRAGMENT_1.content);
 		await nextUIUpdate();
 		assert.equal(jQuery("#html3").length, 1, "content must have length 1");
 		assert.equal(jQuery("#html3").css("width"), "64px", "fragment width");
 		assert.equal(jQuery("#html3").css("height"), "64px", "fragment height");
 		assert.equal(normalize(jQuery("#html3").css("background-color")), "rgb(255,0,0)", "fragment bg color");
 
-		Element.registry.get("html3").setContent("someLeadingText" + FRAGMENT_2.content + "someTrailingText");
+		Element.getElementById("html3").setContent("someLeadingText" + FRAGMENT_2.content + "someTrailingText");
 		await nextUIUpdate();
 		okFragment(assert, FRAGMENT_2, "uiAreaA", "html3 DOM must be equal to FRAGMENT_2");
 		assert.ok(jQuery("#uiAreaA")[0].innerHTML.indexOf("someLeadingText") < 0, "rendered HTML does not contain leading text");
 		assert.ok(jQuery("#uiAreaA")[0].innerHTML.indexOf("someTrailingText") < 0, "rendered HTML does not contain trailing text");
 
-		Element.registry.get("html3").setContent(FRAGMENT_1.content);
+		Element.getElementById("html3").setContent(FRAGMENT_1.content);
 		await nextUIUpdate();
 		assert.equal(jQuery("#html3").length, 1, "content must have length 1");
 		assert.equal(jQuery("#html3").css("width"), "64px", "fragment width");
 		assert.equal(jQuery("#html3").css("height"), "64px", "fragment height");
 		assert.equal(normalize(jQuery("#html3").css("background-color")), "rgb(255,0,0)", "fragment bg color");
 
-		Element.registry.get("html3").setContent("somePureText");
+		Element.getElementById("html3").setContent("somePureText");
 		await nextUIUpdate();
 		assert.equal(jQuery("#html3").length, 0, "html3 DOM must be empty");
 
-		Element.registry.get("html3").setContent(FRAGMENT_2.content);
+		Element.getElementById("html3").setContent(FRAGMENT_2.content);
 		await nextUIUpdate();
 		okFragment(assert, FRAGMENT_2, "uiAreaA", "html3 DOM must be equal to FRAGMENT_2");
 	});
 
 	QUnit.test("remove & rerender", async function(assert) {
-		var oHtml3 = Element.registry.get("html3");
+		var oHtml3 = Element.getElementById("html3");
 		var oHtml3Dom = oHtml3.getDomRef();
 		var oParent = oHtml3.getParent();
 		oParent.removeContent(0);
@@ -400,7 +400,7 @@ sap.ui.define([
 
 	QUnit.test("survive removal", async function(assert) {
 		// check preconditions
-		assert.ok(Element.registry.get("html3").getUIArea(), "html3 must be part of UIArea");
+		assert.ok(Element.getElementById("html3").getUIArea(), "html3 must be part of UIArea");
 		assert.equal(jQuery("#html3").length, 1, "html3 DOM should exist");
 		var oldDomRef = jQuery("#html3")[0];
 
@@ -409,17 +409,17 @@ sap.ui.define([
 		await nextUIUpdate();
 
 		// check that DOM still exists
-		assert.ok(!Element.registry.get("html3").getUIArea(), "html3 must no longer be part of UIArea");
+		assert.ok(!Element.getElementById("html3").getUIArea(), "html3 must no longer be part of UIArea");
 		assert.equal(jQuery("#html3").length, 1, "html3 DOM must still exist");
 		assert.equal(jQuery("#html3")[0], oldDomRef, "html3 DOM must be the same as before the removal");
 		assert.ok(RenderManager.isPreservedContent(jQuery("#html3")[0]), "html3 DOM must have been moved to preserve area");
 		assert.equal(jQuery("#sap-ui-dummy-html3").length, 0, "no dummy must exist");
 
 		// add it again to an UIArea and rerender
-		Element.registry.get("html3").placeAt("uiAreaB");
+		Element.getElementById("html3").placeAt("uiAreaB");
 		await nextUIUpdate();
-		assert.ok(Element.registry.get("html3").getUIArea(), "html3 must be part of UIArea");
-		assert.equal(Element.registry.get("html3").getUIArea().getId(), "uiAreaB", "html3 must be part of UIArea uiAreaB");
+		assert.ok(Element.getElementById("html3").getUIArea(), "html3 must be part of UIArea");
+		assert.equal(Element.getElementById("html3").getUIArea().getId(), "uiAreaB", "html3 must be part of UIArea uiAreaB");
 		assert.equal(jQuery("#html3").length, 1, "html3 DOM must exist");
 		assert.equal(jQuery("#html3")[0], oldDomRef, "html3 DOM still must be the same as before the removal");
 		assert.ok(!RenderManager.isPreservedContent(jQuery("#html3")[0]), "html3 DOM must no longer be part of preserve area");
@@ -429,7 +429,7 @@ sap.ui.define([
 
 	QUnit.test("destroy", function(assert) {
 		assert.equal(jQuery("#html3").length, 1, "html3 DOM should exist");
-		Element.registry.get("html3").destroy();
+		Element.getElementById("html3").destroy();
 		assert.equal(jQuery("#html3").length, 0, "html3 DOM should have been deleted");
 		assert.equal(jQuery("#sap-ui-dummy-html3").length, 0, "no dummy must exist");
 	});
@@ -449,7 +449,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("predefined content, invalidate UIArea", function(assert) {
-		Element.registry.get("html4").getUIArea().invalidate();
+		Element.getElementById("html4").getUIArea().invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_3, "uiAreaB", "UIArea contains expected HTML fragment");
@@ -457,7 +457,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("predefined content, invalidate HTMLControl", function(assert) {
-		Element.registry.get("html4").invalidate();
+		Element.getElementById("html4").invalidate();
 
 		return afterRerendering(function() {
 			okFragment(assert, FRAGMENT_3, "uiAreaB", "UIArea contains expected HTML fragment");
@@ -465,7 +465,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("predefined content, rerender HTMLControl", function(assert) {
-		Element.registry.get("html4").rerender();
+		Element.getElementById("html4").rerender();
 		// rerender is not async -> check immediately
 		okFragment(assert, FRAGMENT_3, "uiAreaB", "UIArea contains expected HTML fragment");
 	});
@@ -515,7 +515,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("predefined content, multiple roots, nested controls, rerendering", function(assert) {
-		var layout = Element.registry.get("layout7");
+		var layout = Element.getElementById("layout7");
 		var oldLayoutDomRef = layout.getDomRef();
 		assert.ok(oldLayoutDomRef != undefined, "layout has a domref");
 

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

@@ -459,13 +459,13 @@ sap.ui.define([
 				const oInsertFontFaceStyleSpy = sinon.spy(_IconRegistry, "insertFontFaceStyle");
 				const sExpectedFontURI = sap.ui.require.toUrl("sap/tnt/themes/base/fonts/horizon/");
 
-				Theming.setTheme("sap_horizon");
-
-				Theming.attachApplied(() => {
-					assert.ok(oInsertFontFaceStyleSpy.calledWith("SAP-icons-TNT", sExpectedFontURI, "sap-tnt-icons-horizon-2"));
-					res();
+				Theming.attachApplied((oEvent) => {
+					if (oEvent.theme === "sap_horizon") {
+						assert.ok(oInsertFontFaceStyleSpy.calledWith("SAP-icons-TNT", sExpectedFontURI, "sap-tnt-icons-horizon-2"));
+						res();
+					}
 				});
-
+				Theming.setTheme("sap_horizon");
 			});
 		});
 	});

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

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/core/InvisibleText",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/Element",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, InvisibleText, jQuery, Configuration, nextUIUpdate) {
+], function(Log, InvisibleText, jQuery, Configuration, Element, nextUIUpdate) {
 	"use strict";
 
 	var oDIV = document.createElement("div");
@@ -51,7 +52,7 @@ sap.ui.define([
 
 		var textId = InvisibleText.getStaticId("sap.ui.core", "VALUE_STATE_ERROR");
 		assert.ok(textId && typeof textId === 'string', "getStaticId must return an ID");
-		var oText = sap.ui.getCore().byId(textId);
+		var oText = Element.getElementById(textId);
 		assert.ok(oText instanceof InvisibleText, "ID must refer to an instance of InvisibleText");
 		assert.equal(oText.$().text(), sExpectedTextEN, "Text rendered correctly");
 		assert.equal(oText.$().attr("aria-hidden"), "true", "aria-hidden=true is set");
@@ -72,10 +73,10 @@ sap.ui.define([
 		// but rather reflect the behavior of the current implementation
 
 		var textId3 = InvisibleText.getStaticId("not.a.library", "TEXT_FROM_A_NON_EXISTING_LIBRARY");
-		assert.equal(sap.ui.getCore().byId(textId3).$().text(), "TEXT_FROM_A_NON_EXISTING_LIBRARY", "retrieving a text from a non-existing library results in a text that equals the key");
+		assert.equal(Element.getElementById(textId3).$().text(), "TEXT_FROM_A_NON_EXISTING_LIBRARY", "retrieving a text from a non-existing library results in a text that equals the key");
 
 		var textId4 = InvisibleText.getStaticId("sap.ui.core", "THIS_TEXT_DOES_NOT_EXIST");
-		assert.equal(sap.ui.getCore().byId(textId4).$().text(), "THIS_TEXT_DOES_NOT_EXIST", "retrieving a non-existing key results in a text that equals the key");
+		assert.equal(Element.getElementById(textId4).$().text(), "THIS_TEXT_DOES_NOT_EXIST", "retrieving a non-existing key results in a text that equals the key");
 	});
 
 	QUnit.test("Deactivated Control APIs", function(assert) {

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

@@ -2774,13 +2774,13 @@ sap.ui.define([
 			assert.ok(ex.stack.indexOf("failingNamedFunction" > -1), "contained the named function in the stack");
 		}
 
-		assert.ok(!sap.ui.getCore().byId("myId"), "object was deregistered");
+		assert.ok(!Element.getElementById("myId"), "object was deregistered");
 	});
 
 	QUnit.test("Registration of components: duplicate IDs", function(assert) {
 		assert.expect(3);
 		new Element("myId");
-		assert.ok(sap.ui.getCore().byId("myId"), "object should be initially registered");
+		assert.ok(Element.getElementById("myId"), "object should be initially registered");
 
 		try {
 			new Element("myId");
@@ -2788,7 +2788,7 @@ sap.ui.define([
 			assert.equal(ex.message, "Error: adding element with duplicate id 'myId'");
 		}
 
-		assert.ok(sap.ui.getCore().byId("myId"), "object should still be registered");
+		assert.ok(Element.getElementById("myId"), "object should still be registered");
 	});
 
 	QUnit.test("Registration of components: do not call unregister if register fails", function(assert) {

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

@@ -34,7 +34,7 @@ sap.ui.define([
 				oControl.placeAt(oContainerRef);
 			}
 
-			var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.registry.get(sContainerId);
+			var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.getElementById(sContainerId);
 			return [oControl.getId(), oCont];
 		}
 
@@ -105,7 +105,7 @@ sap.ui.define([
 			function setRoot() {
 				var oControl = new Button();
 				oCore.setRoot(oContainerRef, oControl);
-				var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.registry.get(sContainerId);
+				var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.getElementById(sContainerId);
 				return [oControl.getId(), oCont];
 			}
 

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

@@ -129,14 +129,14 @@ sap.ui.define([
 	});
 
 
-	QUnit.test("Scroll Huge Scrollbars", function(assert) {
+	QUnit.test("Scroll Huge Scrollbars", async function(assert) {
 		assert.expect(1);
 		var done = assert.async();
 		// Support of Huge number of steps
 		this.oVSB.setSteps(1000000); //8000000px in Chrom
 		this.oVSB.setScrollPosition(300000);
-		setTimeout(async function() {
-			await nextUIUpdate();
+		await nextUIUpdate.runSync(); // await is only kept to indicate later call w/o ".runSync"
+		setTimeout(function() {
 			assert.equal(this.oVSB.getScrollPosition(), "300000", "scroll position is 300000 step");
 			done();
 		}.bind(this), 500);

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

@@ -96,7 +96,7 @@ function(StashedControlSupport, Element, Component, XMLView, Fragment, ListItem,
 		assert.ok(this.oButton.isStashed(), "Control is stashed");
 
 		this.oButton.unstash();
-		assert.strictEqual(sap.ui.getCore().byId(this.sId), this.oUnstashedButton, "StashedControl has been replaced");
+		assert.strictEqual(Element.getElementById(this.sId), this.oUnstashedButton, "StashedControl has been replaced");
 
 		assert.notOk(this.oUnstashedButton.isStashed(), "Control is not stashed anymore");
 	});
@@ -139,17 +139,17 @@ function(StashedControlSupport, Element, Component, XMLView, Fragment, ListItem,
 		this.oView.onAfterRendering = function() {
 			assert.notOk(document.getElementById("view--StashedButton"), "Stashed button is not rendered");
 
-			var oButton = sap.ui.getCore().byId("view--StashedButton");
+			var oButton = Element.getElementById("view--StashedButton");
 
 			assert.ok(oButton, "Stashed button is available by id");
 			assert.ok(oButton instanceof Button, "Stashed button is instanceof sap.m.Button");
 			assert.ok(oButton.isStashed(), "Stashed button has stashed=true");
 			assert.notOk(oButton.getVisible(), "Stashed button has visible=false");
 			assert.ok(document.getElementById("view--Button"), "Button is rendered");
-			assert.ok(sap.ui.getCore().byId("view--Button") instanceof Button, "Button is a Button");
+			assert.ok(Element.getElementById("view--Button") instanceof Button, "Button is a Button");
 
 			this.oView.onAfterRendering = function() {
-				var oUnstashedButton = sap.ui.getCore().byId("view--StashedButton");
+				var oUnstashedButton = Element.getElementById("view--StashedButton");
 				assert.ok(document.getElementById("view--StashedButton"), "Unstashed button is rendered");
 				assert.ok(oUnstashedButton instanceof Button, "Unstashed Button is still a Button");
 				assert.notOk(oUnstashedButton.isStashed(), "UnstashedButton.isStashed() != true");
@@ -166,7 +166,7 @@ function(StashedControlSupport, Element, Component, XMLView, Fragment, ListItem,
 
 	QUnit.test("getStashedControls", function(assert) {
 		assert.strictEqual(StashedControlSupport.getStashedControls().length, 1, "One stashed control existent");
-		assert.strictEqual(StashedControlSupport.getStashedControls("Panel")[0], sap.ui.getCore().byId("control11"), "One stashed controls in parent1");
+		assert.strictEqual(StashedControlSupport.getStashedControls("Panel")[0], Element.getElementById("control11"), "One stashed controls in parent1");
 	});
 
 	QUnit.test("getStashedControlIds", function(assert) {
@@ -346,16 +346,16 @@ function(StashedControlSupport, Element, Component, XMLView, Fragment, ListItem,
 			this.oView.onAfterRendering = function() {
 				assert.notOk(document.getElementById("view--StashedButton"), "Stashed button is not rendered");
 
-				var oButton = sap.ui.getCore().byId("view--StashedButton");
+				var oButton = Element.getElementById("view--StashedButton");
 
 				assert.ok(oButton, "Stashed button is available by id");
 				assert.ok(oButton instanceof Button, "Stashed button is instanceof sap.m.Button");
 				assert.ok(oButton.isStashed(), "Stashed button has stashed=true");
 				assert.ok(document.getElementById("view--Button"), "Button is rendered");
-				assert.ok(sap.ui.getCore().byId("view--Button") instanceof Button, "Button is a Button");
+				assert.ok(Element.getElementById("view--Button") instanceof Button, "Button is a Button");
 
 				this.oView.onAfterRendering = function() {
-					var oUnstashedButton = sap.ui.getCore().byId("view--StashedButton");
+					var oUnstashedButton = Element.getElementById("view--StashedButton");
 					assert.ok(document.getElementById("view--StashedButton"), "Unstashed button is rendered");
 					assert.ok(oUnstashedButton instanceof Button, "Unstashed Button is still a Button");
 					assert.notOk(oUnstashedButton.isStashed(), "UnstashedButton.isStashed() != true");
@@ -564,7 +564,7 @@ function(StashedControlSupport, Element, Component, XMLView, Fragment, ListItem,
 			aStashedControlsTotal[1].unstash();
 
 			// check final control
-			var oFinalControl = sap.ui.getCore().byId(sFinalID);
+			var oFinalControl = Element.getElementById(sFinalID);
 			assert.equal(oFinalControl.getSubSections().length, 1, "Unstashed final control instance has content.");
 			assert.equal(oFinalControl.getParent(), null, "Unstashed final control instance has no parent.");
 

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

@@ -1,7 +1,8 @@
 /*global QUnit*/
 sap.ui.define([
+	"sap/ui/core/Theming",
 	"sap/ui/core/theming/ThemeHelper"
-], function(ThemeHelper) {
+], function(Theming, ThemeHelper) {
 	"use strict";
 
 	QUnit.module("ThemeHelper");
@@ -11,7 +12,7 @@ sap.ui.define([
 		var oMetadata;
 
 		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib12", { async: true }).then(function () {
-			var fnAssertThemeChanged = function () {
+			var fnAssertApplied = function () {
 				oMetadata = ThemeHelper.getMetadata("sap-ui-theme-testlibs-themeParameters-lib12");
 				assert.deepEqual(oMetadata, {
 					"Path": "UI5.sample/path",
@@ -23,11 +24,11 @@ sap.ui.define([
 						"Engine": "1.0.0"
 					}
 				}, "Metadata correct");
-				sap.ui.getCore().detachThemeChanged(fnAssertThemeChanged);
+				Theming.detachApplied(fnAssertApplied);
 				done();
 			};
 
-			sap.ui.getCore().attachThemeChanged(fnAssertThemeChanged);
+			Theming.attachApplied(fnAssertApplied);
 		});
 
 		oMetadata = ThemeHelper.getMetadata("sap-ui-theme-testlibs-themeParameters-lib12");