@openui5/sap.ui.core 1.118.0 → 1.119.0

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

@@ -5,11 +5,12 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/Icon",
 	"sap/ui/core/Lib",
+	"sap/ui/core/Theming",
 	"sap/ui/dom/includeStylesheet",
 	"sap/m/Bar",
 	"sap/ui/thirdparty/URI",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Parameters, Control, Element, Icon, Library, includeStylesheet, Bar, URI, nextUIUpdate) {
+], function(Parameters, Control, Element, Icon, Library, Theming, includeStylesheet, Bar, URI, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Parmeters.get", {
@@ -20,8 +21,6 @@ sap.ui.define([
 		}
 	});
 
-	var sPath = new URI(sap.ui.require.toUrl("testdata/core"), document.baseURI).toString();
-
 	QUnit.test("InitialCheck", function(assert) {
 		assert.ok(Parameters, "sap.ui.core.theming.Parameters must exist");
 		assert.ok(Parameters.get, "sap.ui.core.theming.Parameters.get() must exist");
@@ -51,18 +50,6 @@ sap.ui.define([
 		return sParameter;
 	}
 
-	function getParametersInUnifiedHexNotation(aKeys, oElement) {
-		var oParameters = Parameters.get(aKeys, oElement);
-		if (oParameters) {
-			aKeys.forEach(function(key) {
-				if (oParameters[key]) {
-					oParameters[key] = unifyHexNotation(oParameters[key]);
-				}
-			});
-		}
-		return oParameters;
-	}
-
 	function checkLibraryParametersJsonRequestForLib(sLibNumber) {
 		return window.performance.getEntriesByType("resource").filter(function (oResource) {
 			return oResource.name.endsWith("themeParameters/lib" + sLibNumber + "/themes/sap_hcb/library-parameters.json");
@@ -85,330 +72,6 @@ sap.ui.define([
 		});
 	}
 
-	QUnit.module("Parmeters.get (sync)", {
-		before: function() {
-			// For some reasons window.performance.getResourceByType does only return the first 250?!
-			// entries therefore clear the resource timings upfront
-			window.performance.clearResourceTimings();
-		}
-	});
-
-	QUnit.test("Read single parameters", function(assert) {
-		/* HCB theme was chosen because:
-		 *  1. it should be quite stable in general
-		 *  2. background and text color are defined by design and thus even less likely to change
-		 *  3. it should be reliably there for accessibility reasons
-		 *  4. text and background color differ from the base theme
-		 */
-		assert.equal(getParameterInUnifiedHexNotation("sapUiBaseText"), "#ffffff", "sapUiBaseText must be defined as 'white - #ffffff'");
-		assert.equal(getParameterInUnifiedHexNotation("sapUiBaseBG"), "#000000", "sapUiBaseBG must be defined as black '#000000'");
-
-		// Read parameters of legacy library-parameters.json format
-		assert.equal(Parameters.get("sapUiLegacyTstTextColor"), "#fafafa", "sapUiLegacyTstTextColor must be defined as '#fafafa'");
-		assert.equal(getParameterInUnifiedHexNotation("sapUiLegacyText"), "#ffffff", "sapUiLegacyText must be defined as '#ffffff'");
-	});
-
-	QUnit.test("Undefined parameter", function(assert) {
-		assert.equal(Parameters.get("thisParameterNameMayNeverExist"), undefined, "'undefined' should be returned for unknown parameter names");
-	});
-
-	QUnit.test("Invalid parameter", function(assert) {
-		assert.equal(Parameters.get(null), undefined, "'undefined' should be returned for 'null' parameter name");
-	});
-
-	QUnit.test("All parameters", function(assert) {
-		var mAllParams = Parameters.get();
-		assert.ok(mAllParams, "A map of parameters should be returned when get is called without parameter name");
-
-		var count = 0;
-		for (var property in mAllParams) {
-			assert.equal(typeof mAllParams[property], "string", "Parameter '" + property + "' should be a string");
-			count++;
-		}
-		assert.ok(count > 10, "The map of parameters should have quite some entries");
-	});
-
-	QUnit.test("Parameter from Unknown Library", function(assert) {
-		assert.equal(Parameters.get("sapUiTstTextColor"), undefined, "'undefined' should be returned for a parameter of a library that currently is not loaded");
-	});
-
-	QUnit.test("Check that link tags for libraries are added in the correct order", function(assert) {
-		var i = 0;
-		var sLib15Name = "testlibs.themeParameters.lib15";
-		var sLib16Name = "testlibs.themeParameters.lib16";
-
-		sap.ui.getCore().loadLibrary(sLib16Name);
-		sap.ui.getCore().loadLibrary(sLib15Name);
-
-		// Link tags for recently loaded libs 15 and 16 shouldn't be available in DOM
-		var aAllLibrariesRequireCss = Library.getAllInstancesRequiringCss();
-		document.querySelectorAll("link").forEach(function (oLink) {
-			if (oLink.id.includes(sLib15Name) || oLink.id.includes(sLib16Name)) {
-				assert.notOk("Link tag for lib 15 and 16 shouldn't be available synchronous");
-			}
-		});
-
-		// Trigger loading of parameters.json for lib CSS which is not loaded
-		Parameters.get("sapUiThemeParamForLib14");
-		// Check that link tags are added in the corrct order
-		aAllLibrariesRequireCss = Library.getAllInstancesRequiringCss();
-		document.querySelectorAll("link").forEach(function (oLink) {
-			if (oLink.id.startsWith("sap-ui-theme-")) {
-				var sExpectedLinkId = aAllLibrariesRequireCss[i].variant ?
-					aAllLibrariesRequireCss[i].name + "-[" + aAllLibrariesRequireCss[i].variant + "]" : aAllLibrariesRequireCss[i].name;
-				assert.strictEqual(oLink.id, "sap-ui-theme-" + sExpectedLinkId, "Link tag for library " + sExpectedLinkId + " is correct");
-				i++;
-			}
-		});
-	});
-
-	QUnit.test("After Theme Change", function(assert) {
-		var done = assert.async();
-		var fnContinue = function() {
-			sap.ui.getCore().detachThemeChanged(fnContinue);
-			done();
-		};
-		var fnAssertThemeChanged = function() {
-
-			// parameters of base theme should now be present
-			assert.equal(getParameterInUnifiedHexNotation("sapUiBaseText"), "#000000", "sapUiBaseText must be defined as 'black - #000000'");
-			assert.equal(getParameterInUnifiedHexNotation("sapUiBaseBG"), "#ffffff", "sapUiBaseBG must be defined as 'white - #ffffff'");
-
-			sap.ui.getCore().detachThemeChanged(fnAssertThemeChanged);
-			sap.ui.getCore().attachThemeChanged(fnContinue);
-			sap.ui.getCore().applyTheme("sap_hcb");
-		};
-
-		sap.ui.getCore().attachThemeChanged(fnAssertThemeChanged);
-		sap.ui.getCore().applyTheme("base");
-	});
-
-	QUnit.test("Dynamically Loaded Library", function(assert) {
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib1");
-
-		// Need promise resolve to get async after load library
-		return Promise.resolve().then(function() {
-			// In Chrome the library.css for testlibs.themeParameters.lib1 is still pending, so the library-parameters.json needs to be loaded.
-			// In Firefox however, the library.css is available when fetching the theme-parameter.
-			// To unify the behaviour, prevent inline data-uri parameter usage and force a json request to test the request params
-			// BCP: 2170097761
-			var oLink = document.getElementById("sap-ui-theme-testlibs\.themeParameters\.lib1");
-			oLink.style = "background-image: none !important;";
-
-			assert.equal(Parameters.get("sapUiThemeParamForLib1"), "#fafafa", "parameter for newly loaded library should be known now");
-			assert.strictEqual(checkLibraryParametersJsonRequestForLib("1").length, 1, "library-parameters.json requested once for testlibs.themeParameters.lib1");
-		});
-	});
-
-	QUnit.test("Read scoped parameters (from testlibs.themeParameters.lib2)", function(assert) {
-		var oControl = new Control();
-
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib2");
-
-		// Need promise resolve to get async after load library
-		return Promise.resolve().then(function() {
-			assert.equal(Parameters.get("sapUiThemeParamWithScopeForLib2", oControl), "#fbfbfb",
-				"No scope set - default value should get returned");
-
-			oControl.addStyleClass("sapTestScope");
-
-			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamWithScopeForLib2", oControl), "#000000",
-				"Scope set directly on control - scoped param should be returned");
-			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamWithoutScopeForLib2", oControl), "#ffffff",
-				"Scope set directly on control but no scoped value defined - default value should get returned");
-
-			oControl.removeStyleClass("sapTestScope");
-			var oParent = new Control();
-			oParent.addStyleClass("sapTestScope");
-			oControl.setParent(oParent);
-
-			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamWithScopeForLib2", oControl), "#000000",
-				"Scope set on parent control - scoped param should be returned");
-			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamWithoutScopeForLib2", oControl), "#ffffff",
-				"Scope set on parent control but no scoped value defined - default value should get returned");
-
-			assert.strictEqual(checkLibraryParametersJsonRequestForLib("2").length, 1, "library-parameters.json requested once for testlibs.themeParameters.lib2");
-		});
-	});
-
-	QUnit.test("Read scoped parameters (error handling)", function(assert) {
-		var oElement = new Element();
-
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib3");
-
-		// Need promise resolve to get async after load library
-		return Promise.resolve().then(function() {
-			assert.equal(Parameters.get("sapUiThemeParamWithScopeForLib3", oElement), "#fcfcfc",
-				"No scope set - default value should get returned");
-
-			assert.equal(Parameters.get("sapUiThemeParamWithScopeForLib3", null), "#fcfcfc",
-				"'null' value provided as 'oControl' - default value should get returned");
-
-			assert.equal(Parameters.get("sapUiThemeParamWithScopeForLib3", {}), "#fcfcfc",
-				"'{}' value provided as 'oControl' - default value should get returned");
-
-			var oParent = new Control();
-			oParent.addStyleClass("sapTestScope");
-			oElement.setParent(oParent);
-
-			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamWithScopeForLib3", oElement), "#111111",
-				"Scope set on parent control - scoped param should be returned");
-
-			assert.strictEqual(checkLibraryParametersJsonRequestForLib("3").length, 1, "library-parameters.json requested once for testlibs.themeParameters.lib3");
-		});
-	});
-
-	QUnit.test("Read multiple given parameters", function(assert) {
-		var aParams = ["sapUiThemeParamWithScopeForLib2", "sapUiThemeParamWithoutScopeForLib2"];
-		var oExpected = {
-			"sapUiThemeParamWithScopeForLib2": "#fbfbfb",
-			"sapUiThemeParamWithoutScopeForLib2": "#ffffff"
-		};
-
-		// Only relevant for single test execution
-		if (!sap.ui.getCore().getLoadedLibraries()["testlibs.themeParameters.lib2"]) {
-			sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib2");
-		}
-
-		var oParamResult = getParametersInUnifiedHexNotation(aParams);
-
-		assert.deepEqual(oParamResult, oExpected,
-			"Key-value map for the given params 'sapUiThemeParamWithScopeForLib2' and 'sapUiThemeParamWithoutScopeForLib2' should be returned");
-	});
-
-	QUnit.test("Read multiple given parameters and Element", function(assert) {
-		var oElement = new Element();
-		var oParent = new Control();
-
-		// Only relevant for single test execution
-		if (!sap.ui.getCore().getLoadedLibraries()["testlibs.themeParameters.lib2"]) {
-			sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib2");
-		}
-
-		oParent.addStyleClass("sapTestScope");
-		oElement.setParent(oParent);
-
-		var aParams = ["sapUiThemeParamWithScopeForLib2", "sapUiThemeParamWithoutScopeForLib2"];
-		var oExpected = {
-			"sapUiThemeParamWithScopeForLib2": "#000000",
-			"sapUiThemeParamWithoutScopeForLib2": "#ffffff"
-		};
-
-		var oParamResult = getParametersInUnifiedHexNotation(aParams, oElement);
-
-		assert.deepEqual(oParamResult, oExpected,
-			"Key-value map for the given params 'sapUiThemeParamWithScopeForLib2' and 'sapUiThemeParamWithoutScopeForLib2' should be returned");
-	});
-
-	QUnit.test("Read multiple given parameters (including undefined param name)", function(assert) {
-		var aParams = ["sapUiThemeParamWithScopeForLib2", "sapUiThemeParamWithoutScopeForLib2", "sapUiThemeParamDoesNotExistForLib2"];
-		var oExpected = {
-			"sapUiThemeParamWithScopeForLib2": "#fbfbfb",
-			"sapUiThemeParamWithoutScopeForLib2": "#ffffff",
-			"sapUiThemeParamDoesNotExistForLib2": undefined
-		};
-
-		// Only relevant for single test execution
-		if (!sap.ui.getCore().getLoadedLibraries()["testlibs.themeParameters.lib2"]) {
-			sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib2");
-		}
-
-		var oParamResult = getParametersInUnifiedHexNotation(aParams);
-
-		assert.deepEqual(oParamResult, oExpected,
-			"Key-value map for the given params 'sapUiThemeParamWithScopeForLib2' and 'sapUiThemeParamWithoutScopeForLib2' should be returned");
-	});
-
-	QUnit.test("Relative URLs in parameters", function(assert) {
-
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib4");
-
-		// Need promise resolve to get async after load library
-		return Promise.resolve().then(function() {
-			var expected = {
-				url1: sPath + "/testdata/libraries/themeParameters/lib4/img1.jpg",
-				url2: sPath + "/testdata/libraries/themeParameters/lib4/foo/img2.jpg",
-				url3: sPath + "/testdata/libraries/themeParameters/lib4/foo/bar/img3.jpg",
-				url4: sPath + "/testdata/libraries/themeParameters/lib4/themes/sap_hcb/",
-				url5: sPath + "/testdata/libraries/themeParameters/lib4/themes/sap_hcb/",
-				url6: sPath + "/testdata/libraries/themeParameters/lib4/themes/sap_hcb/",
-				url7: "blob:http://example.com/6e88648c-00e1-4512-9695-5b702d8455b4",
-				url8: "data:text/plain;utf-8,foo",
-				url9: {
-					plain: "none",
-					themeImage: null,
-					themeImageForce: sap.ui.require.toUrl("sap/ui/core/themes/base/img/1x1.gif")
-				}
-			};
-
-			// plain values
-			assert.equal(Parameters.get("sapUiThemeParamUrl1"), "url('" + expected.url1 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/img1.jpg'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl2"), "url('" + expected.url2 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/foo/img2.jpg'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl3"), "url('" + expected.url3 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/foo/bar/img3.jpg'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl4"), "url('" + expected.url4 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/themes/sap_hcb/'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl5"), "url('" + expected.url5 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/themes/sap_hcb/'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl6"), "url('" + expected.url6 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/libraries/themeParameters/lib4/themes/sap_hcb/'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl7"), "url('" + expected.url7 + "')", "Relative URL should be resolved correctly 'blob:http://example.com/6e88648c-00e1-4512-9695-5b702d8455b4'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl8"), "url('" + expected.url8 + "')", "Relative URL should be resolved correctly 'data:text/plain;utf-8,foo'.");
-			assert.equal(Parameters.get("sapUiThemeParamUrl9"), expected.url9.plain, "'none' should stay as defined");
-
-			// _getThemeImage
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl1"), expected.url1, "Theme Image value should be correct for 'sapUiThemeParamUrl1'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl2"), expected.url2, "Theme Image value should be correct for 'sapUiThemeParamUrl2'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl3"), expected.url3, "Theme Image value should be correct for 'sapUiThemeParamUrl3'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl4"), expected.url4, "Theme Image value should be correct for 'sapUiThemeParamUrl4'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl5"), expected.url5, "Theme Image value should be correct for 'sapUiThemeParamUrl5'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl6"), expected.url6, "Theme Image value should be correct for 'sapUiThemeParamUrl6'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl7"), expected.url7, "Theme Image value should be correct for 'sapUiThemeParamUrl7'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl8"), expected.url8, "Theme Image value should be correct for 'sapUiThemeParamUrl8'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl9"), expected.url9.themeImage, "Theme Image value should be 'null' for parameter value 'none'.");
-			assert.equal(Parameters._getThemeImage("sapUiThemeParamUrl9", true), expected.url9.themeImageForce, "Theme Image value should be 'sap/ui/core/themes/base/img/1x1.gif' for parameter value 'none' (force).");
-
-			assert.strictEqual(checkLibraryParametersJsonRequestForLib("4").length, 1, "library-parameters.json requested once for testlibs.themeParameters.lib4");
-		});
-	});
-
-	QUnit.test("Relative URLs in parameters (legacy library)", function(assert) {
-
-		var expected = {
-			url1: sPath + "/testdata/legacy-uilib_legacyAPIs/img1.jpg",
-			url2: {
-				plain: "none",
-				themeImage: null,
-				themeImageForce: sap.ui.require.toUrl("sap/ui/core/themes/base/img/1x1.gif")
-			}
-		};
-
-		// plain values
-		assert.equal(Parameters.get("sapUiLegacyTestUrl1"), "url('" + expected.url1 + "')", "Relative URL should be resolved correctly 'sap/ui/core/qunit/testdata/uilib/img1.jpg'.");
-		assert.equal(Parameters.get("sapUiLegacyTestUrl2"), expected.url2.plain, "'none' should stay as defined");
-
-		// _getThemeImage
-		assert.equal(Parameters._getThemeImage("sapUiLegacyTestUrl1"), expected.url1, "Theme Image value should be correct for 'sapUiLegacyTestUrl1'.");
-		assert.equal(Parameters._getThemeImage("sapUiLegacyTestUrl2"), expected.url2.themeImage, "Theme Image value should be 'null' for parameter value 'none'.");
-		assert.equal(Parameters._getThemeImage("sapUiLegacyTestUrl2", true), expected.url2.themeImageForce, "Theme Image value should be 'sap/ui/core/themes/base/img/1x1.gif' for parameter value 'none' (force).");
-
-	});
-
-	QUnit.test("Get parameter while CSS after themeChanged finished loading and before ThemeManager processed themeChanged event", function(assert) {
-		var sPrefixedLibId = "sap-ui-theme-testlibs.themeParameters.lib17";
-
-		// Setup
-		Parameters.reset();
-		var oCssPromise1 = createLinkElement(sPrefixedLibId, true);
-		var oCssPromise2 = createLinkElement(sPrefixedLibId, false);
-		return Promise.all([oCssPromise1, oCssPromise2]).then(function() {
-			assert.strictEqual(Parameters.get("sapUiThemeParamForLib17"), "#fafafa", "Parameter 'sapUiThemeParamForLib17' has value: '#fafafa'");
-
-			// Cleanup
-			Array.from(document.querySelectorAll("link")).forEach(function (oLink) {
-				if (oLink.getAttribute("id") === sPrefixedLibId || oLink.getAttribute("data-sap-ui-foucmarker") === sPrefixedLibId) {
-					oLink.remove();
-				}
-			});
-		});
-	});
-
 	QUnit.module("Parmeters.get (async)", {
 		before: function() {
 			// For some reasons window.performance.getResourceByType does only return the first 250?!
@@ -423,7 +86,7 @@ sap.ui.define([
 			name: "sapUiAsyncThemeParamForLib5"
 		}), undefined, "'undefined' should be returned for a parameter of a library that currently is not loaded");
 
-		sap.ui.getCore().initLibrary({ name: "testlibs.themeParameters.lib5" });
+		Library.init({ name: "testlibs.themeParameters.lib5" });
 
 		Parameters.get({
 			name: "sapUiAsyncThemeParamForLib5",
@@ -435,10 +98,10 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read scoped parameters (from testlibs.themeParameters.lib6)", function(assert) {
+	QUnit.test("Read scoped parameters (from testlibs.themeParameters.lib6)", async function(assert) {
 		var oControl = new Control(), done = assert.async();
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib6");
+		await Library.load({name: "testlibs.themeParameters.lib6"});
 
 		Parameters.get({
 			name: "sapUiAsyncThemeParamWithScopeForLib6",
@@ -464,7 +127,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read multiple given parameters (including undefined param name)", function(assert) {
+	QUnit.test("Read multiple given parameters (including undefined param name)", async function(assert) {
 		var done = assert.async();
 		var oControl = new Control();
 		var aParams = ["sapUiMultipleAsyncThemeParamWithScopeForLib7", "sapUiMultipleAsyncThemeParamWithoutScopeForLib7", "sapUiNotExistingTestParam", "sapUiBaseColor"];
@@ -474,7 +137,8 @@ sap.ui.define([
 			"sapUiBaseColor": "#000000"
 		};
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib7");
+		await Library.load({name: "testlibs.themeParameters.lib7"});
+
 		oControl.addStyleClass("sapTestScope");
 
 		assert.strictEqual(Parameters.get({
@@ -493,7 +157,7 @@ sap.ui.define([
 		}), undefined, "Parameter 'sapUiBaseColor' should already be available but value should be returned in callback.");
 	});
 
-	QUnit.test("Call Parameters.get multiple times with same callback function should only be executed once", function (assert) {
+	QUnit.test("Call Parameters.get multiple times with same callback function should only be executed once", async function (assert) {
 		assert.expect(3);
 		var done = assert.async(), callback = function (oParamResult) {
 			assert.deepEqual(oParamResult, {
@@ -503,7 +167,7 @@ sap.ui.define([
 			assert.strictEqual(checkLibraryParametersJsonRequestForLib("8").length, 0, "library-parameters.json not requested for testlibs.themeParameters.lib8");
 		};
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib8");
+		await Library.load({name: "testlibs.themeParameters.lib8"});
 
 		Parameters.get({
 			name: "sapUiThemeParam1ForLib8",
@@ -524,10 +188,10 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read not defined parameter using callback", function(assert) {
+	QUnit.test("Read not defined parameter using callback", async function(assert) {
 		var done = assert.async();
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib9");
+		await Library.load({name: "testlibs.themeParameters.lib9"});
 
 		Parameters.get({
 			name: "sapUiNotExistingTestParam",
@@ -539,21 +203,21 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read parameter first time from lib which CSS is already loaded shouldn't trigger a library-parameters.json request", function(assert) {
+	QUnit.test("Read parameter first time from lib which CSS is already loaded shouldn't trigger a library-parameters.json request", async function(assert) {
 		var done = assert.async();
-		var fnAssertThemeChanged = function() {
+		var fnAssertApplied = function() {
 
 			// parameters of base theme should now be present
 			assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParam1ForLib10"), "#123321", "sapUiThemeParam1ForLib10 must be defined as '#123321'");
 			assert.strictEqual(checkLibraryParametersJsonRequestForLib("10").length, 0, "library-parameters.json not requested for testlibs.themeParameters.lib10");
 
-			sap.ui.getCore().detachThemeChanged(fnAssertThemeChanged);
+			Theming.detachApplied(fnAssertApplied);
 			done();
 		};
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib10");
+		await Library.load({name:"testlibs.themeParameters.lib10"});
 
-		sap.ui.getCore().attachThemeChanged(fnAssertThemeChanged);
+		Theming.attachApplied(fnAssertApplied);
 	});
 
 	QUnit.test("getActiveScopesFor: Check scope chain for given rendered control", async function(assert) {
@@ -574,7 +238,7 @@ sap.ui.define([
 
 		await nextUIUpdate();
 
-		var fnAssertThemeChanged = function () {
+		var fnAssertApplied = function () {
 			// CSS is loaded and scope 'TestScope1' is defined therefore different scope chains expected
 			assert.deepEqual(Parameters.getActiveScopesFor(oOuterBar, true), [], "OuterBar - no own scope - empty scope chain");
 			assert.deepEqual(Parameters.getActiveScopesFor(oInnerBar, true), [["TestScope1"]], "InnerBar - TestScope1 - [['TestScope1']]");
@@ -591,13 +255,13 @@ sap.ui.define([
 			assert.deepEqual(Parameters.get("sapUiThemeParam1ForLib11", oInnerIcon2), "#312111", "InnerIcon2 - TestScope1 - TestScope1 value #312111");
 
 			oOuterBar.destroy();
-			sap.ui.getCore().detachThemeChanged(fnAssertThemeChanged);
+			Theming.detachApplied(fnAssertApplied);
 			done();
 		};
 
-		sap.ui.getCore().loadLibrary("testlibs.themeParameters.lib11");
+		await Library.load({name: "testlibs.themeParameters.lib11" });
 
-		sap.ui.getCore().attachThemeChanged(fnAssertThemeChanged);
+		Theming.attachApplied(fnAssertApplied);
 
 		// No scope in css defined therefore empty scope chain for all combinations
 		assert.deepEqual(Parameters.getActiveScopesFor(oOuterBar, true), [], "OuterBar - no own scope - no scope defined ==> empty scope chain");
@@ -609,38 +273,42 @@ sap.ui.define([
 	});
 
 
-	QUnit.test("After Theme Change: Using Parameters.get", function(assert) {
+	QUnit.test("After Theme Change: Using Parameters.get", async function(assert) {
 		var done = assert.async();
-		var fnContinue = function() {
-			sap.ui.getCore().detachThemeChanged(fnContinue);
-			done();
+		var fnContinue = function(oEvent) {
+			if (oEvent.theme === "base") {
+				Theming.detachApplied(fnContinue);
+				done();
+			}
 		};
 
-		var fnThemeChanged = function () {
-			sap.ui.getCore().detachThemeChanged(fnThemeChanged);
+		var fnApplied = async function (oEvent) {
+			if (oEvent.theme === "sap_hcb") {
+				Theming.detachApplied(fnApplied);
+
+				await Library.load({name: "testlibs.themeParameters.lib14"});
 
-			sap.ui.getCore().loadLibraries(["testlibs.themeParameters.lib14"]).then(function () {
 				Parameters.get({
 					name: "sapUiThemeParamForLib14",
 					callback: function (oParamResult) {
 						assert.deepEqual(oParamResult, "#dfdfdf", "Value for the given param 'sapUiThemeParamForLib14' must be defined as '#dfdfdf' for theme 'base'");
 						assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamForLib13"), "#efefef", "sapUiThemeParamForLib13 must be defined as '#efefef' for theme 'base'");
 
-						sap.ui.getCore().attachThemeChanged(fnContinue);
-						sap.ui.getCore().applyTheme("sap_hcb");
+						Theming.attachApplied(fnContinue);
+						Theming.setTheme("sap_hcb");
 					}
 				});
 				assert.equal(getParameterInUnifiedHexNotation("sapUiThemeParamForLib13"), "#fefefe", "sapUiThemeParamForLib13 must be defined as '#fefefe' for theme 'hcb'");
-				sap.ui.getCore().applyTheme("base");
-			});
+				Theming.setTheme("base");
+			}
 		};
 
-		sap.ui.getCore().loadLibraries(["testlibs.themeParameters.lib13"]).then(function () {
-			sap.ui.getCore().attachThemeChanged(fnThemeChanged);
-		});
+		await Library.load({name: "testlibs.themeParameters.lib13"});
+
+		Theming.attachApplied(fnApplied);
 	});
 
-	QUnit.test("Get parameter while CSS after themeChanged finished loading and before ThemeManager processed themeChanged event", function(assert) {
+	QUnit.test("Get parameter while CSS after Applied finished loading and before ThemeManager processed Applied event", function(assert) {
 		var sPrefixedLibId = "sap-ui-theme-testlibs.themeParameters.lib17";
 
 		// Setup