@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -1,11 +1,11 @@
 /* global QUnit */
 sap.ui.define([
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Core",
 	"sap/ui/core/DeclarativeSupport",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIArea",
 	"sap/ui/model/json/JSONModel"
-], function(jQuery, oCore, DeclarativeSupport, UIArea, JSONModel) {
+], function(jQuery, DeclarativeSupport, Element, UIArea, JSONModel) {
 	"use strict";
 	QUnit.config.reorder = false;
 	QUnit.module("Basic");
@@ -26,12 +26,12 @@ sap.ui.define([
 	QUnit.test("Simple Button", function(assert) {
 		assert.expect(3);
 
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.equal(!!oButton, false, 'No control with id "simpleButton" found.');
 
 		DeclarativeSupport.compile(jQuery("#simple-button"));
 
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.ok(!!oButton, 'Control with id "simpleButton" found.');
 		assert.equal(oButton.getText(), "My Button", "Text is set right");
 	});
@@ -45,10 +45,10 @@ sap.ui.define([
 			DeclarativeSupport.attributes["data-tooltip"] = function() {
 				assert.ok(true, "Called special attribute handling");
 			};
-			var oButton = oCore.byId("buttonWithTooltip");
+			var oButton = Element.getElementById("buttonWithTooltip");
 			assert.equal(!!oButton, false, 'No control with id "buttonWithTooltip" found.');
 			DeclarativeSupport.compile(jQuery("#button-with-tooltip"));
-			var oButton = oCore.byId("buttonWithTooltip");
+			var oButton = Element.getElementById("buttonWithTooltip");
 			assert.ok(!!oButton, 'Control with id "buttonWithTooltip" found.');
 		} finally {
 			if (backup) {
@@ -61,12 +61,12 @@ sap.ui.define([
 	QUnit.test("Button with style and class", function(assert) {
 		assert.expect(3);
 
-		var oButton = oCore.byId("buttonStyleClass");
+		var oButton = Element.getElementById("buttonStyleClass");
 		assert.equal(!!oButton, false, 'No control with id "buttonStyleClass" found.');
 
 		DeclarativeSupport.compile(jQuery("#button-with-style-class"));
 
-		var oButton = oCore.byId("buttonStyleClass");
+		var oButton = Element.getElementById("buttonStyleClass");
 		assert.ok(!!oButton, 'Control with id "buttonStyleClass" found.');
 		assert.ok(!!oButton.hasStyleClass("mybutton"), 'Control has right classes.');
 	});
@@ -74,15 +74,15 @@ sap.ui.define([
 
 	QUnit.test("HTML Content", function(assert) {
 		assert.expect(7);
-		var oButton = oCore.byId("htmlContentButton");
+		var oButton = Element.getElementById("htmlContentButton");
 		assert.equal(!!oButton, false, 'No control with id "htmlContentButton" found.');
 
 		DeclarativeSupport.compile(jQuery("#html-content"));
 
-		var oButton = oCore.byId("htmlContentButton");
+		var oButton = Element.getElementById("htmlContentButton");
 		assert.ok(!!oButton, 'Control with id "htmlContentButton" found.');
 
-		var oPanel = oCore.byId("htmlContentPanel");
+		var oPanel = Element.getElementById("htmlContentPanel");
 		assert.ok(!!oPanel, 'Control with id "htmlContentPanel" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -93,12 +93,12 @@ sap.ui.define([
 
 	QUnit.test("Panel aggregation", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelAggregation");
+		var oPanel = Element.getElementById("panelAggregation");
 		assert.equal(!!oPanel, false, 'No control with id "panelAggregation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-aggregation"));
 
-		var oPanel = oCore.byId("panelAggregation");
+		var oPanel = Element.getElementById("panelAggregation");
 		assert.ok(!!oPanel, 'Control with id "panelAggregation" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -109,12 +109,12 @@ sap.ui.define([
 
 	QUnit.test("Panel with default aggregation", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelWithDefaultAggregation");
+		var oPanel = Element.getElementById("panelWithDefaultAggregation");
 		assert.equal(!!oPanel, false, 'No control with id "panelWithDefaultAggregation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-with-default-aggregation"));
 
-		var oPanel = oCore.byId("panelWithDefaultAggregation");
+		var oPanel = Element.getElementById("panelWithDefaultAggregation");
 		assert.ok(!!oPanel, 'Control with id "panelWithDefaultAggregation" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -124,12 +124,12 @@ sap.ui.define([
 
 	QUnit.test("Panel with association", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelWithAssociation");
+		var oPanel = Element.getElementById("panelWithAssociation");
 		assert.equal(!!oPanel, false, 'No control with id "panelWithAssociation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-with-association"));
 
-		var oPanel = oCore.byId("panelWithAssociation");
+		var oPanel = Element.getElementById("panelWithAssociation");
 		assert.ok(!!oPanel, 'Control with id "panelWithAssociation" found.');
 
 		assert.equal(oPanel.getContent().length, 3, "Number of child controls is right");
@@ -147,10 +147,10 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("uiAreaSimple");
 		assert.equal(!!oUIArea, false, 'No control with id "uiAreaSimple" found.');
 
-		var oButton1 = oCore.byId("uiAreaSimpleButton2");
+		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
 		assert.equal(!!oButton1, false, 'No control with id "uiAreaSimpleButton2" found.');
 
-		var oButton2 = oCore.byId("uiAreaSimpleButton2");
+		var oButton2 = Element.getElementById("uiAreaSimpleButton2");
 		assert.equal(!!oButton2, false, 'No control with id "uiAreaSimpleButton2" found.');
 
 		DeclarativeSupport.compile(jQuery("#ui-area-simple"));
@@ -158,10 +158,10 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("uiAreaSimple");
 		assert.ok(!!oUIArea, 'UIArea with id "uiAreaSimple" found.');
 
-		var oButton1 = oCore.byId("uiAreaSimpleButton2");
+		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
 		assert.ok(!!oButton1, 'Control with id "uiAreaSimpleButton2" found.');
 
-		var oButton2 = oCore.byId("uiAreaSimpleButton2");
+		var oButton2 = Element.getElementById("uiAreaSimpleButton2");
 		assert.ok(!!oButton2, 'Control with id "uiAreaSimpleButton2" found.');
 
 		assert.equal(oButton2.getUIArea().getId(), "uiAreaSimple", "UI Areas are the same");
@@ -173,13 +173,13 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
 		assert.equal(!!oUIArea, false, 'No UIArea with id "complexDeclarationUIArea" found.');
 
-		var oPanel1 = oCore.byId("complexDeclarationPanel1");
+		var oPanel1 = Element.getElementById("complexDeclarationPanel1");
 		assert.equal(!!oPanel1, false, 'No control with id "complexDeclarationPanel1" found.');
 
-		var oPanel2 = oCore.byId("complexDeclarationPanel2");
+		var oPanel2 = Element.getElementById("complexDeclarationPanel2");
 		assert.equal(!!oPanel2, false, 'No control with id "complexDeclarationPanel2" found.');
 
-		var oPanel3 = oCore.byId("complexDeclarationPanel3");
+		var oPanel3 = Element.getElementById("complexDeclarationPanel3");
 		assert.equal(!!oPanel2, false, 'No control with id "complexDeclarationPanel3" found.');
 
 		window.handlePress = function(evt) {
@@ -191,13 +191,13 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
 		assert.ok(!!oUIArea, 'UIArea with id "complexDeclarationUIArea" found.');
 
-		var oPanel1 = oCore.byId("complexDeclarationPanel1");
+		var oPanel1 = Element.getElementById("complexDeclarationPanel1");
 		assert.ok(!!oPanel1, 'Control with id "complexDeclarationPanel1" found.');
 
-		var oPanel2 = oCore.byId("complexDeclarationPanel2");
+		var oPanel2 = Element.getElementById("complexDeclarationPanel2");
 		assert.ok(!!oPanel2, 'Control with id "complexDeclarationPanel2" found.');
 
-		var oPanel3 = oCore.byId("complexDeclarationPanel3");
+		var oPanel3 = Element.getElementById("complexDeclarationPanel3");
 		assert.ok(!!oPanel3, 'Control with id "complexDeclarationPanel3" found.');
 
 		delete window.handlePress;
@@ -205,7 +205,7 @@ sap.ui.define([
 
 	QUnit.test("Events", function(assert) {
 		assert.expect(3);
-		var oButton1 = oCore.byId("buttonWithEvent");
+		var oButton1 = Element.getElementById("buttonWithEvent");
 		assert.equal(!!oButton1, false, 'No control with id "buttonWithEvent" found.');
 
 		window.handlePress = function(evt) {
@@ -214,7 +214,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#events"));
 
-		var oButton1 = oCore.byId("buttonWithEvent");
+		var oButton1 = Element.getElementById("buttonWithEvent");
 		assert.ok(!!oButton1, 'Control with id "buttonWithEvent" found.');
 		oButton1.firePress();
 
@@ -224,12 +224,12 @@ sap.ui.define([
 
 	QUnit.test("AltType", function(assert) {
 		assert.expect(3);
-		var oForm = oCore.byId("form");
+		var oForm = Element.getElementById("form");
 		assert.equal(!!oForm, false, 'No control with id "form" found.');
 
 		DeclarativeSupport.compile(jQuery("#altType"));
 
-		var oForm = oCore.byId("form");
+		var oForm = Element.getElementById("form");
 		assert.ok(!!oForm, 'Control with id "form" found.');
 
 		assert.equal(oForm.getTitle(), "Alt type works", "Title is set right");
@@ -265,10 +265,10 @@ sap.ui.define([
 
 	QUnit.test("DataBinding", function(assert) {
 		assert.expect(8);
-		var oButton1 = oCore.byId("buttonDataBinding");
+		var oButton1 = Element.getElementById("buttonDataBinding");
 		assert.equal(!!oButton1, false, 'No control with id "buttonDataBinding" found.');
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 		assert.equal(!!oCarousel, false, 'No control with id "aggregationDataBinding" found.');
 
 		var oModel1 = new JSONModel({
@@ -288,7 +288,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#databinding"));
 
-		var oButton1 = oCore.byId("buttonDataBinding");
+		var oButton1 = Element.getElementById("buttonDataBinding");
 		assert.ok(!!oButton1, 'Control with id "buttonWithEvent" found.');
 
 		oButton1.setModel(oModel1);
@@ -297,9 +297,9 @@ sap.ui.define([
 		assert.equal(oButton1.getText(), oModel1.getData().stringValue, "Check 'text' property of button 'buttonDataBinding'");
 
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 		assert.ok(!!oCarousel, 'Control with id "aggregationDataBinding" found.');
 
 
@@ -320,7 +320,7 @@ sap.ui.define([
 
 	QUnit.test("Custom Data", function(assert) {
 		assert.expect(2);
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.equal(oButton.data("customData1"), "customvalue", 'Custom Data not applied!');
 		assert.equal(oButton.data("CustomData2"), "customvalue", 'Custom Data not applied!');
 	});

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

@@ -29,7 +29,7 @@ sap.ui.define([
 		assert.ok(Element.hasOwnProperty("registry"), "Element has static method to access registry");
 		assert.equal(Element.registry.size, 3, "Return number of registered element instances");
 		assert.deepEqual(Object.keys(Element.registry.all()).sort(), ["A", "B", "C"], "Return all registered element instances");
-		assert.ok(Element.registry.get("B") === oFooB, "Return reference of element B from registry by ID");
+		assert.ok(Element.getElementById("B") === oFooB, "Return reference of element B from registry by ID");
 
 		Element.registry.forEach(fnCallbackSpy);
 		assert.ok(fnCallbackSpy.calledThrice, "Callback was executed 3 times");

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

@@ -1,10 +1,11 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/base/EventProvider"
-], function(EventProvider) {
+	"sap/ui/base/EventProvider",
+	"sap/ui/core/EventBus"
+], function(EventProvider, EventBus) {
 	"use strict";
 
-	var oBus = sap.ui.getCore().getEventBus();
+	var oBus = EventBus.getInstance();
 
 	function checkNumberOfListeners(assert, oEventProvider, sEventId, iExpected) {
 		if (oEventProvider) {

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

@@ -1,10 +1,11 @@
 /*global QUnit */
 sap.ui.define([
+	"sap/ui/core/EventBus",
 	"sap/ui/events/F6Navigation",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/qunit/QUnitUtils",
 	"../resources/fastnav"
-], function(F6Navigation, KeyCodes, qutils, fastnav) {
+], function(EventBus, F6Navigation, KeyCodes, qutils, fastnav) {
 	"use strict";
 
 	// Enhance the Navigation Handler to use the test scope only (not the QUnit related DOM) and the target of the event instead of the activeElement
@@ -32,7 +33,7 @@ sap.ui.define([
 
 
 
-	sap.ui.getCore().getEventBus().subscribe("fastnav", "screenready", function() {
+	EventBus.getInstance().subscribe("fastnav", "screenready", function() {
 		// exports of 'fastnav'
 		var oPopup1 = window.oPopup1;
 		var oPopup2 = window.oPopup2;

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

@@ -6,6 +6,7 @@ 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",
@@ -13,7 +14,7 @@ sap.ui.define([
 	"sap/ui/qunit/QUnitUtils",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Button, CheckBox, DatePicker, Input, Label, Popover, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv, nextUIUpdate) {
+], function(Button, CheckBox, DatePicker, Input, Label, Popover, Element, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	// Prepare a UI
@@ -208,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) {
@@ -265,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!");
@@ -345,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);
@@ -424,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,9 +1,10 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/core/FocusHandler",
+	"sap/ui/core/Element",
 	"sap/m/Input",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(FocusHandler, Input, nextUIUpdate) {
+], function(FocusHandler, Element, Input, nextUIUpdate) {
 	"use strict";
 
 	// Control initialization
@@ -38,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
 	});
 

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

@@ -77,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");
 		});
@@ -156,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");
 		});
@@ -390,7 +390,7 @@ sap.ui.define([
 			type: "JS",
 			controller: {
 				closeDialog: function() {
-					Element.registry.get("jsDialog").close();
+					Element.getElementById("jsDialog").close();
 				}
 			}
 		});
@@ -428,7 +428,7 @@ sap.ui.define([
 			fragmentName: "testdata.fragments.XMLFragmentDialog",
 			controller: {
 				closeDialog: function() {
-					Element.registry.get("xmlDialog").close();
+					Element.getElementById("xmlDialog").close();
 				}
 			}
 		});
@@ -516,9 +516,9 @@ sap.ui.define([
 			oView.placeAt("binding");
 			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'");
 		});
 	});
@@ -531,9 +531,9 @@ sap.ui.define([
 			oView.placeAt("binding");
 			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'");
 		});
 	});
@@ -849,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);
 			*/
 		});
 	});

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

@@ -11,13 +11,14 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/mvc/Controller",
 	"sap/base/util/LoaderExtensions",
 	"sap/ui/thirdparty/jquery",
 	"testdata/fragments_legacyAPIs/TypedView"
-], function (Log, qutils, Component, Fragment, XMLTemplateProcessor, Panel, Button, HorizontalLayout, JSONModel, createAndAppendDiv, nextUIUpdate, View, XMLView, Controller, LoaderExtensions, jQuery, TypedView) {
+], function (Log, qutils, Component, Fragment, XMLTemplateProcessor, Panel, Button, HorizontalLayout, JSONModel, createAndAppendDiv, nextUIUpdate, Element, View, XMLView, Controller, LoaderExtensions, jQuery, TypedView) {
 	"use strict";
 
 	createAndAppendDiv(["content1", "content2", "content3", "content4", "binding"]);
@@ -126,7 +127,7 @@ sap.ui.define([
 		assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
 
 		// find controls by ID
-		var btn = sap.ui.getCore().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");
 	});
@@ -194,7 +195,7 @@ sap.ui.define([
 		assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
 
 		// find controls by ID
-		var btn = sap.ui.getCore().byId("btnInHtmlFragment");
+		var btn = Element.getElementById("btnInHtmlFragment");
 		assert.ok(btn, "Button should be found by ID");
 		assert.ok(btn instanceof Button, "Button should be found by ID");
 	});
@@ -267,7 +268,7 @@ sap.ui.define([
 		assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
 
 		// find controls by ID
-		var btn = sap.ui.getCore().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");
 	});
@@ -804,9 +805,9 @@ sap.ui.define([
 		sap.ui.xmlview("unnamedView", "my.UnnamedView").placeAt("binding");
 		await nextUIUpdate();
 
-		var oLabel = sap.ui.getCore().byId("unnamedView--unnamedName");
+		var oLabel = Element.getElementById("unnamedView--unnamedName");
 		assert.ok(oLabel.getText().indexOf("<Named>") == -1, "Binding of unnamed model set for 'name'");
-		oLabel = sap.ui.getCore().byId("unnamedView--unnamedPhone");
+		oLabel = Element.getElementById("unnamedView--unnamedPhone");
 		assert.ok(oLabel.getText().indexOf("<Named>") == -1, "Binding of unnamed model set for 'phone'");
 
 	});
@@ -815,9 +816,9 @@ sap.ui.define([
 		sap.ui.xmlview("namedView", "my.View").placeAt("binding");
 		await nextUIUpdate();
 
-		var oLabel = sap.ui.getCore().byId("namedView--namedName");
+		var oLabel = Element.getElementById("namedView--namedName");
 		assert.ok(oLabel.getText().indexOf("<Named>") > -1, "Binding of named model set for 'name'");
-		oLabel = sap.ui.getCore().byId("namedView--namedPhone");
+		oLabel = Element.getElementById("namedView--namedPhone");
 		assert.ok(oLabel.getText().indexOf("<Named>") > -1, "Binding of named model set for 'phone'");
 	});
 
@@ -1192,10 +1193,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(sap.ui.getCore().byId("panel"), null);
-			assert.equal(sap.ui.getCore().byId("button1"), null);
-			assert.equal(sap.ui.getCore().byId("button2"), null);
-			assert.equal(sap.ui.getCore().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);
 			*/
 		});
 	});