@openui5/sap.ui.core 1.118.0 → 1.119.0

package/test/sap/ui/core/qunit/component/Component_dependencyLoading.qunit.js

@@ -30,9 +30,10 @@ sap.ui.define([
 				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
-			assert.ok(this.oLoadLibrarySpy.calledTwice, "Library._load() called twice");
+			assert.strictEqual(this.oLoadLibrarySpy.callCount, 3, "Library._load() called 3 times");
 			assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly("sap.m", { sync: false }), "First Library._load() call with arguments: 'sap.m', { sync: false }");
 			assert.ok(this.oLoadLibrarySpy.getCall(1).calledWithExactly("sap.tnt", { sync: false }), "Second Library._load() call with arguments: 'sap.tnt', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.core", { sync: false }), "Third Library._load() call with arguments: 'sap.ui.core', { sync: false }");
 
 			// Cleanup
 			oComponent.destroy();
@@ -49,11 +50,12 @@ sap.ui.define([
 				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1 with variant manifest) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
-			assert.equal(this.oLoadLibrarySpy.callCount, 3, "Library._load() called 3 times");
-			assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly(["sap.m", "sap.ui.table"], { sync: false }), "First Library._load() call with arguments: '['sap.m', 'sap.ui.table'], { sync: false }'==> preload dependencies");
+			assert.strictEqual(this.oLoadLibrarySpy.callCount, 4, "Library._load() called 4 times");
+			assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly(["sap.m", "sap.ui.core", "sap.ui.table"], { sync: false }), "First Library._load() call with arguments: '['sap.m', 'sap.ui.core', 'sap.ui.table'], { sync: false }'==> preload dependencies");
 
 			assert.ok(this.oLoadLibrarySpy.getCall(1).calledWithExactly("sap.m", { sync: false }), "Second Library._load() call with arguments: 'sap.m', { sync: false }");
-			assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.table", { sync: false }), "Third Library._load() call with arguments: 'sap.ui.table', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.core", { sync: false }), "Third Library._load() call with arguments: 'sap.ui.core', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(3).calledWithExactly("sap.ui.table", { sync: false }), "Fourth Library._load() call with arguments: 'sap.ui.table', { sync: false }");
 
 			var aScriptDomElements = document.querySelectorAll("script[data-sap-ui-module$='inheritedScript.js']");
 			assert.strictEqual(aScriptDomElements.length, 1, "One script with expected criteria found in DOM");
@@ -77,13 +79,17 @@ sap.ui.define([
 				"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, sap.ui.test.dependencyLoading.component1, sap.ui.test.dependencyLoading.component3 and sap.ui.test.dependencyLoading.component4) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
-			assert.ok(this.oLoadLibrarySpy.callCount, 6, "Library._load() called six times");
+			assert.strictEqual(this.oLoadLibrarySpy.callCount, 9, "Library._load() called nine times");
 			assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly("sap.m", { sync: false }), "First Library._load() call with arguments: 'sap.m', { sync: false }");
 			assert.ok(this.oLoadLibrarySpy.getCall(1).calledWithExactly("sap.tnt", { sync: false }), "Second Library._load() call with arguments: 'sap.tnt', { sync: false }");
-			assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.m", { sync: false }), "Third Library._load() call with arguments: 'sap.m', { sync: false }");
-			assert.ok(this.oLoadLibrarySpy.getCall(3).calledWithExactly("sap.ui.layout", { sync: false }), "Fourth Library._load() call with arguments: 'sap.ui.layout', { sync: false }");
-			assert.ok(this.oLoadLibrarySpy.getCall(4).calledWithExactly("sap.m", { sync: false }), "Fifth Library._load() call with arguments: 'sap.m', { sync: false }");
-			assert.ok(this.oLoadLibrarySpy.getCall(5).calledWithExactly("sap.ui.table", { sync: false }), "Sixth Library._load() call with arguments: 'sap.ui.table', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.core", { sync: false }), "Third Library._load() call with arguments: 'sap.ui.core', { sync: false }");
+
+			assert.ok(this.oLoadLibrarySpy.getCall(3).calledWithExactly("sap.m", { sync: false }), "Fourth Library._load() call with arguments: 'sap.m', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(4).calledWithExactly("sap.ui.core", { sync: false }), "Fifth Library._load() call with arguments: 'sap.ui.core', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(5).calledWithExactly("sap.ui.layout", { sync: false }), "Sixth Library._load() call with arguments: 'sap.ui.layout', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(6).calledWithExactly("sap.m", { sync: false }), "Seventh Library._load() call with arguments: 'sap.m', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(7).calledWithExactly("sap.ui.core", { sync: false }), "Eighth Library._load() call with arguments: 'sap.ui.core', { sync: false }");
+			assert.ok(this.oLoadLibrarySpy.getCall(8).calledWithExactly("sap.ui.table", { sync: false }), "Ninth Library._load() call with arguments: 'sap.ui.table', { sync: false }");
 
 			var aScriptDomElements = document.querySelectorAll("script[data-sap-ui-module$='extendedScript.js']");
 			assert.strictEqual(aScriptDomElements.length, 3, "Three scripts with expected criteria found in DOM");

package/test/sap/ui/core/qunit/component/Component_dependencyLoading_unavoidablySync.qunit.js

@@ -31,9 +31,10 @@ sap.ui.define([
 			"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1) without parameter");
 
 		// Check for the expected libraries to be loaded
-		assert.ok(this.oLoadLibrarySpy.calledTwice, "Library._load() called twice");
+		assert.strictEqual(this.oLoadLibrarySpy.callCount, 3, "Library._load() called 3 times");
 		assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly("sap.m", { sync: true }), "First Library._load() call with arguments: 'sap.m', { sync: true }");
 		assert.ok(this.oLoadLibrarySpy.getCall(1).calledWithExactly("sap.tnt", { sync: true }), "Second Library._load() call with arguments: 'sap.tnt', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.core", { sync: true }), "Third Library._load() call with arguments: 'sap.ui.core', { sync: true }");
 
 		// Cleanup
 		oComponent.destroy();
@@ -50,13 +51,16 @@ sap.ui.define([
 		assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.callCount, 5,
 			"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, sap.ui.test.dependencyLoading.component1, sap.ui.test.dependencyLoading.component3 and sap.ui.test.dependencyLoading.component4) without parameter");
 
-		assert.ok(this.oLoadLibrarySpy.callCount, 6, "Library._load() called six times");
+		assert.strictEqual(this.oLoadLibrarySpy.callCount, 9, "Library._load() called nine times");
 		assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly("sap.m", { sync: true }), "First Library._load() call with arguments: 'sap.m', { sync: true }");
 		assert.ok(this.oLoadLibrarySpy.getCall(1).calledWithExactly("sap.tnt", { sync: true }), "Second Library._load() call with arguments: 'sap.tnt', { sync: true }");
-		assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.m", { sync: true }), "Third Library._load() call with arguments: 'sap.m', { sync: true }");
-		assert.ok(this.oLoadLibrarySpy.getCall(3).calledWithExactly("sap.ui.layout", { sync: true }), "Fourth Library._load() call with arguments: 'sap.ui.layout', { sync: true }");
-		assert.ok(this.oLoadLibrarySpy.getCall(4).calledWithExactly("sap.m", { sync: true }), "Fifth Library._load() call with arguments: 'sap.m', { sync: true }");
-		assert.ok(this.oLoadLibrarySpy.getCall(5).calledWithExactly("sap.ui.table", { sync: true }), "Sixth Library._load() call with arguments: 'sap.ui.table', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(2).calledWithExactly("sap.ui.core", { sync: true }), "Third Library._load() call with arguments: 'sap.ui.layout', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(3).calledWithExactly("sap.m", { sync: true }), "Fourth Library._load() call with arguments: 'sap.m', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(4).calledWithExactly("sap.ui.core", { sync: true }), "Fifth Library._load() call with arguments: 'sap.ui.core', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(5).calledWithExactly("sap.ui.layout", { sync: true }), "Sixth Library._load() call with arguments: 'sap.ui.layout', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(6).calledWithExactly("sap.m", { sync: true }), "Seventh Library._load() call with arguments: 'sap.m', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(7).calledWithExactly("sap.ui.core", { sync: true }), "Eighth Library._load() call with arguments: 'sap.ui.core', { sync: true }");
+		assert.ok(this.oLoadLibrarySpy.getCall(8).calledWithExactly("sap.ui.table", { sync: true }), "Ninth Library._load() call with arguments: 'sap.ui.table', { sync: true }");
 
 		var aScriptDomElements = document.querySelectorAll("script[data-sap-ui-module$='extendedSyncScript.js']");
 		assert.strictEqual(aScriptDomElements.length, 0, "No scripts with expected criteria found in DOM because of requireSync");

package/test/sap/ui/core/qunit/component/Customizing.qunit.js

@@ -2,11 +2,12 @@ sap.ui.define([
 	"sap/ui/base/Event",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Event, Component, ComponentContainer, Controller, View, createAndAppendDiv, nextUIUpdate) {
+], function(Event, Component, ComponentContainer, Element, Controller, View, createAndAppendDiv, nextUIUpdate) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -32,7 +33,7 @@ sap.ui.define([
 	var oLifecycleSpy = this.oLifecycleSpy = sinon.spy();
 
 	function triggerButtonPress(sButtonId) {
-		var oButton = sap.ui.getCore().byId(sButtonId);
+		var oButton = Element.getElementById(sButtonId);
 		var oEvent = new Event(sButtonId, oButton, {});
 		oButton.firePress(oEvent);
 	}
@@ -96,7 +97,7 @@ sap.ui.define([
 	// Controller Replacement
 
 	QUnit.test("Controller Replacement", function(assert) {
-		assert.equal(sap.ui.getCore().byId("theComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customer.Main", "The controller has been replaced");
+		assert.equal(Element.getElementById("theComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customer.Main", "The controller has been replaced");
 	});
 
 	// Controller Extension
@@ -125,7 +126,7 @@ sap.ui.define([
 		assert.strictEqual(iCustomSub2ControllerCalled, 1, "Custom Controller should not have been called again");
 
 		// check members
-		var oController = sap.ui.getCore().byId("theComponent---mainView--sub2View").getController();
+		var oController = Element.getElementById("theComponent---mainView--sub2View").getController();
 		assert.ok(oController, "Extended Sub2 View should have a Controller");
 		assert.ok(oController.originalSAPAction, "Extended Sub2 controller should have an originalSAPAction method");
 		assert.ok(oController.extension.testdata.customizing.customer.Sub2ControllerExtension.customerAction, "Extended Sub2 controller should have a customerAction method");
@@ -177,11 +178,11 @@ sap.ui.define([
 	// View/Property Modifications
 
 	QUnit.test("Property Modifications", function(assert) {
-		var oControl = sap.ui.getCore().byId("theComponent---mainView--sub3View--customizableText");
+		var oControl = Element.getElementById("theComponent---mainView--sub3View--customizableText");
 		assert.strictEqual(oControl.getVisible(), false, "'visible' property should be customizable");
 		assert.strictEqual(oControl.getWrapping(), true, "'wrapping' property should not be customizable");
 
-		oControl = sap.ui.getCore().byId("theComponent---mainView--sub2View--btnToHide");
+		oControl = Element.getElementById("theComponent---mainView--sub2View--btnToHide");
 		assert.strictEqual(oControl.getVisible(), false, "'visible' property should be customizable");
 	});
 
@@ -189,7 +190,7 @@ sap.ui.define([
 	// ExtensionPoint default content
 
 	QUnit.test("ExtensionPoint default content", function(assert) {
-		var oFirstItem = sap.ui.getCore().byId("__item0-theComponent---mainView--sub2View--lb-0");
+		var oFirstItem = Element.getElementById("__item0-theComponent---mainView--sub2View--lb-0");
 
 		assert.ok(oFirstItem, "First ListItem should exist");
 		assert.equal(oFirstItem.getText(), "(Customer's replacement ListItem)", "First ListItem should be the customized one");

package/test/sap/ui/core/qunit/component/Customizing_disabled.qunit.js

@@ -2,10 +2,11 @@ sap.ui.define([
 	"sap/ui/base/Event",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Event, Component, ComponentContainer, Controller, createAndAppendDiv, nextUIUpdate) {
+], function(Event, Component, ComponentContainer, Element, Controller, createAndAppendDiv, nextUIUpdate) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -29,7 +30,7 @@ sap.ui.define([
 	var oLifecycleSpy = this.oLifecycleSpy = sinon.spy();
 
 	function triggerButtonPress(sButtonId) {
-		var oButton = sap.ui.getCore().byId(sButtonId);
+		var oButton = Element.getElementById(sButtonId);
 		var oEvent = new Event(sButtonId, oButton, {});
 		oButton.firePress(oEvent);
 	}
@@ -97,7 +98,7 @@ sap.ui.define([
 		assert.strictEqual(iCustomSub2ControllerCalled, 0, "Custom Controller should still not have been called");
 
 		// check members
-		var oController = sap.ui.getCore().byId("theComponent---mainView--sub2View").getController();
+		var oController = Element.getElementById("theComponent---mainView--sub2View").getController();
 		assert.ok(oController, "Extended Sub2 View should have a Controller");
 		assert.ok(oController.originalSAPAction, "Extended Sub2 controller should have an originalSAPAction method");
 		assert.ok(!oController.customerAction, "Extended Sub2 controller should have no customerAction method");
@@ -134,7 +135,7 @@ sap.ui.define([
 	// View/Property Modifications
 
 	QUnit.test("Property Modifications", function(assert) {
-		var oControl = sap.ui.getCore().byId("theComponent---mainView--sub3View--customizableText");
+		var oControl = Element.getElementById("theComponent---mainView--sub3View--customizableText");
 		assert.strictEqual(oControl.getVisible(), true, "'visible' property should not be customized");
 		assert.strictEqual(oControl.getWrapping(), true, "'wrapping' property should not be customized");
 	});
@@ -143,7 +144,7 @@ sap.ui.define([
 	// ExtensionPoint default content
 
 	QUnit.test("ExtensionPoint default content", function(assert) {
-		var oFirstItem = sap.ui.getCore().byId("__item0-theComponent---mainView--sub2View--lb-0");
+		var oFirstItem = Element.getElementById("__item0-theComponent---mainView--sub2View--lb-0");
 
 		assert.ok(oFirstItem, "First ListItem should exist");
 		assert.equal(oFirstItem.getAdditionalText(), "(Original SAP ListItem)", "First ListItem should be the default one");

package/test/sap/ui/core/qunit/component/Customizing_legacyAPIs.qunit.js

@@ -2,13 +2,14 @@ sap.ui.define([
 	"sap/ui/base/Event",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	'sap/ui/core/XMLTemplateProcessor',
 	'sap/ui/core/mvc/XMLProcessingMode'
-], function (Event, Component, ComponentContainer, Controller, View, createAndAppendDiv, nextUIUpdate, XMLTemplateProcessor, XMLProcessingMode) {
+], function (Event, Component, ComponentContainer, Element, Controller, View, createAndAppendDiv, nextUIUpdate, XMLTemplateProcessor, XMLProcessingMode) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -34,7 +35,7 @@ sap.ui.define([
 	var oLifecycleSpy = this.oLifecycleSpy = sinon.spy();
 
 	function triggerButtonPress(sButtonId) {
-		var oButton = sap.ui.getCore().byId(sButtonId);
+		var oButton = Element.getElementById(sButtonId);
 		var oEvent = new Event(sButtonId, oButton, {});
 		oButton.firePress(oEvent);
 	}
@@ -98,7 +99,7 @@ sap.ui.define([
 	// Controller Replacement
 
 	QUnit.test("Controller Replacement", function(assert) {
-		assert.equal(sap.ui.getCore().byId("theComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customer.Main", "The controller has been replaced");
+		assert.equal(Element.getElementById("theComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customer.Main", "The controller has been replaced");
 	});
 
 	// Controller Extension
@@ -127,7 +128,7 @@ sap.ui.define([
 		assert.strictEqual(iCustomSub2ControllerCalled, 1, "Custom Controller should not have been called again");
 
 		// check members
-		var oController = sap.ui.getCore().byId("theComponent---mainView--sub2View").getController();
+		var oController = Element.getElementById("theComponent---mainView--sub2View").getController();
 		assert.ok(oController, "Extended Sub2 View should have a Controller");
 		assert.ok(oController.originalSAPAction, "Extended Sub2 controller should have an originalSAPAction method");
 		assert.ok(oController.extension.testdata.customizing.customer.Sub2ControllerExtension.customerAction, "Extended Sub2 controller should have a customerAction method");
@@ -202,11 +203,11 @@ sap.ui.define([
 	// View/Property Modifications
 
 	QUnit.test("Property Modifications", function(assert) {
-		var oControl = sap.ui.getCore().byId("theComponent---mainView--sub3View--customizableText");
+		var oControl = Element.getElementById("theComponent---mainView--sub3View--customizableText");
 		assert.strictEqual(oControl.getVisible(), false, "'visible' property should be customizable");
 		assert.strictEqual(oControl.getWrapping(), true, "'wrapping' property should not be customizable");
 
-		oControl = sap.ui.getCore().byId("theComponent---mainView--sub2View--btnToHide");
+		oControl = Element.getElementById("theComponent---mainView--sub2View--btnToHide");
 		assert.strictEqual(oControl.getVisible(), false, "'visible' property should be customizable");
 	});
 
@@ -214,7 +215,7 @@ sap.ui.define([
 	// ExtensionPoint default content
 
 	QUnit.test("ExtensionPoint default content", function(assert) {
-		var oFirstItem = sap.ui.getCore().byId("__item0-theComponent---mainView--sub2View--lb-0");
+		var oFirstItem = Element.getElementById("__item0-theComponent---mainView--sub2View--lb-0");
 
 		assert.ok(oFirstItem, "First ListItem should exist");
 		assert.equal(oFirstItem.getText(), "(Customer's replacement ListItem)", "First ListItem should be the customized one");

package/test/sap/ui/core/qunit/component/Customizing_multi.qunit.js

@@ -2,11 +2,12 @@ sap.ui.define([
 	"sap/ui/base/Event",
 	'sap/ui/core/Component',
 	'sap/ui/core/ComponentContainer',
+	"sap/ui/core/Element",
 	'sap/ui/core/mvc/XMLView',
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	'sap/ui/qunit/QUnitUtils'
-], function(Event, Component, ComponentContainer, XMLView, createAndAppendDiv, nextUIUpdate, qutils) {
+], function(Event, Component, ComponentContainer, Element, XMLView, createAndAppendDiv, nextUIUpdate, qutils) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -30,7 +31,7 @@ sap.ui.define([
 	var oLifecycleSpy = this.oLifecycleSpy = sinon.spy();
 
 	function triggerButtonPress(sButtonId) {
-		var oButton = sap.ui.getCore().byId(sButtonId);
+		var oButton = Element.getElementById(sButtonId);
 		var oEvent = new Event(sButtonId, oButton, {});
 		oButton.firePress(oEvent);
 	}
@@ -108,7 +109,7 @@ sap.ui.define([
 	// Controller Replacement
 
 	QUnit.test("Controller Replacement", function(assert) {
-		assert.equal(sap.ui.getCore().byId("customerComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customersub.Main", "The controller has been replaced");
+		assert.equal(Element.getElementById("customerComponent---mainView").getController().getMetadata().getName(), "testdata.customizing.customersub.Main", "The controller has been replaced");
 	});
 
 	// Controller Extension
@@ -137,7 +138,7 @@ sap.ui.define([
 		assert.strictEqual(iCustomSub2ControllerCalled, 1, "Custom Controller should not have been called again");
 
 		// check members
-		var oController = sap.ui.getCore().byId("customerComponent---mainView--sub2View").getController();
+		var oController = Element.getElementById("customerComponent---mainView--sub2View").getController();
 		assert.ok(oController, "Extended Sub2 View should have a Controller");
 		assert.ok(oController.originalSAPAction, "Extended Sub2Sub controller should have an originalSAPAction method");
 		assert.ok(oController.extension.testdata.customizing.customersub.Sub2SubControllerExtension.customerAction, "Extended Sub2Sub controller should have a customerAction method");
@@ -180,7 +181,7 @@ sap.ui.define([
 	// View/Property Modifications
 
 	QUnit.test("Property Modifications", function(assert) {
-		var oControl = sap.ui.getCore().byId("customerComponent---mainView--sub3View--customizableText");
+		var oControl = Element.getElementById("customerComponent---mainView--sub3View--customizableText");
 		assert.strictEqual(oControl.getVisible(), false, "'visible' property should be customizable");
 		assert.strictEqual(oControl.getWrapping(), true, "'wrapping' property should not be customizable");
 	});
@@ -189,7 +190,7 @@ sap.ui.define([
 	// ExtensionPoint default content
 
 	QUnit.test("ExtensionPoint default content", function(assert) {
-		var oFirstItem = sap.ui.getCore().byId("__item0-customerComponent---mainView--sub2View--lb-0");
+		var oFirstItem = Element.getElementById("__item0-customerComponent---mainView--sub2View--lb-0");
 
 		assert.ok(oFirstItem, "First ListItem should exist");
 		assert.equal(oFirstItem.getText(), "(Customer's replacement ListItem)", "First ListItem should be the customized one");

package/test/sap/ui/core/qunit/component/Customizing_unavoidablySync.qunit.js

@@ -2,10 +2,11 @@ sap.ui.define([
 	"sap/ui/base/Event",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function (Event, Component, ComponentContainer, Controller, createAndAppendDiv, nextUIUpdate) {
+], function (Event, Component, ComponentContainer, Element, Controller, createAndAppendDiv, nextUIUpdate) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -29,7 +30,7 @@ sap.ui.define([
 	this.oLifecycleSpy = sinon.spy();
 
 	function triggerButtonPress(sButtonId) {
-		var oButton = sap.ui.getCore().byId(sButtonId);
+		var oButton = Element.getElementById(sButtonId);
 		var oEvent = new Event(sButtonId, oButton, {});
 		oButton.firePress(oEvent);
 	}
@@ -74,8 +75,8 @@ sap.ui.define([
 	// ExtensionPoint default content
 
 	QUnit.test("ExtensionPoint default content", function(assert) {
-		assert.ok(sap.ui.getCore().byId("__jsview0--defaultContentText"), "JS extension point 1 should contain default content");
-		assert.ok(sap.ui.getCore().byId("iHaveCausedDestruction"), "JS Extension Point 45 Content has been correctly replaced");
+		assert.ok(Element.getElementById("__jsview0--defaultContentText"), "JS extension point 1 should contain default content");
+		assert.ok(Element.getElementById("iHaveCausedDestruction"), "JS Extension Point 45 Content has been correctly replaced");
 	});
 
 	QUnit.module("Controller Customizing via Hook", {

package/test/sap/ui/core/qunit/component/Metadata.qunit.js

@@ -76,7 +76,7 @@ sap.ui.define([
 						"uri": "i18n/i18n.properties"
 					},
 					"sfapi": {
-						"type": "sap.ui.model.odata.ODataModel",
+						"type": "sap.ui.model.odata.v2.ODataModel",
 						"uri": "./some/odata/service"
 					}
 				},
@@ -191,7 +191,7 @@ sap.ui.define([
 							"uri": "i18n/i18n.properties"
 						},
 						"sfapi": {
-							"type": "sap.ui.model.odata.ODataModel",
+							"type": "sap.ui.model.odata.v2.ODataModel",
 							"uri": "./some/odata/service"
 						}
 					},
@@ -406,7 +406,7 @@ sap.ui.define([
 			return new Promise(function (resolve) {
 				sap.ui.require([
 					"sap/ui/model/resource/ResourceModel",
-					"sap/ui/model/odata/ODataModel",
+					"sap/ui/model/odata/v2/ODataModel",
 					"sap/ui/core/routing/Router",
 					"sap/ui/core/mvc/XMLView"
 				], function (ResourceModel, OdataModel, Router, XMLView) {