@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -6,13 +6,15 @@ sap.ui.define([
 	"sap/m/Input",
 	"sap/m/Label",
 	"sap/m/Popover",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIArea",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/layout/HorizontalLayout",
 	"sap/ui/layout/VerticalLayout",
 	"sap/ui/qunit/QUnitUtils",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Button, CheckBox, DatePicker, Input, Label, Popover, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Button, CheckBox, DatePicker, Input, Label, Popover, Element, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	// Prepare a UI
@@ -169,8 +171,6 @@ sap.ui.define([
 		]
 	}).placeAt("content");
 
-	sap.ui.getCore().applyChanges();
-
 	// Attach handler for testing
 	var bPauseEventing = false;
 	oVerticalLayout.attachValidateFieldGroup(function(oEvent) {
@@ -209,7 +209,7 @@ sap.ui.define([
 		sCurrentGroup = sCurrent;
 		sNewGroup = sNew;
 
-		sap.ui.getCore().byId(sFieldId).focus();
+		Element.getElementById(sFieldId).focus();
 		setTimeout(function () {
 			var a = UIArea._oFieldGroupControl.getFieldGroupIds();
 			if (a) {
@@ -229,7 +229,11 @@ sap.ui.define([
 		}, 1);
 	}
 
-	QUnit.test("Input with valueHelp", function(assert) {
+	QUnit.module("FieldGroups", {
+		before: nextUIUpdate
+	});
+
+	QUnit.test("Input with valueHelp", async function(assert) {
 		assert.expect(1);
 		var done = assert.async();
 		var oButton = new Button({text: "Button"});
@@ -250,7 +254,7 @@ sap.ui.define([
 				oPopover.openBy(oEvent.getSource());
 			}
 		}).placeAt('content');
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		qutils.triggerEvent("click", oInput._getValueHelpIcon(), {});
 		oPopover.attachAfterOpen(function() {
 			assert.strictEqual(oButton.getId(), document.activeElement.id, "focus moved to popover and no fieldgroupchange must happen");
@@ -262,7 +266,7 @@ sap.ui.define([
 		assert.expect(1);
 		var done = assert.async();
 		//focus a field and the non focusable content
-		var oControl = sap.ui.getCore().byId("input100");
+		var oControl = Element.getElementById("input100");
 		oControl.focus();
 		oControl.attachValidateFieldGroup(function() {
 			assert.ok(true, "fieldgroup validation fired!");
@@ -342,21 +346,21 @@ sap.ui.define([
 		assert.expect(4);
 		var done = assert.async();
 		sNewGroup = "group4";
-		oEnterControl = sap.ui.getCore().byId("input31");
+		oEnterControl = Element.getElementById("input31");
 		oEnterControl.setFieldGroupIds([sNewGroup]);
 		assert.equal(oEnterControl.getFieldGroupIds().indexOf(sNewGroup), 0, "FieldGroupId changed to group4");
 		sCurrentGroup = [sNewGroup];
-		sap.ui.getCore().byId("input1").focus();
+		Element.getElementById("input1").focus();
 		setTimeout(function() {
 			sNewGroup = "group3";
-			oEnterControl = sap.ui.getCore().byId("input31");
+			oEnterControl = Element.getElementById("input31");
 			oEnterControl.setFieldGroupIds([sNewGroup]);
 			assert.equal(oEnterControl.getFieldGroupIds().indexOf(sNewGroup), 0, "FieldGroupId changed to group3");
 			setTimeout(function() {
 				oEnterControl.focus();
 				sCurrentGroup = ["group3"];
 				setTimeout(function() {
-					sap.ui.getCore().byId("input1").focus();
+					Element.getElementById("input1").focus();
 					setTimeout(function() {
 						done();
 					}, 1);
@@ -421,7 +425,7 @@ sap.ui.define([
 		var oParent = null;
 		var done = assert.async();
 		document.getElementById("input11").focus();
-		oEnterControl = sap.ui.getCore().byId("input21");
+		oEnterControl = Element.getElementById("input21");
 		oParent = oEnterControl.getParent();
 		moveFocus("input21", "group1", "group2", function () {
 			oEnterControl.destroy();

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

@@ -1,8 +1,10 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/core/FocusHandler",
-	"sap/m/Input"
-], function(FocusHandler, Input) {
+	"sap/ui/core/Element",
+	"sap/m/Input",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(FocusHandler, Element, Input, nextUIUpdate) {
 	"use strict";
 
 	// Control initialization
@@ -37,10 +39,10 @@ sap.ui.define([
 		assert.equal(FocusHandler.oLast, null, "Initial Value 'Last':");
 	});
 
-	QUnit.test("Check FocusHandler.getCurrentFocusedControlId", function(assert) {
-		assert.equal(FocusHandler.oCurrent, FocusHandler.getCurrentFocusedControlId(), "Current not available:");
+	QUnit.test("Check internal FocusHandler reference of currently focused control is correct", function(assert) {
+		assert.equal(FocusHandler.oCurrent, Element.getActiveElement()?.getId(), "Current not available:");
 		oControls["oControl1"].focus();
-		assert.equal(FocusHandler.oCurrent, FocusHandler.getCurrentFocusedControlId(), "Current available:");
+		assert.equal(FocusHandler.oCurrent, Element.getActiveElement()?.getId(), "Current available:");
 		document.getElementById("customInput").focus(); //Reset for next test
 	});
 
@@ -134,7 +136,7 @@ sap.ui.define([
 
 	QUnit.module("Extending Focus Info");
 
-	QUnit.test("add/remove extender for focus info", function(assert) {
+	QUnit.test("add/remove extender for focus info", async function(assert) {
 		var oDomRef;
 		var oSpy = this.spy(function(oEvent, oData) {
 			oDomRef = oEvent.getParameter("domRef");
@@ -148,7 +150,7 @@ sap.ui.define([
 		oControls.oControl1.focus();
 
 		oControls.oControl1.invalidate();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oSpy.calledOnce, "focus info extender is called");
 		assert.equal(oDomRef, oControls.oControl1.getDomRef(), "DOM element is given to the registered focus info extender");
@@ -158,7 +160,7 @@ sap.ui.define([
 
 		// trigger the focus info extender again
 		oControls.oControl1.invalidate();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.equal(oSpy.callCount, 2, "focus info extender is called, again");
 		assert.equal(oDomRef, oControls.oControl1.getDomRef(), "DOM element is given to the registered focus info extender");
@@ -170,7 +172,7 @@ sap.ui.define([
 		FocusHandler.removeFocusInfoExtender(oSpy);
 
 		oControls.oControl1.invalidate();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oSpy.notCalled, "Focus info extender isn't called anymore after it's removed");
 	});

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

@@ -12,13 +12,14 @@ sap.ui.define([
 	"sap/ui/layout/HorizontalLayout",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/mvc/JSView",
 	"sap/ui/core/mvc/Controller",
 	"sap/base/util/LoaderExtensions",
 	"sap/ui/thirdparty/jquery"
-], function (Log, qutils, Core, Component, Fragment, Element, XMLTemplateProcessor, Panel, Button, HorizontalLayout, JSONModel, createAndAppendDiv, View, XMLView, JSView, Controller, LoaderExtensions, jQuery) {
+], function (Log, qutils, Core, Component, Fragment, Element, XMLTemplateProcessor, Panel, Button, HorizontalLayout, JSONModel, createAndAppendDiv, nextUIUpdate, View, XMLView, JSView, Controller, LoaderExtensions, jQuery) {
 	"use strict";
 
 	createAndAppendDiv(["content1", "content2", "content3", "content4", "binding"]);
@@ -57,9 +58,9 @@ sap.ui.define([
 		return Fragment.load({
 			fragmentName: "testdata.fragments.XMLTestFragment",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 
@@ -76,7 +77,7 @@ sap.ui.define([
 			assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
 
 			// find controls by ID
-			var btn = Core.byId("btnInXmlFragment");
+			var btn = Element.getElementById("btnInXmlFragment");
 			assert.ok(btn, "Button should be found by ID");
 			assert.ok(btn instanceof Button, "Button should be found by ID");
 		});
@@ -87,9 +88,9 @@ sap.ui.define([
 			id: "myXmlFrag",
 			fragmentName: "testdata.fragments.XMLTestFragment",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 
@@ -117,9 +118,9 @@ sap.ui.define([
 			id: "myXmlFrag1",
 			fragmentName: "testdata.fragments.XMLTestFragmentWithId",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 			assert.equal(id, "myXmlFrag1--layout", "Root control ID should be prefixed");
@@ -136,9 +137,9 @@ sap.ui.define([
 			fragmentName: "testdata.fragments.JSTestFragment",
 			type: "JS",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 
@@ -155,7 +156,7 @@ sap.ui.define([
 			assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
 
 			// find controls by ID
-			var btn = Core.byId("btnInJsFragment");
+			var btn = Element.getElementById("btnInJsFragment");
 			assert.ok(btn, "Button should be found by ID");
 			assert.ok(btn instanceof Button, "Button should be found by ID");
 		});
@@ -167,9 +168,9 @@ sap.ui.define([
 			id: "myJsFrag",
 			type: "JS",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 
@@ -198,9 +199,9 @@ sap.ui.define([
 			id: "myJsFrag1",
 			type: "JS",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 			assert.equal(id, "myJsFrag1--layout", "Root control ID should be prefixed");
@@ -226,9 +227,9 @@ sap.ui.define([
 		return View.create({
 			id: "myView",
 			viewName: "module:my/TypedView"
-		}).then(function (oViewWithFragments) {
+		}).then(async function (oViewWithFragments) {
 			oViewWithFragments.placeAt("content2");
-			Core.applyChanges();
+			await nextUIUpdate();
 			assert.ok(document.getElementById("myView"), "JSView should be rendered");
 
 			// Inline JS Fragment
@@ -255,11 +256,11 @@ sap.ui.define([
 	QUnit.test("XMLView Rendering", function(assert) {
 		return XMLView.create({
 			viewName: "testdata.fragments.XMLViewWithFragments"
-		}).then(function(oResult) {
+		}).then(async function(oResult) {
 			oXmlView = oResult;
 
 			oXmlView.placeAt("content3");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var data = {
 				someText: DATABOUND_TEXT_IN_VIEW
@@ -269,7 +270,7 @@ sap.ui.define([
 			oModel.setData(data);
 			oXmlView.setModel(oModel);
 
-			Core.applyChanges(); // update data binding in DOM
+			await nextUIUpdate(); // update data binding in DOM
 
 			var aContent = oXmlView.getContent();
 			oXmlFragmentInXmlView = aContent[0];
@@ -389,7 +390,7 @@ sap.ui.define([
 			type: "JS",
 			controller: {
 				closeDialog: function() {
-					Element.registry.get("jsDialog").close();
+					Element.getElementById("jsDialog").close();
 				}
 			}
 		});
@@ -399,12 +400,12 @@ sap.ui.define([
 			oDialog.open();
 			assert.ok(document.getElementById("jsDialog"), "Fragment should be rendered now");
 
-			window.setTimeout(function() {
+			window.setTimeout(async function() {
 				assert.ok(oDialog.isOpen(), "Dialog should be open now");
 
 				assert.equal(oDialog.getContent()[0].getText(), DATABOUND_GLOBAL_TEXT_IN_DIALOG, "TextView should have text from global data binding");
 				oDialog.setModel(oDialogModel);
-				Core.applyChanges();
+				await nextUIUpdate();
 				assert.equal(oDialog.getContent()[0].getText(), DATABOUND_TEXT_IN_DIALOG, "TextView should have text from Dialog data binding");
 
 				triggerClickEvent("jsDialogBtn"); // close it
@@ -427,7 +428,7 @@ sap.ui.define([
 			fragmentName: "testdata.fragments.XMLFragmentDialog",
 			controller: {
 				closeDialog: function() {
-					Element.registry.get("xmlDialog").close();
+					Element.getElementById("xmlDialog").close();
 				}
 			}
 		});
@@ -437,12 +438,12 @@ sap.ui.define([
 			oDialog.open();
 			assert.ok(document.getElementById("xmlDialog"), "Fragment should be rendered now");
 
-			window.setTimeout(function() {
+			window.setTimeout(async function() {
 				assert.ok(oDialog.isOpen(), "Dialog should be open now");
 
 				assert.equal(oDialog.getContent()[0].getText(), DATABOUND_GLOBAL_TEXT_IN_DIALOG, "TextView should have text from global data binding");
 				oDialog.setModel(oDialogModel);
-				Core.applyChanges();
+				await nextUIUpdate();
 				assert.equal(oDialog.getContent()[0].getText(), DATABOUND_TEXT_IN_DIALOG, "TextView should have text from Dialog data binding");
 
 				triggerClickEvent("xmlDialogBtn"); // close it
@@ -463,9 +464,9 @@ sap.ui.define([
 		assert.expect(2);
 		return Fragment.load({
 			fragmentName: "testdata.fragments.XMLTestFragmentNoController"
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content4");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 			assert.ok(document.getElementById(id), "Fragment should be rendered");
@@ -483,9 +484,9 @@ sap.ui.define([
 		return Fragment.load({
 			fragmentName: "testdata.fragments.JSTestFragmentNoController",
 			type: "JS"
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content4");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 			assert.ok(document.getElementById(id), "Fragment should be rendered");
@@ -511,13 +512,13 @@ sap.ui.define([
 		return XMLView.create({
 			id: "unnamedView",
 			viewName: "my.UnnamedView"
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("binding");
-			Core.applyChanges();
+			await nextUIUpdate();
 
-			var oLabel = Core.byId("unnamedView--unnamedName");
+			var oLabel = Element.getElementById("unnamedView--unnamedName");
 			assert.ok(oLabel.getText().indexOf("<Named>") == -1, "Binding of unnamed model set for 'name'");
-			oLabel = Core.byId("unnamedView--unnamedPhone");
+			oLabel = Element.getElementById("unnamedView--unnamedPhone");
 			assert.ok(oLabel.getText().indexOf("<Named>") == -1, "Binding of unnamed model set for 'phone'");
 		});
 	});
@@ -526,13 +527,13 @@ sap.ui.define([
 		return XMLView.create({
 			id: "namedView",
 			viewName: "my.View"
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("binding");
-			Core.applyChanges();
+			await nextUIUpdate();
 
-			var oLabel = Core.byId("namedView--namedName");
+			var oLabel = Element.getElementById("namedView--namedName");
 			assert.ok(oLabel.getText().indexOf("<Named>") > -1, "Binding of named model set for 'name'");
-			oLabel = Core.byId("namedView--namedPhone");
+			oLabel = Element.getElementById("namedView--namedPhone");
 			assert.ok(oLabel.getText().indexOf("<Named>") > -1, "Binding of named model set for 'phone'");
 		});
 	});
@@ -560,9 +561,9 @@ sap.ui.define([
 			type: "JS",
 			id: "myJsFragLoadApi",
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 
@@ -594,9 +595,9 @@ sap.ui.define([
 		return Fragment.load({
 			definition: myXml,
 			controller: this.oDummyController
-		}).then(function(oFragment) {
+		}).then(async function(oFragment) {
 			oFragment.placeAt("content1");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			var id = oFragment.getId();
 			assert.ok(document.getElementById(id), "XML Fragment should be rendered");
@@ -848,10 +849,10 @@ sap.ui.define([
 			// In the async case if we encounter an error during XML processing, the processing is stopped (forcefully).
 			// We do not (yet) have a way to clean up any controls which have been created until the exception was raised.
 			/*
-			assert.equal(Core.byId("panel"), null);
-			assert.equal(Core.byId("button1"), null);
-			assert.equal(Core.byId("button2"), null);
-			assert.equal(Core.byId("button3"), null);
+			assert.equal(Element.getElementById("panel"), null);
+			assert.equal(Element.getElementById("button1"), null);
+			assert.equal(Element.getElementById("button2"), null);
+			assert.equal(Element.getElementById("button3"), null);
 			*/
 		});
 	});