@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -2,11 +2,14 @@
 // load Parameters API to test ThemeScopingChanged event
 sap.ui.define([
 	"sap/ui/core/Control",
+	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Control, Parameters, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Control, Theming, Parameters, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
+	var oMyControl, aCurrentDOMClasses, aCurrentAPIClasses;
 	createAndAppendDiv("content");
 
 	// trigger parameter loading to enable event
@@ -35,29 +38,29 @@ sap.ui.define([
 
 	QUnit.module("CustomStyleClassSupport", {
 		onThemeScopingChanged: function() {
-			var oDomRef = this.myControl.getDomRef();
-			this.aCurrentDOMClasses = oDomRef ? Array.prototype.slice.call(oDomRef.classList) : [];
-			this.aCurrentAPIClasses = this.myControl.aCustomStyleClasses;
+			var oDomRef = oMyControl.getDomRef();
+			aCurrentDOMClasses = oDomRef ? Array.prototype.slice.call(oDomRef.classList) : [];
+			aCurrentAPIClasses = oMyControl.aCustomStyleClasses;
 		},
 		beforeEach: function(assert) {
 
-			sap.ui.getCore().attachThemeScopingChanged(this.onThemeScopingChanged, this);
+			Theming.attachThemeScopingChanged(this.onThemeScopingChanged);
 
-			this.fireThemeScopingChangedSpy = sinon.spy(sap.ui.getCore(), "fireThemeScopingChanged");
+			this.fireThemeScopingChangedSpy = sinon.spy(Theming, "fireThemeScopingChanged");
 
-			this.myControl = new MyControlClass("myControl", assert);
+			oMyControl = new MyControlClass("myControl", assert);
 
-			this.myControl.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			oMyControl.placeAt("content");
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 
-			sap.ui.getCore().detachThemeScopingChanged(this.onThemeScopingChanged, this);
+			Theming.detachThemeScopingChanged(this.onThemeScopingChanged);
 
 			this.fireThemeScopingChangedSpy.restore();
 			this.fireThemeScopingChangedSpy = null;
 
-			this.myControl.destroy();
+			oMyControl.destroy();
 		}
 	});
 
@@ -66,30 +69,30 @@ sap.ui.define([
 
 		assert.expect(4); // control shouldn't rerender itself
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
 	});
 
 	QUnit.test("call hasStyleClass with whitespace", function(assert) {
-		assert.equal(this.myControl.hasStyleClass(" "), false, "white space should be ignored");
+		assert.equal(oMyControl.hasStyleClass(" "), false, "white space should be ignored");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
 	});
 
 	QUnit.test("call addStyleClass with whitespaces and check with hasStyleClass", function(assert) {
-		this.myControl.addStyleClass("\r \n \t \f  ");
+		oMyControl.addStyleClass("\r \n \t \f  ");
 
-		assert.equal(this.myControl.$()[0].className, "", "class in HTML shouldn't be changed");
-		assert.equal(this.myControl.hasStyleClass(" "), false, "White space(s) class name should be ignored");
-		assert.equal(this.myControl.hasStyleClass("\r"), false, "White space(s) class name should be ignored");
-		assert.equal(this.myControl.hasStyleClass("\n"), false, "White space(s) class name should be ignored");
-		assert.equal(this.myControl.hasStyleClass("\t"), false, "White space(s) class name should be ignored");
-		assert.equal(this.myControl.hasStyleClass("\f"), false, "White space(s) class name should be ignored");
-		assert.equal(this.myControl.hasStyleClass("\r \n \t \f  "), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.$()[0].className, "", "class in HTML shouldn't be changed");
+		assert.equal(oMyControl.hasStyleClass(" "), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.hasStyleClass("\r"), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.hasStyleClass("\n"), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.hasStyleClass("\t"), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.hasStyleClass("\f"), false, "White space(s) class name should be ignored");
+		assert.equal(oMyControl.hasStyleClass("\r \n \t \f  "), false, "White space(s) class name should be ignored");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -100,11 +103,11 @@ sap.ui.define([
 
 		assert.expect(5); // this also verifies there is no rerendering
 
-		this.myControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should now have the class");
-		assert.equal(this.myControl.hasStyleClass(" "), false, "white space class should be ignored");
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should now have the class");
+		assert.equal(oMyControl.hasStyleClass(" "), false, "white space class should be ignored");
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should now be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -113,19 +116,19 @@ sap.ui.define([
 	QUnit.test("remove an added class", function(assert) {
 		var sMyClass = "abc";
 
-		this.myControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
 
 		assert.expect(4); // this also verifies there is no rerendering
 
-		this.myControl.removeStyleClass(sMyClass);
+		oMyControl.removeStyleClass(sMyClass);
 
 		// remove white space class shouldn't have any effect
-		this.myControl.removeStyleClass(" ");
+		oMyControl.removeStyleClass(" ");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
-		this.myControl.removeStyleClass(sMyClass); // should not cause an error or rendering
+		oMyControl.removeStyleClass(sMyClass); // should not cause an error or rendering
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -136,15 +139,15 @@ sap.ui.define([
 
 		assert.expect(6); // this also verifies there is no rerendering
 
-		this.myControl.toggleStyleClass(sMyClass);
+		oMyControl.toggleStyleClass(sMyClass);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should now have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should now have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should now be in HTML");
 
-		this.myControl.toggleStyleClass(sMyClass);
+		oMyControl.toggleStyleClass(sMyClass);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -155,15 +158,15 @@ sap.ui.define([
 
 		assert.expect(6); // this also verifies there is no rerendering
 
-		this.myControl.toggleStyleClass(sMyClass, true);
+		oMyControl.toggleStyleClass(sMyClass, true);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should now have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should now have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should now be in HTML");
 
-		this.myControl.toggleStyleClass(sMyClass, false);
+		oMyControl.toggleStyleClass(sMyClass, false);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -174,15 +177,15 @@ sap.ui.define([
 
 		assert.expect(5); // this also verifies there is no rerendering
 
-		this.myControl.addStyleClass(sMyClass);
-		this.myControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
 
-		assert.equal(this.myControl.$()[0].className, "abc", "class should be in HTML only once");
+		assert.equal(oMyControl.$()[0].className, "abc", "class should be in HTML only once");
 
-		this.myControl.removeStyleClass(sMyClass);
+		oMyControl.removeStyleClass(sMyClass);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class");
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class");
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -193,29 +196,29 @@ sap.ui.define([
 			sMyClass1 = "bcd",
 			sCombinedClass = sMyClass + " " + sMyClass1;
 
-		this.myControl.addStyleClass(sCombinedClass);
-		this.myControl.removeStyleClass(""); // call with empty string shouldn't have any effect
+		oMyControl.addStyleClass(sCombinedClass);
+		oMyControl.removeStyleClass(""); // call with empty string shouldn't have any effect
 
-		assert.equal(this.myControl.hasStyleClass(sCombinedClass), true, "control should now have the combined class " + sCombinedClass);
-		assert.equal(this.myControl.$().hasClass(sCombinedClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sCombinedClass), true, "control should now have the combined class " + sCombinedClass);
+		assert.equal(oMyControl.$().hasClass(sCombinedClass), true, "class should now be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should now have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should now have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should now be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), true, "control should now have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass1), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), true, "control should now have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass1), true, "class should now be in HTML");
 
 
-		this.myControl.removeStyleClass(sCombinedClass + " unknownClass"); // remove unknown class shouldn't have any effect
+		oMyControl.removeStyleClass(sCombinedClass + " unknownClass"); // remove unknown class shouldn't have any effect
 
-		assert.equal(this.myControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
-		assert.equal(this.myControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
+		assert.equal(oMyControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
-		assert.equal(this.myControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
+		assert.equal(oMyControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -226,41 +229,41 @@ sap.ui.define([
 			sMyClass1 = "bcd",
 			sCombinedClass = sMyClass + " " + sMyClass1;
 
-		this.myControl.addStyleClass(sCombinedClass);
-		this.myControl.removeStyleClass(""); // call with empty string shouldn't have any effect
+		oMyControl.addStyleClass(sCombinedClass);
+		oMyControl.removeStyleClass(""); // call with empty string shouldn't have any effect
 
-		assert.equal(this.myControl.hasStyleClass(sCombinedClass), true, "control should now have the combined class " + sCombinedClass);
-		assert.equal(this.myControl.$().hasClass(sCombinedClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sCombinedClass), true, "control should now have the combined class " + sCombinedClass);
+		assert.equal(oMyControl.$().hasClass(sCombinedClass), true, "class should now be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should now have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should now have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should now be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), true, "control should now have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass1), true, "class should now be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), true, "control should now have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass1), true, "class should now be in HTML");
 
 
-		this.myControl.removeStyleClass(sMyClass1 + " unknownClass"); // remove unknown class shouldn't have any effect
+		oMyControl.removeStyleClass(sMyClass1 + " unknownClass"); // remove unknown class shouldn't have any effect
 
-		assert.equal(this.myControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
-		assert.equal(this.myControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
+		assert.equal(oMyControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), true, "control should still have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass), true, "class should still be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), true, "control should still have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass), true, "class should still be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
-		assert.equal(this.myControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
+		assert.equal(oMyControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
 
 
-		this.myControl.removeStyleClass(sMyClass + " unknownClass"); // remove unknown class shouldn't have any effect
+		oMyControl.removeStyleClass(sMyClass + " unknownClass"); // remove unknown class shouldn't have any effect
 
-		assert.equal(this.myControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
-		assert.equal(this.myControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sCombinedClass), false, "control should not have the combined class " + sCombinedClass);
+		assert.equal(oMyControl.$().hasClass(sCombinedClass), false, "class should not be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass), false, "control should not have the class " + sMyClass);
-		assert.equal(this.myControl.$().hasClass(sMyClass), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass), false, "control should not have the class " + sMyClass);
+		assert.equal(oMyControl.$().hasClass(sMyClass), false, "class should not be in HTML");
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
-		assert.equal(this.myControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), false, "control should not have the class " + sMyClass1);
+		assert.equal(oMyControl.$().hasClass(sMyClass1), false, "class should not be in HTML");
 
 		// ThemeScopingChanged Event should not be fired
 		sinon.assert.notCalled(this.fireThemeScopingChangedSpy);
@@ -272,8 +275,8 @@ sap.ui.define([
 			sCombinedClass = sMyClass + " " + sMyClass1,
 			oClonedControl;
 
-		this.myControl.addStyleClass(sCombinedClass);
-		oClonedControl = this.myControl.clone();
+		oMyControl.addStyleClass(sCombinedClass);
+		oClonedControl = oMyControl.clone();
 
 		assert.equal(oClonedControl.hasStyleClass(sMyClass), true, "the cloned control has the style class 'abc'");
 		assert.equal(oClonedControl.hasStyleClass(sMyClass1), true, "the cloned control has the style class 'bcd'");
@@ -288,12 +291,12 @@ sap.ui.define([
 	QUnit.test("Cloned Control and the original control should handle the style class separately", function(assert) {
 		var sMyClass = "abc",
 			sMyClass1 = "bcd",
-			oClonedControl = this.myControl.clone();
+			oClonedControl = oMyControl.clone();
 
-		this.myControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
 		oClonedControl.addStyleClass(sMyClass1);
 
-		assert.equal(this.myControl.hasStyleClass(sMyClass1), false, "the original control shouldn't have the class which is added on the cloned one");
+		assert.equal(oMyControl.hasStyleClass(sMyClass1), false, "the original control shouldn't have the class which is added on the cloned one");
 		assert.equal(oClonedControl.hasStyleClass(sMyClass), false, "the cloned control shouldn't have the class which is added on the original one");
 
 		oClonedControl.destroy();
@@ -307,27 +310,27 @@ sap.ui.define([
 
 		assert.expect(8); // this also verifies there is no rerendering
 
-		this.myControl.addStyleClass(sMyClass);
+		oMyControl.addStyleClass(sMyClass);
 
-		assert.deepEqual(this.aCurrentDOMClasses, [sMyClass], "Class should have been applied to DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, [sMyClass], "Class should have been applied to internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, [sMyClass], "Class should have been applied to DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, [sMyClass], "Class should have been applied to internal object before event has been fired");
 
-		this.myControl.removeStyleClass(sMyClass);
+		oMyControl.removeStyleClass(sMyClass);
 
-		assert.deepEqual(this.aCurrentDOMClasses, [], "Class should have been removed from DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, [], "Class should have been removed from internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, [], "Class should have been removed from DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, [], "Class should have been removed from internal object before event has been fired");
 
-		this.myControl.removeStyleClass(sMyClass); // should not cause an error or rendering
+		oMyControl.removeStyleClass(sMyClass); // should not cause an error or rendering
 
 		// ThemeScopingChanged Event should be be fired twice (added + removed)
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 2);
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScope"],
 			added: true
 		});
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScope"],
 			added: false
 		});
@@ -338,63 +341,63 @@ sap.ui.define([
 		assert.expect(18); // this also verifies there is no rerendering
 
 		// add all-in-one
-		this.myControl.addStyleClass("sapTestScope abc sapTestScopePlus def");
+		oMyControl.addStyleClass("sapTestScope abc sapTestScopePlus def");
 
-		assert.deepEqual(this.aCurrentDOMClasses, ["sapTestScope", "abc", "sapTestScopePlus", "def"], "Classes should have been applied to DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, ["sapTestScope", "abc", "sapTestScopePlus", "def"], "Classes should have been applied to internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, ["sapTestScope", "abc", "sapTestScopePlus", "def"], "Classes should have been applied to DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, ["sapTestScope", "abc", "sapTestScopePlus", "def"], "Classes should have been applied to internal object before event has been fired");
 
 		// ThemeScopingChanged Event should be fired once
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 1);
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScope", "sapTestScopePlus"],
 			added: true
 		});
 
 		// remove abc
-		this.myControl.removeStyleClass("abc");
+		oMyControl.removeStyleClass("abc");
 
 		// ThemeScopingChanged Event should be still fired once
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 1);
 
 		// remove sapTestScopePlus
-		this.myControl.removeStyleClass("sapTestScopePlus");
+		oMyControl.removeStyleClass("sapTestScopePlus");
 
-		assert.deepEqual(this.aCurrentDOMClasses, ["sapTestScope", "def"], "Class should have been removed from DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, ["sapTestScope", "def"], "Class should have been removed from internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, ["sapTestScope", "def"], "Class should have been removed from DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, ["sapTestScope", "def"], "Class should have been removed from internal object before event has been fired");
 
 		// ThemeScopingChanged Event should now be fired twice
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 2);
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScopePlus"],
 			added: false
 		});
 
 		// add both scopes again
-		this.myControl.addStyleClass("sapTestScope sapTestScopePlus");
+		oMyControl.addStyleClass("sapTestScope sapTestScopePlus");
 
-		assert.deepEqual(this.aCurrentDOMClasses, ["sapTestScope", "def", "sapTestScopePlus"], "Class should have been applied to DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, ["sapTestScope", "def", "sapTestScopePlus"], "Class should have been applied to internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, ["sapTestScope", "def", "sapTestScopePlus"], "Class should have been applied to DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, ["sapTestScope", "def", "sapTestScopePlus"], "Class should have been applied to internal object before event has been fired");
 
 		// ThemeScopingChanged Event should be be fired 3 times
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 3);
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScopePlus"],
 			added: true
 		});
 
 		// remove both scopes again
-		this.myControl.removeStyleClass("sapTestScopePlus sapTestScope");
+		oMyControl.removeStyleClass("sapTestScopePlus sapTestScope");
 
-		assert.deepEqual(this.aCurrentDOMClasses, ["def"], "Classes should have been removed from DOM before event has been fired");
-		assert.deepEqual(this.aCurrentAPIClasses, ["def"], "Classes should have been removed from internal object before event has been fired");
+		assert.deepEqual(aCurrentDOMClasses, ["def"], "Classes should have been removed from DOM before event has been fired");
+		assert.deepEqual(aCurrentAPIClasses, ["def"], "Classes should have been removed from internal object before event has been fired");
 
 		// ThemeScopingChanged Event should be be fired 3 times
 		sinon.assert.callCount(this.fireThemeScopingChangedSpy, 4);
 		sinon.assert.calledWith(this.fireThemeScopingChangedSpy, {
-			element: this.myControl,
+			element: oMyControl,
 			scopes: ["sapTestScopePlus", "sapTestScope"],
 			added: false
 		});

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

@@ -1,22 +1,12 @@
 sap.ui.define([
+	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters",
 	"sap/ui/qunit/utils/waitForThemeApplied",
 	"sap/ui/core/Configuration"
-], function(Parameters, themeApplied, Configuration) {
+], function(Theming, Parameters, themeApplied, Configuration) {
 	"use strict";
 	/* global QUnit */
 
-	// Wait until the theme is changed
-	function themeChanged() {
-		return new Promise(function(resolve) {
-			function onChanged() {
-				sap.ui.getCore().detachThemeChanged(onChanged);
-				resolve();
-			}
-			sap.ui.getCore().attachThemeChanged(onChanged);
-		});
-	}
-
 	var sPath = new URL(sap.ui.require.toUrl("testdata/core"), document.baseURI).toString();
 
 	QUnit.module("Custom Theme Fallback", {
@@ -38,7 +28,7 @@ sap.ui.define([
 
 		// check precondition for test
 		assert.equal(
-			Configuration.getTheme(),
+			Theming.getTheme(),
 			"customcss",
 			"[precondition] initial theme must be 'customcss'");
 
@@ -93,8 +83,9 @@ sap.ui.define([
 	});
 
 	QUnit.test("Theme change after fallback (with second fallback)", function(assert) {
+		Theming.setTheme("legacy");
 
-		var p = themeChanged().then(function() {
+		return themeApplied().then(function() {
 
 			// Check for library themes and their correct order
 			var aLinks = document.querySelectorAll("link[id^=sap-ui-theme-]");
@@ -129,9 +120,6 @@ sap.ui.define([
 
 		});
 
-		sap.ui.getCore().applyTheme("legacy");
-
-		return p;
 	});
 
 });