@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -3,13 +3,16 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Control",
+	"sap/ui/core/Element",
 	"sap/ui/core/Core",
 	"sap/ui/core/HTML",
 	"sap/ui/core/UIArea",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/testlib/TestButton",
+	"sap/ui/test/actions/Press",
 	"sap/ui/thirdparty/jquery"
-], function(Log, Control, oCore, HTML, UIArea, createAndAppendDiv, TestButton, jQuery) {
+], function(Log, Control, Element, oCore, HTML, UIArea, createAndAppendDiv, nextUIUpdate, TestButton, Press, jQuery) {
 	"use strict";
 
 	createAndAppendDiv("uiArea1");
@@ -44,10 +47,10 @@ sap.ui.define([
 	 * After rendering, the two controls should be visible in the UIArea
 	 * their order should match the order in which they have been added
 	 */
-	QUnit.test("basic rendering", function(assert) {
+	QUnit.test("basic rendering", async function(assert) {
 		this.oText1.placeAt("uiArea1");
 		this.oText2.placeAt("uiArea1");
-		oCore.applyChanges();
+		await nextUIUpdate();
 		assert.equal(jQuery("#uiArea1 > button").length, 2, "two spans have been rendered");
 		assert.equal(jQuery(jQuery("#uiArea1 > button").get(0)).text(), "Text 1", "first span shows first text");
 		assert.equal(jQuery(jQuery("#uiArea1 > button").get(1)).text(), "Text 2", "second span shows second text");
@@ -57,9 +60,9 @@ sap.ui.define([
 	 * Removes the controls from the UIArea
 	 * UIArea must be empty after the rendering
 	 */
-	QUnit.test("removeAllContent", function(assert) {
+	QUnit.test("removeAllContent", async function(assert) {
 		UIArea.registry.get("uiArea1").removeAllContent();
-		oCore.applyChanges();
+		await nextUIUpdate();
 		assert.equal(jQuery("#uiArea1").children().length, 0, "no more content");
 		assert.ok(oCore.byId("text1"), "remove must not destroy child 1");
 		assert.ok(oCore.byId("text2"), "remove must not destroy child 2");
@@ -70,14 +73,14 @@ sap.ui.define([
 	 * Rendering after addiition or removal of controls must not destroy
 	 * the content nor modify its order
 	 */
-	QUnit.test("initial DOM content", function(assert) {
+	QUnit.test("initial DOM content", async function(assert) {
 		var $originalDom = jQuery("#uiArea2").children();
 		assert.equal($originalDom.length, 1, "precondition: one span exists already in UIArea");
 		assert.equal(jQuery($originalDom.get(0)).text(), "Before", "precondition: span contains correct text");
 
 		this.oText1.placeAt("uiArea2");
 		this.oText2.placeAt("uiArea2");
-		oCore.applyChanges();
+		await nextUIUpdate();
 		var $currentDom = jQuery("#uiArea2").children();
 		assert.equal($currentDom.length, 3, "two more spans have been rendered");
 		assert.equal($currentDom.get(0), $originalDom.get(0), "initial DOM must still exist");
@@ -86,7 +89,7 @@ sap.ui.define([
 		assert.equal(jQuery($currentDom.get(2)).text(), "Text 2", "second span shows second text");
 
 		UIArea.registry.get("uiArea2").removeAllContent();
-		oCore.applyChanges();
+		await nextUIUpdate();
 		$currentDom = jQuery("#uiArea2").children();
 		assert.equal($currentDom.length, 1, "initial DOM still exists in UIArea");
 		assert.equal(jQuery($currentDom.get(0)).text(), "Before", "initial span still contains correct text");
@@ -96,7 +99,7 @@ sap.ui.define([
 	 * When additional pure DOM content is added to an UIArea,
 	 * that content must not be modified by the UIArea rerendering
 	 */
-	QUnit.test("additional DOM content", function(assert) {
+	QUnit.test("additional DOM content", async function(assert) {
 		// check preconditions
 		var $originalDom = jQuery("#uiArea2").children();
 		assert.equal($originalDom.length, 1, "precondition: one span exists already in UIArea");
@@ -108,10 +111,10 @@ sap.ui.define([
 
 		// do some interleaved modifications: Control / DOM / Control / DOM
 		this.oText1.placeAt("uiArea2");
-		oCore.applyChanges();
+		await nextUIUpdate();
 		jQuery("#uiArea2").append("<span>In Between</span>");
 		this.oText2.placeAt("uiArea2");
-		oCore.applyChanges();
+		await nextUIUpdate();
 		jQuery("#uiArea2").append("<span>After</span>");
 
 		// check results. Note: controls are rendered in one, contiguous block
@@ -126,7 +129,7 @@ sap.ui.define([
 
 		// now remove controls, check that the remainigs are as expected
 		UIArea.registry.get("uiArea2").removeAllContent();
-		oCore.applyChanges();
+		await nextUIUpdate();
 		$currentDom = jQuery("#uiArea2").children();
 		assert.equal($currentDom.length, 3, "initial DOM still exists in UIArea");
 		assert.equal(jQuery($currentDom.get(0)).text(), "Before", "initial span still contains correct text");
@@ -138,7 +141,7 @@ sap.ui.define([
 	 * When the UIArea contains a control that preserves its DOM,
 	 * then rerendering of the UIArea must not delete such preserved DOM
 	 */
-	QUnit.test("preserved DOM content", function(assert) {
+	QUnit.test("preserved DOM content", async function(assert) {
 		assert.ok(oCore.byId("text1"), "precondition: control 1 still exists");
 		assert.ok(!oCore.byId("text1").getParent(), "precondition: control 1 not bound");
 		assert.ok(oCore.byId("text2"), "precondition: control 2 still exists");
@@ -150,7 +153,7 @@ sap.ui.define([
 		this.oText1.placeAt("uiArea1");
 		this.oText2.placeAt("uiArea1");
 		this.oHtml3.placeAt("uiArea1");
-		oCore.applyChanges();
+		await nextUIUpdate();
 
 		// check that the rendering had the expected result
 		var $currentDom = jQuery("#uiArea1").children();
@@ -166,7 +169,7 @@ sap.ui.define([
 
 		// rerender the whole UIArea
 		this.oText1.getUIArea().invalidate();
-		oCore.applyChanges();
+		await nextUIUpdate();
 
 		// check that the modified DOM is still there
 		assert.equal(jQuery($currentDom.get(0)).text(), "Text 1", "first control rendered");
@@ -179,7 +182,7 @@ sap.ui.define([
 
 		// remove content and rerender
 		UIArea.registry.get("uiArea1").removeAllContent();
-		oCore.applyChanges();
+		await nextUIUpdate();
 
 		// check that UIArea is empoty, but preserved content still exists
 		$currentDom = jQuery("#uiArea1").children();
@@ -195,7 +198,6 @@ sap.ui.define([
 	QUnit.module("Event Handling", {
 		beforeEach: function() {
 			this.oButton = new TestButton().placeAt("uiArea1");
-			sap.ui.getCore().applyChanges();
 			this.spy(Log, "debug");
 			this.fakeEvent = function fakeEvent(type) {
 				return new jQuery.Event(new jQuery.Event(type), { target: this.oButton.getDomRef() });
@@ -203,7 +205,8 @@ sap.ui.define([
 			this.hasBeenLogged = function hasBeenLogged(oEvent, oElement) {
 				return Log.debug.calledWith(
 					sinon.match(/Event fired:/).and(sinon.match(oEvent.type).and(sinon.match(oElement.toString()))));
-			};
+				};
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oButton.destroy();
@@ -266,6 +269,29 @@ sap.ui.define([
 		UIArea.configureEventLogging({mouseover: 1});
 	});
 
+	QUnit.test("Control Events should be blocked depending on UIArea lock", function(assert) {
+		let bPressed = false;
+		const oPress = new Press();
+		const fnPress = () => {
+			bPressed = true;
+		};
+
+		this.oButton.getUIArea().lock();
+		this.oButton.attachPress(fnPress);
+
+		assert.ok(!bPressed, "Button must not have fired 'press' yet");
+		oPress.executeOn(this.oButton);
+		assert.ok(!bPressed, "Button still must not have fired 'press'");
+
+		this.oButton.getUIArea().unlock();
+
+		assert.ok(!bPressed, "Button still must not have fired 'press'");
+		oPress.executeOn(this.oButton);
+		assert.ok(bPressed, "Button should have fired 'press'");
+
+		this.oButton.detachPress(fnPress);
+	});
+
 
 	QUnit.module("Dependents", {
 		beforeEach: function() {
@@ -318,4 +344,208 @@ sap.ui.define([
 		oOther.addDependent(this.uiArea.getDependents()[0]);
 	});
 
+
+	var TestControl = Control.extend("test.TestControl", {
+		metadata: {
+			properties: {
+				header: {type: "string"}
+			},
+			aggregations: {
+				items: {type: "test.TestControl", multiple: true}
+			}
+		},
+		renderer: {
+			apiVersion: 2,
+			render: function (oRM, oControl) {
+				oRM.openStart("div", oControl).openEnd();
+				oRM.openStart("h1").openEnd().text(oControl.getHeader()).close("h1");
+				oControl.getItems().forEach(oRM.renderControl, oRM);
+				oRM.close("div");
+			}
+		}
+	});
+
+	QUnit.module("supressInvalidateFor", {
+		before: function() {
+			this.oRenderingSpy = sinon.spy(Control.prototype, "onBeforeRendering");
+		},
+		beforeEach: function () {
+			this.oGrandChild1 = new TestControl({ header: "GrandChild1" });
+			this.oGrandChild2 = new TestControl({ header: "GrandChild2" });
+			this.oChild1 = new TestControl({ header: "Child1", items: this.oGrandChild1 });
+			this.oChild2 = new TestControl({ header: "Child2", items: this.oGrandChild2 });
+			this.oParent = new TestControl({
+				header: "Parent",
+				items: [this.oChild1, this.oChild2]
+			});
+			this.oParent.placeAt("uiArea1");
+			oCore.applyChanges();
+
+			this.oRenderingSpy.reset();
+			this.oUiArea = this.oParent.getUIArea();
+		},
+		afterEach: function () {
+			this.oParent.destroy();
+		},
+		after: function() {
+			this.oRenderingSpy.restore();
+		}
+	});
+
+	QUnit.test("Invalid calls", function(assert) {
+		[false, true, 5, "test", {}, jQuery, new Element(), this.oUiArea].forEach(function(vCallParam) {
+			assert.throws(function() {
+				this.oUiArea.suppressInvalidationFor(vCallParam);
+			}, "TypeError is thrown for the parameter: " + vCallParam);
+			assert.throws(function() {
+				this.oUiArea.resumeInvalidationFor(vCallParam);
+			}, "TypeError is thrown for the parameter: " + vCallParam);
+		});
+		assert.throws(function() {
+			this.oUiArea.resumeInvalidationFor(this.oParent);
+		}, "Error is thrown since the invalidation has not yet been suppressed");
+	});
+
+	QUnit.test("Return value of suppressInvalidationFor", function(assert) {
+		assert.strictEqual(this.oUiArea.suppressInvalidationFor(this.oParent), true, "Invalidation is correctly suppressed");
+		assert.strictEqual(this.oUiArea.suppressInvalidationFor(this.oParent), false, "Invalidation was already suppressed");
+	});
+
+	QUnit.test("Invalidate all children", function(assert) {
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oParent.findElements(true, function(oElement) {
+			oElement.invalidate();
+		});
+		this.oParent.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 5);
+	});
+
+	QUnit.test("Invalidate a single leaf control", function(assert) {
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oGrandChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 1);
+	});
+
+	QUnit.test("Suppress invalidation for different roots", function(assert) {
+		var oCloneParent = this.oParent.clone();
+		oCloneParent.placeAt("uiArea1");
+		oCore.applyChanges();
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oUiArea.suppressInvalidationFor(oCloneParent);
+
+		this.oChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		oCloneParent.getItems()[0].invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 2);
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.resumeInvalidationFor(oCloneParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 2);
+		oCloneParent.destroy("uiArea1");
+	});
+
+	QUnit.test("parent rendering", function(assert) {
+		this.oUiArea.suppressInvalidationFor(this.oChild1);
+		this.oGrandChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oParent.invalidate();
+		oCore.applyChanges();
+		this.oRenderingSpy.reset();
+		this.oUiArea.resumeInvalidationFor(this.oChild1);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+	});
+
+	QUnit.test("bookkeeping cleanup", function(assert) {
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oParent.invalidate();
+		this.oGrandChild1.invalidate();
+		this.oUiArea.suppressInvalidationFor(this.oChild1);
+		this.oGrandChild1.invalidate();
+		this.oUiArea.suppressInvalidationFor(this.oGrandChild1);
+		this.oGrandChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.ok(this.oRenderingSpy.called);
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.resumeInvalidationFor(this.oChild1);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oGrandChild1);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+	});
+
+	QUnit.test("nested suppressed controls - the child resumes invalidation before the parent", function(assert) {
+		this.oDeepestChild1 = new TestControl({ header: "DeepestChild1" });
+		this.oGrandChild1.addItem(this.oDeepestChild1);
+		oCore.applyChanges();
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oUiArea.suppressInvalidationFor(this.oGrandChild1);
+		this.oDeepestChild1.invalidate();
+		this.oChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oGrandChild1);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 3);
+	});
+
+	QUnit.test("nested suppressed controls - the parent resumes invalidation before the child", function(assert) {
+		this.oDeepestChild1 = new TestControl({ header: "DeepestChild1" });
+		this.oGrandChild1.addItem(this.oDeepestChild1);
+		oCore.applyChanges();
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.suppressInvalidationFor(this.oParent);
+		this.oUiArea.suppressInvalidationFor(this.oGrandChild1);
+		this.oDeepestChild1.invalidate();
+		this.oChild1.invalidate();
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+
+		this.oUiArea.resumeInvalidationFor(this.oParent);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 3);
+		this.oRenderingSpy.reset();
+
+		this.oUiArea.resumeInvalidationFor(this.oGrandChild1);
+		oCore.applyChanges();
+		assert.equal(this.oRenderingSpy.callCount, 0);
+	});
 });

package/test/sap/ui/core/qunit/analytics/testsuite4analytics.qunit.js

@@ -5,15 +5,16 @@
 
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/qunit/analytics/AnalyticalBinding.qunit",
+	"sap/ui/core/qunit/analytics/odata4analytics.qunit"
+	// AnalyticalTable.qunit requires sinon 4; run testsuite.models.qunit.js instead
+	// "sap/ui/table/qunit/AnalyticalTable.qunit"
+], function (Core) {
 	"use strict";
-
-	sap.ui.require([
-		"sap/ui/core/qunit/analytics/AnalyticalBinding.qunit",
-		"sap/ui/core/qunit/analytics/odata4analytics.qunit"
-		// AnalyticalTable.qunit requires sinon 4; run testsuite.models.qunit.js instead
-		// "sap/ui/table/qunit/AnalyticalTable.qunit"
-	], function () {
+	Core.ready().then(function() {
 		QUnit.start();
 	});
 });
+

package/test/sap/ui/core/qunit/app/MessageListBinding.qunit.js

@@ -1,12 +1,13 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/ClientListBinding",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/message/MessageListBinding"
-], function (Log, UI5Date, Message, ClientListBinding, JSONModel, MessageListBinding) {
+], function (Log, Messaging, UI5Date, Message, ClientListBinding, JSONModel, MessageListBinding) {
 	"use strict";
 
 	QUnit.module("sap.ui.model.message.MessageListBinding", {
@@ -14,7 +15,7 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
-			sap.ui.getCore().getMessageManager().removeAllMessages();
+			Messaging.removeAllMessages();
 		}
 	});
 
@@ -30,13 +31,12 @@ sap.ui.define([
 
 
 	QUnit.test("test MessageListBinding", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oModel = oMessageManager.getMessageModel();
-		oMessageManager.addMessages(createMessage("mine", "rel1"));
-		oMessageManager.addMessages(createMessage("two", "rel2"));
-		oMessageManager.addMessages(createMessage("three", "rel3"));
-		oMessageManager.addMessages(createMessage("for", "rel4"));
-		oMessageManager.addMessages(createMessage("fiv", "rel5"));
+		var oModel = Messaging.getMessageModel();
+		Messaging.addMessages(createMessage("mine", "rel1"));
+		Messaging.addMessages(createMessage("two", "rel2"));
+		Messaging.addMessages(createMessage("three", "rel3"));
+		Messaging.addMessages(createMessage("for", "rel4"));
+		Messaging.addMessages(createMessage("fiv", "rel5"));
 		var oMessageListBinding = oModel.bindList("/");
 		var aContexts = oMessageListBinding.getContexts(1, 3);
 		assert.ok(aContexts);
@@ -47,7 +47,7 @@ sap.ui.define([
 
 	QUnit.test("test MessageListBinding extended change detection", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
+		var oMessageManager = Messaging;
 		oMessageManager.addMessages(createMessage("mine", "rel1"));
 		oMessageManager.addMessages(createMessage("two", "rel2"));
 		oMessageManager.addMessages(createMessage("three", "rel3"));

package/test/sap/ui/core/qunit/base/Config.qunit.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	QUnit.module("Base Configuration");
 
 	QUnit.test("Basic: Check getter on provider level", function(assert) {
-		assert.expect(18);
+		assert.expect(20);
 
 		// sContext is derived via URL parameter to handle provider specific behavior
 		var sContext = BaseConfiguration.get({
@@ -28,7 +28,12 @@ sap.ui.define([
 			external: true
 		});
 
-		[{ duplicateParam: "sap-ui-FooBar", origParam: "sap-ui-fooBar"}, { duplicateParam: "sap-ui-foo-bar", origParam: "sap-ui-fooBar"}, { duplicateParam: "sap-ui-sapUiFooBar", origParam: "sap-ui-sap-ui-fooBar"}].forEach(function (oParams) {
+		[
+			{ duplicateParam: "sap-ui-FooBar", origParam: "sap-ui-fooBar"},
+			{ duplicateParam: "sap-ui-foo-bar", origParam: "sap-ui-fooBar"},
+			{ duplicateParam: "sap-ui-sapUiFooBar", origParam: "sap-ui-sap-ui-fooBar"},
+			{ duplicateParam: "sap-ui-initial-falsy-value", origParam: "sap-ui-initialFalsyValue"}
+		].forEach(function (oParams) {
 			var sDuplicateKey = sContext.startsWith("global") ? oParams.duplicateParam.replace("sap-ui-", "") : oParams.duplicateParam;
 			var sOrigKey = sContext.startsWith("global") ? oParams.origParam.replace("sap-ui-", "") : oParams.origParam;
 			assert.ok(oLogSpy.calledWith("Configuration option '" + sDuplicateKey + "' was already set by '" + sOrigKey + "' and will be ignored!"), "Logged invalid configuration option '" + sDuplicateKey + "'");
@@ -115,5 +120,10 @@ sap.ui.define([
 			external: true
 			// sContext is derived via URL parameter to handle provider specific behavior
 		}), sContext.startsWith("global") ? "" : "value14", "BaseConfiguration.get for param 'sapUshellFooBar' returns correct value 'value14' or '' in global context (sap-ui-prefixed)");
+		assert.strictEqual(BaseConfiguration.get({
+			name: "sapUiInitialFalsyValue",
+			type: BaseConfiguration.Type.Boolean,
+			external: true
+		}), false, "BaseConfiguration.get for param 'sapUiInitialFalsyValue' returns correct value 'false'");
 	});
 });