@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -1,13 +1,15 @@
 
-/* global QUnit */
+/* global sinon QUnit */
 sap.ui.define([
 	"sap/ui/core/IconPool",
+	"sap/ui/core/_IconRegistry",
 	"sap/ui/core/Icon",
+	"sap/ui/core/Theming",
 	"sap/m/Image",
 	"sap/base/Log",
 	"sap/ui/test/TestUtils",
 	"sap/ui/thirdparty/jquery"
-], function(IconPool, Icon, Image, Log, TestUtils, jQuery) {
+], function(IconPool, _IconRegistry, Icon, Theming, Image, Log, TestUtils, jQuery) {
 	"use strict";
 
 	QUnit.config.reorder = false;
@@ -185,7 +187,7 @@ sap.ui.define([
 
 		IconPool.registerFont({
 			fontFamily: sFontFamily,
-			fontURI: sap.ui.require.toUrl("sap/tnt/themes/base/fonts")
+			fontURI: sap.ui.require.toUrl("sap/tnt/themes/base/fonts/")
 		});
 
 		// insert sap-icons-TNT font
@@ -200,7 +202,7 @@ sap.ui.define([
 
 		iFontFaceCount = document.fonts.size;
 		// insert font again
-		IconPool.insertFontFaceStyle(sFontFamily, sap.ui.require.toUrl("sap/tnt/themes/base/fonts"));
+		IconPool.insertFontFaceStyle(sFontFamily, sap.ui.require.toUrl("sap/tnt/themes/base/fonts/"));
 		assert.equal(document.fonts.size, iFontFaceCount, "No new FontFace is created");
 	});
 
@@ -420,6 +422,53 @@ sap.ui.define([
 		assert.strictEqual(IconPool.fontLoaded("invalid"), undefined, "fontLoaded returns undefined");
 	});
 
+	QUnit.module("Theme dependent Icons", {});
+
+	QUnit.test("registerFont with SAP-icons-TNT (Horizon Theme)", function(assert) {
+		const oInsertFontFaceStyleSpy = sinon.spy(_IconRegistry, "insertFontFaceStyle");
+		const oGetThemeStub = sinon.stub(Theming, "getTheme").returns("sap_horizon");
+
+		IconPool.registerFont({
+			collectionName: "my-tnt-icons-horizon",
+			fontFamily: "SAP-icons-TNT",
+			fontURI: sap.ui.require.toUrl("sap/tnt/themes/base/fonts/")
+		});
+
+		return IconPool.fontLoaded("my-tnt-icons-horizon").then(function() {
+			const sExpectedFontURI = sap.ui.require.toUrl("sap/tnt/themes/base/fonts/horizon/");
+			assert.ok(oInsertFontFaceStyleSpy.calledWith("SAP-icons-TNT", sExpectedFontURI, "my-tnt-icons-horizon"), "Correct font face inserted.");
+
+			// restore stubs
+			oGetThemeStub.restore();
+			oInsertFontFaceStyleSpy.restore();
+		});
+	});
+
+	QUnit.test("registerFont with SAP-icons-TNT (switching themes) ", function(assert) {
+		// set initial theme so that we enforce a theme change event
+		Theming.setTheme("sap_belize");
+
+		IconPool.registerFont({
+			collectionName: "sap-tnt-icons-horizon-2",
+			fontFamily: "SAP-icons-TNT",
+			fontURI: sap.ui.require.toUrl("sap/tnt/themes/base/fonts/")
+		});
+
+		return new Promise((res, rej) => {
+			IconPool.fontLoaded("sap-tnt-icons-horizon-2").then(function() {
+				const oInsertFontFaceStyleSpy = sinon.spy(_IconRegistry, "insertFontFaceStyle");
+				const sExpectedFontURI = sap.ui.require.toUrl("sap/tnt/themes/base/fonts/horizon/");
+
+				Theming.attachApplied(() => {
+					assert.ok(oInsertFontFaceStyleSpy.calledWith("SAP-icons-TNT", sExpectedFontURI, "sap-tnt-icons-horizon-2"));
+					res();
+				});
+
+				Theming.setTheme("sap_horizon");
+			});
+		});
+	});
+
 	QUnit.module("Sync getIconInfo");
 
 	QUnit.test("Calling getIconInfo with 'sync' mode on the default icon font returns the result immediately", function(assert) {

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

@@ -4,8 +4,10 @@ sap.ui.require([
 	"sap/base/util/ObjectPath",
 	"sap/ui/core/theming/ThemeManager",
 	"sap/base/i18n/ResourceBundle",
-	"sap/ui/dom/includeScript"
-], function(Library, ObjectPath, ThemeManager, ResourceBundle, includeScript) {
+	"sap/ui/dom/includeScript",
+	"sap/base/util/LoaderExtensions",
+	"sap/base/Log"
+], function(Library, ObjectPath, ThemeManager, ResourceBundle, includeScript, LoaderExtensions, Log) {
 	"use strict";
 
 	QUnit.module("Instance methods");
@@ -241,6 +243,57 @@ sap.ui.require([
 		assert.equal(Object.keys(Library._all(true)).includes(sLibName), true, "The library " + sLibName + " is now listed in Library._all(true) (without considering settings enhancement)");
 	});
 
+	QUnit.test("Static method 'getResourceBundleFor' called on library where manifest.json exists", function(assert) {
+		var sLibraryName = "testlibs.resourcebundle.lib1";
+		var oResourceBundle = Library.getResourceBundleFor(sLibraryName);
+
+		assert.ok(oResourceBundle, "Resource bundle can be created successfully");
+		assert.equal(oResourceBundle.getText("TITLE1"), "i18n.properties", "The configured resource bundle file in manifest.json is loaded (i18n.properties)");
+	});
+
+	QUnit.test("Static method 'getResourceBundleFor' called on known library where manifest.json does NOT exist", function(assert) {
+		var sLibraryName = "testlibs.resourcebundle.lib2";
+
+		return Library.load({name: sLibraryName}).then(function(oLibrary) {
+			var oErrorLogSpy = this.spy(Log, "error");
+			var oResourceBundle = Library.getResourceBundleFor(sLibraryName);
+
+			assert.ok(oResourceBundle, "Resource bundle can be created successfully");
+			assert.equal(oResourceBundle.getText("TITLE1"), "messagebundle.properties", "The fallback file 'messagebundle.properties' is loaded because no manifest.json is available for the library");
+			assert.equal(oErrorLogSpy.callCount, 0, "The failed request isn't logged");
+
+			var oLoadResourceSpy = this.spy(LoaderExtensions, "loadResource");
+
+			// try to get the resource bundle again
+			oResourceBundle = Library.getResourceBundleFor(sLibraryName);
+			assert.equal(oLoadResourceSpy.callCount, 0, "no further call is done for loading the manifest.json after the previous request failed");
+			assert.equal(oErrorLogSpy.callCount, 0, "No new error is logged");
+		}.bind(this));
+
+	});
+
+	QUnit.test("Static method 'getResourceBundleFor' called on unknown library where manifest.json does NOT exist", function(assert) {
+		var sLibraryName = "testlibs.resourcebundle.unknownLib";
+
+		var oErrorLogSpy = this.spy(Log, "error");
+		var oResourceBundle = Library.getResourceBundleFor(sLibraryName);
+
+		assert.ok(oResourceBundle, "Resource bundle can be created successfully");
+
+		assert.equal(oErrorLogSpy.callCount, 1, "Error is logged");
+		var oExpectedErr = sinon.match.instanceOf(Error).and(sinon.match.has('message', sinon.match(/unknownLib\/manifest.json(?:.)+not(?:.)*loaded/)));
+		sinon.assert.calledWith(oErrorLogSpy.getCall(0), oExpectedErr);
+
+		oErrorLogSpy.reset();
+
+		var oLoadResourceSpy = this.spy(LoaderExtensions, "loadResource");
+
+		// try to get the resource bundle again
+		oResourceBundle = Library.getResourceBundleFor(sLibraryName);
+		assert.equal(oLoadResourceSpy.callCount, 0, "no further call is done for loading the manifest.json after the previous request failed");
+		assert.equal(oErrorLogSpy.callCount, 0, "No new error is logged");
+	});
+
 	QUnit.module("Library.js included in custom bundle");
 
 	/**

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

@@ -8,12 +8,13 @@ sap.ui.define([
 	"sap/m/StandardListItem",
 	"sap/m/VBox",
 	"sap/ui/core/Control",
+	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/qunit/QUnitUtils"
-], function(LocalBusyIndicatorSupport, BusyDialog, Button, List, Slider, StandardListItem, VBox, Control, Element, XMLView, KeyCodes, jQuery, qutils) {
+], function(LocalBusyIndicatorSupport, BusyDialog, Button, List, Slider, StandardListItem, VBox, Control, Core, Element, XMLView, KeyCodes, jQuery, qutils) {
 	"use strict";
 
 	// Checks whether the given DomRef is contained or equals (in) one of the given container
@@ -113,7 +114,7 @@ sap.ui.define([
 			this.oFocusAfter = new Button("FocusAfter").placeAt("target1");
 			this.oSlider = new Slider().placeAt("target2");
 
-			sap.ui.getCore().applyChanges();
+			Core.applyChanges();
 		},
 
 		afterEach : function() {
@@ -285,7 +286,7 @@ sap.ui.define([
 
 			this.oSlider = new Slider().placeAt("target2");
 
-			sap.ui.getCore().applyChanges();
+			Core.applyChanges();
 		},
 
 		afterEach : function() {
@@ -382,10 +383,11 @@ sap.ui.define([
 			definition: '<mvc:View xmlns:mvc="sap.ui.core.mvc" busyIndicatorDelay="0"></mvc:View>'
 		}).then(function(myView) {
 			myView.placeAt('target1');
-			sap.ui.getCore().applyChanges();
+			Core.applyChanges();
 			myView.setBusy(true);
 			// this rerendering is crucial to test the behavior
-			myView.rerender();
+			myView.invalidate();
+			Core.applyChanges();
 			setTimeout(function() {
 				// assert
 				assert.ok(myView.$("busyIndicator").length, "BusyIndicator rendered");
@@ -445,8 +447,9 @@ sap.ui.define([
 		this.oButton.placeAt("target1");
 		this.oButton.setBusy(true);
 
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 
+		// before delegate
 		this.oButton.addDelegate({
 			onBeforeRendering: function() {
 				var oControl = this.getDomRef();
@@ -460,6 +463,7 @@ sap.ui.define([
 			}
 		}, true, this.oButton);
 
+		// after delegate
 		this.oButton.addDelegate({
 			onBeforeRendering: function() {
 				var oControl = this.getDomRef();
@@ -478,14 +482,16 @@ sap.ui.define([
 			}
 		}, false, this.oButton);
 
-		this.oButton.rerender();
+		// force a rendering
+		this.oButton.invalidate();
+		Core.applyChanges();
 	});
 
 	QUnit.test("OnAfterRendering", function(assert) {
 		var done = assert.async();
 		assert.expect(4);
 		this.oButton.placeAt("target1");
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 		var that = this;
 
 		setTimeout(function() {
@@ -524,7 +530,7 @@ sap.ui.define([
 		};
 		this.oButton.addDelegate(oOnAfterRenderingDelegate, false, this);
 		this.oButton.placeAt("target1");
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 		var that = this;
 
 		setTimeout(function() {
@@ -564,7 +570,7 @@ sap.ui.define([
 		this.oBtn.addDelegate(this.oDelegate);
 		this.oSpy = sinon.spy(this.oDelegate, "onAfterRendering");
 
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -600,7 +606,7 @@ sap.ui.define([
 		this.oBtn.addDelegate(this.oDelegate);
 		this.oSpy = sinon.spy(this.oDelegate, "onAfterRendering");
 
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -636,7 +642,7 @@ sap.ui.define([
 			busy : true
 		}).placeAt("target3");
 
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -687,13 +693,14 @@ sap.ui.define([
 		}, this.oButton);
 
 		this.oButton.placeAt("target1");
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 		this.oButton.setBusy(false);
 		// after reset the busy state, the control should be able to react to click event
 		this.testClickEventOn(this.oButton, assert);
 
-		// rerender the control to activate the busy state
-		this.oButton.rerender();
+		// rerender the control to activate the busy state (problem only occurs with 2nd. rendering)
+		this.oButton.invalidate();
+		Core.applyChanges();
 		this.oButton.setBusy(false);
 		// after reset the busy state, the control should be able to react to click event
 		this.testClickEventOn(this.oButton, assert);

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

@@ -2444,7 +2444,7 @@ sap.ui.define([
 
 
 		fnTestCase(true, false, true);
-		fnTestCase(false, true, true);
+		fnTestCase(false, true, false);
 		fnTestCase(true, true, true);
 
 		//only if child and all parents do not suppress invalidate, it should be false
@@ -2981,10 +2981,12 @@ sap.ui.define([
 		this.obj1.bindProperty("value", "/value");
 		this.obj2.bindProperty("value", "/value");
 
-		var oSpy = sinon.spy(this.obj2, "invalidate");
+		var oSpy1 = sinon.spy(this.obj1, "invalidate");
+		var oSpy2 = sinon.spy(this.obj2, "invalidate");
 		this.obj1.addAggregation("subObjects", this.obj2);
 
-		assert.equal(oSpy.callCount, 0, 'invalidation on obj2 must not be called');
+		assert.equal(oSpy1.callCount, 0, 'invalidation on obj1 must not be called');
+		assert.equal(oSpy2.callCount, 1, 'invalidation on obj2 must be called');
 	});
 
 	QUnit.module("Events", {

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

@@ -1002,18 +1002,56 @@ sap.ui.define([
 		this.spy(oBinding3, "checkUpdate");
 		var fnDone = assert.async();
 		oModel.checkUpdate(true, true, fnFilter);
-		oModel.checkUpdate(false, true, fnFilter); // to test foceUpdate wins
+		oModel.checkUpdate(false, true, fnFilter); // to test forceUpdate wins
 		setTimeout(function() { // wait for Model update
 			assert.equal(aTrueBindings.length, 1, "The test is called an delivers true for one binding");
 			assert.deepEqual(aTrueBindings[0], oBinding1, "And this is exactly the first binding");
-			assert.ok(oBinding1.checkUpdate.calledWith(true), "chechUpdate called as forced");
-			assert.ok(oBinding1.checkUpdate.calledOnce, "chechUpdate called only once");
-			assert.notOk(oBinding2.checkUpdate.called, "chechUpdate not called on other Binding");
-			assert.notOk(oBinding3.checkUpdate.called, "chechUpdate not called on other Binding");
+			assert.ok(oBinding1.checkUpdate.calledWith(true), "checkUpdate called as forced");
+			assert.ok(oBinding1.checkUpdate.calledOnce, "checkUpdate called only once");
+			assert.notOk(oBinding2.checkUpdate.called, "checkUpdate not called on other Binding");
+			assert.notOk(oBinding3.checkUpdate.called, "checkUpdate not called on other Binding");
 			fnDone();
 		}, 0);
 	});
 
+	QUnit.test("Check Update with different binding test function async", function (assert) {
+		var aTrueBindings = [];
+		var oModel = this.oManagedObjectModel;
+		var oBinding1 = oModel.bindProperty("/value");
+		var oBinding2 = oModel.bindProperty("/stringValue");
+		var oBinding3 = oModel.bindProperty("/floatValue");
+		oModel.addBinding(oBinding1);
+		oModel.addBinding(oBinding2);
+		oModel.addBinding(oBinding3);
+
+		assert.equal(oModel.getBindings().length, 3, "There are three bindings");
+
+		var fnFilter1 = function (oBinding) {
+			if (oBinding == oBinding1) {
+				aTrueBindings.push(oBinding);
+				return true;
+			}
+			return false;
+		};
+		var fnFilter2 = function (oBinding) {
+			if (oBinding == oBinding2) {
+				aTrueBindings.push(oBinding);
+				return true;
+			}
+			return false;
+		};
+
+		this.spy(oBinding1, "checkUpdate");
+		this.spy(oBinding2, "checkUpdate");
+		this.spy(oBinding3, "checkUpdate");
+		oModel.checkUpdate(true, true, fnFilter1);
+		oModel.checkUpdate(true, true, fnFilter2);
+		oModel.checkUpdate(false, false, fnFilter2);
+		assert.ok(oBinding1.checkUpdate.calledOnce, "checkUpdate called only once");
+		assert.ok(oBinding2.checkUpdate.calledOnce, "checkUpdate called only once");
+		assert.ok(oBinding3.checkUpdate.calledOnce, "checkUpdate called only once");
+	});
+
 	QUnit.test("ManagedObject Model - handle object properties", function(assert) {
 		var oData = {value: "A string", text: "A text"};
 		var oModel = new JSONModel({

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

@@ -21,9 +21,12 @@ sap.ui.define([
 			assert.ok(this.oObject.getInterface === BaseObject.prototype.getInterface, "fresh object doesn't have own getInterface implementation");
 		});
 
+		/**
+		 * @deprecated
+		 */
 		QUnit.test("GetInterface", function(assert) {
 			var oIntf1 = this.oNewClassInstance.getInterface();
-			assert.ok(oIntf1 !== undefined && oIntf1 !== null, "interface returned");
+			assert.ok(oIntf1 != null, "interface returned");
 			// assert("object has interface member", this.oObject.oInterface && typeof this.oObject.oInterface === "object" );
 			assert.ok(this.oNewClassInstance.getInterface !== BaseObject.prototype.getInterface, "object has own getInterface implementation");
 			var oIntf2 = this.oNewClassInstance.getInterface();

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

@@ -164,7 +164,7 @@ sap.ui.define([
 		};
 		var checkLoadedCss = function () {
 			var aAllThemeLinksForLibs = document.querySelectorAll("link[id^=sap-ui-theme]");
-			var aCustomCssLink = document.querySelectorAll("link[id=" + ThemeManager._CUSTOMID + "]");
+			var aCustomCssLink = document.querySelectorAll("link[id=sap-ui-core-customcss]");
 			aAllThemeLinksForLibs.forEach(function ($link) {
 				// Depending on order of test execution there could be more link tags as expected by this test
 				// Only do asserts here for the expected link tags and check for complete test execution by assert.expect
@@ -175,7 +175,7 @@ sap.ui.define([
 			assert.ok(aCustomCssLink[0].getAttribute("href")
 				.endsWith("/libraries/customCss/sap/ui/core/themes/customTheme/custom.css"), "URI of custom.css link tag is correct");
 		};
-		ThemeManager.applyTheme("customTheme");
+		sap.ui.getCore().applyTheme("customTheme");
 
 		return themeApplied().then(function () {
 			return sap.ui.getCore().loadLibrary("testlibs.customCss.lib1", true).then(function () {

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

@@ -12,7 +12,9 @@ sap.ui.define([
 	"use strict";
 
 	QUnit.module("Parmeters.get", {
-		beforeEach: function () {
+		before: function() {
+			// For some reasons window.performance.getResourceByType does only return the first 250?!
+			// entries therefore clear the resource timings upfront
 			window.performance.clearResourceTimings();
 		}
 	});
@@ -83,7 +85,9 @@ sap.ui.define([
 	}
 
 	QUnit.module("Parmeters.get (sync)", {
-		beforeEach: function () {
+		before: function() {
+			// For some reasons window.performance.getResourceByType does only return the first 250?!
+			// entries therefore clear the resource timings upfront
 			window.performance.clearResourceTimings();
 		}
 	});
@@ -405,7 +409,9 @@ sap.ui.define([
 	});
 
 	QUnit.module("Parmeters.get (async)", {
-		beforeEach: function () {
+		before: function() {
+			// For some reasons window.performance.getResourceByType does only return the first 250?!
+			// entries therefore clear the resource timings upfront
 			window.performance.clearResourceTimings();
 		}
 	});

package/test/sap/ui/core/qunit/Theming.beforeBootstrap.qunit.js

@@ -0,0 +1,13 @@
+/* global sinon */
+sap.ui.define(["sap/ui/core/Lib"], function(Lib) {
+    "use strict";
+
+    var oStub = sinon.stub(Lib, "init").callsFake(function(mSettings) {
+        // Stub Library.init to always set noLibraryCSS to true in order
+        // to avoid activation of ThemeManager
+        // This allows to test future scenarios, where theming is not
+        // necessarily loaded
+        mSettings.noLibraryCSS = true;
+        return oStub.wrappedMethod.call(this, mSettings);
+    });
+});