@openui5/sap.ui.core 1.120.1 → 1.120.2

package/test/sap/ui/core/demokit/tutorial/troubleshooting/01/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.1" #MainVersion#
+  version: "1.120.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout

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

@@ -194,7 +194,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Single Binding with non-existing type", function (assert) {
-		this.oLogMock.expects("error").once().withExactArgs("Failed to resolve type 'does.not.exist'. Maybe not loaded or a typo?");
+		this.oLogMock.expects("error").once().calledWith(sinon.match(/Failed to resolve type 'does.not.exist'. Maybe not loaded or a typo\?/));
 		var o = parse("{path:'something', type: 'does.not.exist'}", oController);
 		assert.strictEqual(typeof o, "object", "parse should return an object");
 		assert.strictEqual(o.parts, undefined, "binding info should not be a composite binding info");
@@ -777,7 +777,7 @@ sap.ui.define([
 			oBindingInfo;
 
 		this.oLogMock.expects("error")
-			.withExactArgs("Cannot merge parts: Unsupported property: type", sBinding,
+			.calledWith(sinon.match(/Cannot merge parts: Unsupported property: type/), sBinding,
 				"sap.ui.base.BindingParser");
 
 		//TODO complex binding with type: does not work (but is left untouched by mergeParts())
@@ -883,8 +883,8 @@ sap.ui.define([
 			oBindingInfo;
 
 		// bTolerateFunctionsNotFound = false
-		this.oLogMock.expects("error").withExactArgs("formatter function foo not found!");
-		this.oLogMock.expects("error").withExactArgs("formatter function .bar not found!");
+		this.oLogMock.expects("error").calledWith(sinon.match(/formatter function foo not found!/));
+		this.oLogMock.expects("error").calledWith(sinon.match(/formatter function .bar not found!/));
 
 		parse(sBinding, null, true, /*bTolerateFunctionsNotFound*/false);
 

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

@@ -4,6 +4,7 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/CommandExecution",
 	"sap/ui/core/Component",
+	"sap/ui/core/ComponentRegistry",
 	"sap/ui/core/ComponentContainer",
 	"sap/ui/core/Control",
 	"sap/ui/core/Shortcut",
@@ -16,6 +17,7 @@ sap.ui.define([
 	ManagedObject,
 	CommandExecution,
 	Component,
+	ComponentRegistry,
 	ComponentContainer,
 	Control,
 	Shortcut,
@@ -179,7 +181,7 @@ sap.ui.define([
 				}
 			},
 			getExtensionComponent: function() {
-				return Component.registry.filter(function(oComponent) {
+				return ComponentRegistry.filter(function(oComponent) {
 					return oComponent.getManifestEntry("/sap.app/id") === "my.command.constructor";
 				})[0] || this;
 			}

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

@@ -810,7 +810,7 @@ sap.ui.define([
 		var oElementB = new Element("B");
 
 		assert.ok(Object.keys(oCoreInternals.mElements).length, 2, "Return all registered Element instances");
-		assert.equal(oErrorLogSpy.getCall(0).args[0], "oCore.mElements was a private member and has been removed. Use one of the methods in sap.ui.core.Element.registry instead", "Logs error on private methode access");
+		assert.equal(oErrorLogSpy.getCall(0).args[0], "oCore.mElements was a private member and has been removed. Use one of the methods in sap.ui.core.ElementRegistry instead", "Logs error on private methode access");
 
 		oElementA.destroy();
 		oElementB.destroy();

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

@@ -3,7 +3,7 @@ sap.ui.define([
 	"test-resources/sap/ui/core/qunit/odata/data/ODataModelFakeService",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Control",
-	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/model/ContextBinding",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/odata/v2/ODataModel"
@@ -11,7 +11,7 @@ sap.ui.define([
 	fakeService,
 	ManagedObject,
 	Control,
-	UIArea,
+	UIAreaRegistry,
 	ContextBinding,
 	JSONModel,
 	ODataModel
@@ -62,7 +62,7 @@ sap.ui.define([
 			var oDiv = document.createElement("div");
 			oUIAreas.appendChild(oDiv);
 			new Control().placeAt(oDiv).destroy();
-			this.uiArea = UIArea.registry.get(oDiv.id);
+			this.uiArea = UIAreaRegistry.get(oDiv.id);
 
 			this.mPropagationInfo = {};
 
@@ -152,7 +152,7 @@ sap.ui.define([
 			var oDiv = document.createElement("div");
 			oUIAreas.appendChild(oDiv);
 			new Control().placeAt(oDiv).destroy();
-			this.uiArea = UIArea.registry.get(oDiv.id);
+			this.uiArea = UIAreaRegistry.get(oDiv.id);
 
 			this.mPropagationInfo = {};
 
@@ -570,7 +570,7 @@ sap.ui.define([
 		beforeEach : function() {
 			sap.ui.getCore().setModel(oModel1);
 			new Control().placeAt("content").destroy();
-			this.uiArea = UIArea.registry.get("content");
+			this.uiArea = UIAreaRegistry.get("content");
 			this.uiArea.setModel(null);
 			this.child = new TestControl({
 				value : { parts : [ "/value", "m2>/value" ], formatter : function(a,b) { return a + ":" + b; } },
@@ -691,7 +691,7 @@ sap.ui.define([
 				 }
 			}.bind(this);
 			new Control().placeAt("content").destroy();
-			this.uiArea =  UIArea.registry.get("content");
+			this.uiArea =  UIAreaRegistry.get("content");
 			this.uiArea.attachModelContextChange(this.fnChange);
 
 			sap.ui.getCore().setModel(oModel4);

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

@@ -3,9 +3,9 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/DeclarativeSupport",
 	"sap/ui/core/Element",
-	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/model/json/JSONModel"
-], function(jQuery, DeclarativeSupport, Element, UIArea, JSONModel) {
+], function(jQuery, DeclarativeSupport, Element, UIAreaRegistry, JSONModel) {
 	"use strict";
 	QUnit.config.reorder = false;
 	QUnit.module("Basic");
@@ -144,7 +144,7 @@ sap.ui.define([
 
 	QUnit.test("UIArea", function(assert) {
 		assert.expect(7);
-		var oUIArea = UIArea.registry.get("uiAreaSimple");
+		var oUIArea = UIAreaRegistry.get("uiAreaSimple");
 		assert.equal(!!oUIArea, false, 'No control with id "uiAreaSimple" found.');
 
 		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
@@ -155,7 +155,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#ui-area-simple"));
 
-		var oUIArea = UIArea.registry.get("uiAreaSimple");
+		var oUIArea = UIAreaRegistry.get("uiAreaSimple");
 		assert.ok(!!oUIArea, 'UIArea with id "uiAreaSimple" found.');
 
 		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
@@ -170,7 +170,7 @@ sap.ui.define([
 
 	QUnit.test("Complex Declaration", function(assert) {
 		assert.expect(8);
-		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
+		var oUIArea = UIAreaRegistry.get("complexDeclarationUIArea");
 		assert.equal(!!oUIArea, false, 'No UIArea with id "complexDeclarationUIArea" found.');
 
 		var oPanel1 = Element.getElementById("complexDeclarationPanel1");
@@ -188,7 +188,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#complex-declaration"));
 
-		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
+		var oUIArea = UIAreaRegistry.get("complexDeclarationUIArea");
 		assert.ok(!!oUIArea, 'UIArea with id "complexDeclarationUIArea" found.');
 
 		var oPanel1 = Element.getElementById("complexDeclarationPanel1");

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

@@ -1,11 +1,12 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/Element"
-], function(Element) {
+	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry"
+], function(Element, ElementRegistry) {
 	"use strict";
 
 	function cleanUpRegistry() {
-		Element.registry.forEach(function(oElement) {
+		ElementRegistry.forEach(function(oElement) {
 			oElement.destroy();
 		});
 	}
@@ -27,14 +28,14 @@ sap.ui.define([
 		var aFilteredElements = [];
 
 		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.equal(ElementRegistry.size, 3, "Return number of registered element instances");
+		assert.deepEqual(Object.keys(ElementRegistry.all()).sort(), ["A", "B", "C"], "Return all registered element instances");
 		assert.ok(Element.getElementById("B") === oFooB, "Return reference of element B from registry by ID");
 
-		Element.registry.forEach(fnCallbackSpy);
+		ElementRegistry.forEach(fnCallbackSpy);
 		assert.ok(fnCallbackSpy.calledThrice, "Callback was executed 3 times");
 
-		aFilteredElements = Element.registry.filter(function(oElement) {
+		aFilteredElements = ElementRegistry.filter(function(oElement) {
 			return ["B", "C"].indexOf(oElement.getId()) > -1;
 		});
 

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

@@ -0,0 +1,48 @@
+/*global QUnit */
+sap.ui.define([
+	"sap/ui/core/Element"
+], function(Element) {
+	"use strict";
+
+	function cleanUpRegistry() {
+		Element.registry.forEach(function(oElement) {
+			oElement.destroy();
+		});
+	}
+
+	QUnit.module("Element registry", {
+		beforeEach: function () {
+			cleanUpRegistry();
+		},
+		afterEach: function() {
+			cleanUpRegistry();
+		}
+	});
+
+	QUnit.test("Element registry access", function(assert) {
+		var oFooA = new Element("A");
+		var oFooB = new Element("B");
+		var oFooC = new Element("C");
+		var fnCallbackSpy = this.spy(function() {});
+		var aFilteredElements = [];
+
+		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.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");
+
+		aFilteredElements = Element.registry.filter(function(oElement) {
+			return ["B", "C"].indexOf(oElement.getId()) > -1;
+		});
+
+		assert.equal(aFilteredElements.length, 2, "Return 2 components matching the filter criteria");
+
+		oFooA.destroy();
+		oFooB.destroy();
+		oFooC.destroy();
+	});
+
+});

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

@@ -139,7 +139,7 @@ sap.ui.define([
 		var oUI5ElementFound = Element.closestTo(jQuery("#startPoint"));
 		assert.strictEqual(oUI5ElementFound, oUI5Element);
 
-		sinon.assert.calledWithExactly(oErrorLogSpy, "[FUTURE] Do not call Element.closestTo() with jQuery object as parameter. \
+		sinon.assert.calledWithExactly(oErrorLogSpy, "[FUTURE FATAL] Do not call Element.closestTo() with jQuery object as parameter. \
 				The function should be called with either a DOM Element or a CSS selector. \
 				(future error, ignored for now)");
 

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

@@ -7,19 +7,16 @@ sap.ui.define([
 	"sap/ui/core/Fragment",
 	"sap/ui/core/Element",
 	"sap/ui/core/XMLTemplateProcessor",
-	"sap/m/Panel",
 	"sap/m/Button",
 	"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/ui/core/mvc/ViewType",
 	"sap/base/util/LoaderExtensions",
 	"sap/ui/thirdparty/jquery"
-], function (Log, qutils, Core, Component, Fragment, Element, XMLTemplateProcessor, Panel, Button, HorizontalLayout, JSONModel, createAndAppendDiv, nextUIUpdate, View, XMLView, JSView, Controller, LoaderExtensions, jQuery) {
+], function (Log, qutils, Core, Component, Fragment, Element, XMLTemplateProcessor, Button, HorizontalLayout, JSONModel, createAndAppendDiv, nextUIUpdate, View, ViewType, LoaderExtensions, jQuery) {
 	"use strict";
 
 	createAndAppendDiv(["content1", "content2", "content3", "content4", "binding"]);
@@ -54,6 +51,55 @@ sap.ui.define([
 		}
 	});
 
+	// Keep this test run as the first test in this file because it's needed to check whether the module
+	// "sap/ui/core/mvc/XMLView" is required correctly
+	//
+	// There are later further tests which load this module, therefore this test should run before the other tests.
+	QUnit.test("XML Fragment loaded from file with nested XMLView", function(assert) {
+		/**
+		 * @deprecated
+		 */
+		var oRequireSyncSpy = this.spy(sap.ui, "requireSync");
+		assert.notOk(sap.ui.require("sap/ui/core/mvc/XMLView"), "XMLView module isn't loaded yet");
+		return Fragment.load({
+			fragmentName: "testdata.fragments.XMLTestFragmentWithXMLView",
+			controller: this.oDummyController
+		}).then(async function(oFragment) {
+			assert.ok(sap.ui.require("sap/ui/core/mvc/XMLView"), "XMLView module is loaded");
+			/**
+			 * @deprecated
+			 */
+			assert.notOk(oRequireSyncSpy.called, "sap.ui.requireSync shouldn't be called");
+
+			oFragment.placeAt("content1");
+			await nextUIUpdate();
+
+			var id = oFragment.getId();
+
+			assert.equal(id.substr(0, 8), "__layout", "Fragment ID should be generated");
+			assert.ok(document.getElementById(id), "XML Fragment should be rendered");
+
+			var aContent = oFragment.getContent();
+			var btn1 = aContent[0];
+			var btn2 = aContent[1];
+			assert.equal(btn1.getId(), "btn1InXmlFragment", "Button with given ID should have exactly this ID");
+			assert.equal(btn2.getId().substr(0, 8), "__button", "Button with no given ID should have a generated ID");
+
+			// Data binding
+			assert.equal(btn2.$().text(), DATABOUND_TEXT, "Second Button should have text from data binding");
+
+			// find controls by ID
+			var btn = Element.getElementById("btn1InXmlFragment");
+			assert.ok(btn, "Button should be found by ID");
+			assert.ok(btn instanceof Button, "Button should be found by ID");
+
+			var view = aContent[2];
+			assert.ok(view.isA("sap.ui.core.mvc.XMLView"), "XMLView instance is created");
+
+			oFragment.destroy();
+		});
+	});
+
 	QUnit.test("XML Fragment loaded from file", function(assert) {
 		return Fragment.load({
 			fragmentName: "testdata.fragments.XMLTestFragment",
@@ -254,8 +300,9 @@ sap.ui.define([
 	var DATABOUND_TEXT_IN_VIEW = "Text from Databinding in View";
 
 	QUnit.test("XMLView Rendering", function(assert) {
-		return XMLView.create({
-			viewName: "testdata.fragments.XMLViewWithFragments"
+		return View.create({
+			viewName: "testdata.fragments.XMLViewWithFragments",
+			type: ViewType.XML
 		}).then(async function(oResult) {
 			oXmlView = oResult;
 
@@ -509,9 +556,10 @@ sap.ui.define([
 	});
 
 	QUnit.test("Unnamed Model", function(assert) {
-		return XMLView.create({
+		return View.create({
 			id: "unnamedView",
-			viewName: "my.UnnamedView"
+			viewName: "my.UnnamedView",
+			type: ViewType.XML
 		}).then(async function(oView) {
 			oView.placeAt("binding");
 			await nextUIUpdate();
@@ -524,9 +572,10 @@ sap.ui.define([
 	});
 
 	QUnit.test("Named Model", function(assert) {
-		return XMLView.create({
+		return View.create({
 			id: "namedView",
-			viewName: "my.View"
+			viewName: "my.View",
+			type: ViewType.XML
 		}).then(async function(oView) {
 			oView.placeAt("binding");
 			await nextUIUpdate();
@@ -662,8 +711,9 @@ sap.ui.define([
 
 	QUnit.test("Load XML View from file with nested fragments of type 'JS' and 'XML'", function (assert) {
 		assert.expect(21);
-		return XMLView.create({
-			viewName: "testdata.fragments.nested.XMLViewWithFragments"
+		return View.create({
+			viewName: "testdata.fragments.nested.XMLViewWithFragments",
+			type: ViewType.XML
 		}).then(function (oView) {
 			return oView.loaded().then(function () {
 				assert.equal(this.loadTemplatePromiseSpy.callCount, 2, "XMLTemplateProcessor.loadTemplatePromise should be called two times (only for the nested XML fragments)");

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

@@ -5,13 +5,13 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/HTML",
 	"sap/ui/core/RenderManager",
-	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/core/UIComponent",
 	"sap/ui/layout/VerticalLayout",
 	"sap/ui/testlib/TestButton",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(ComponentContainer, Control, Element, HTML, RenderManager, UIArea, UIComponent, VerticalLayout, TestButton, jQuery, nextUIUpdate) {
+], function(ComponentContainer, Control, Element, HTML, RenderManager, UIAreaRegistry, UIComponent, VerticalLayout, TestButton, jQuery, nextUIUpdate) {
 	"use strict";
 
 	var normalize = (function() {
@@ -266,7 +266,7 @@ sap.ui.define([
 
 	QUnit.test("content property + preferDOM, initial rendering", async function(assert) {
 		//Cleanup UIArea because placeAt only adds new control to UIArea
-		UIArea.registry.get("uiAreaA").removeAllContent();
+		UIAreaRegistry.get("uiAreaA").removeAllContent();
 		new VerticalLayout({
 			content: [
 				new HTML("html3", {
@@ -406,7 +406,7 @@ sap.ui.define([
 		var oldDomRef = jQuery("#html3")[0];
 
 		// remove from control tree and rerender
-		UIArea.registry.get("uiAreaA").removeAllContent();
+		UIAreaRegistry.get("uiAreaA").removeAllContent();
 		await nextUIUpdate();
 
 		// check that DOM still exists
@@ -488,7 +488,7 @@ sap.ui.define([
 	// multiple roots test
 	QUnit.test("content property, multiple roots", async function(assert) {
 		// Cleanup UIArea because placeAt only adds new control to UIArea
-		UIArea.registry.get("uiAreaA").removeAllContent();
+		UIAreaRegistry.get("uiAreaA").removeAllContent();
 		new HTML("html6", {
 			content : "<div style='width:200px;height:64px;background-color:rgb(0, 0, 0);'></div><div style='width:200px;height:64px;background-color:rgb(255, 0, 0);'></div><div style='width:200px;height:64px;background-color:rgb(255, 255, 0);'></div>"
 		}).placeAt("uiAreaA");

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

@@ -455,7 +455,7 @@ sap.ui.define([
 	QUnit.test("", async function(assert) {
 		let oErrorLogSpy;
 
-		assert.expect(3);
+		assert.expect(6);
 
 		sap.ui.predefine('testing/pseudo/modules/deprecation/library', ["sap/ui/core/Lib"], function(Library) {
 			const oThisLib = Library.init({
@@ -474,9 +474,11 @@ sap.ui.define([
 			name: "testing.pseudo.modules.deprecation"
 		});
 
+		const sExpectedErrorMessage = "Deprecation: Importing the type 'testing.pseudo.modules.deprecation.Type1' as a module is deprecated. Please require the corresponding 'library.js' containing the type directly. You can then reference the type via the library's module export.";
+
+		// Anonymous require: Log does not contain the requesting module
 		await new Promise((resolve, reject) => {
 			oErrorLogSpy = this.spy(Log, "error");
-			const sExpectedErrorMessage = "Deprecation: Import the type 'testing.pseudo.modules.deprecation.Type1' as a module is deprecated. Please require the corresponding 'library.js' containing the type directly. You can then reference the type via the library's module export.";
 
 			sap.ui.require(["testing/pseudo/modules/deprecation/Type1"], (Type1) => {
 				assert.ok(oErrorLogSpy.calledWith(sExpectedErrorMessage), "Error Message for pseudo module deprecation logged.");
@@ -487,5 +489,20 @@ sap.ui.define([
 		}).finally(() => {
 			oErrorLogSpy.restore();
 		});
+
+		// Anonymous require: Log does not contain the requesting module
+		await new Promise((resolve, reject) => {
+			oErrorLogSpy = this.spy(Log, "error");
+			const sModuleSpecificErrorMessage = `(dependency of 'my/old/Module.js') ${sExpectedErrorMessage}`;
+
+			sap.ui.define("my/old/Module", ["testing/pseudo/modules/deprecation/Type1"], (Type1) => {
+				assert.ok(oErrorLogSpy.calledWith(sModuleSpecificErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.ok(Type1.A, "A", "pseudo type module export is correct (A).");
+				assert.ok(Type1.B, "B", "pseudo type module export is correct (B).");
+				resolve();
+			}, reject);
+		}).finally(() => {
+			oErrorLogSpy.restore();
+		});
 	});
 });

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

@@ -5,9 +5,9 @@ sap.ui.define([
 	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/StaticArea",
-	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Panel, Button, oCore, Element, StaticArea, UIArea, createAndAppendDiv) {
+], function(Panel, Button, oCore, Element, StaticArea, UIAreaRegistry, createAndAppendDiv) {
 	"use strict";
 
 	createAndAppendDiv(["uiArea1", "uiArea2", "uiArea3", "uiArea4"]);
@@ -34,7 +34,7 @@ sap.ui.define([
 				oControl.placeAt(oContainerRef);
 			}
 
-			var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.getElementById(sContainerId);
+			var oCont = bIsUiArea ? UIAreaRegistry.get(sContainerId) : Element.getElementById(sContainerId);
 			return [oControl.getId(), oCont];
 		}
 
@@ -57,7 +57,7 @@ sap.ui.define([
 	QUnit.module("sap.ui.core.Control.placeAt");
 
 	QUnit.test("Deferred call", function(assert) {
-		doCheckPlaceAtResult(assert, ["myPanel", UIArea.registry.get("uiArea1")], 1, 0, "deferred call");
+		doCheckPlaceAtResult(assert, ["myPanel", UIAreaRegistry.get("uiArea1")], 1, 0, "deferred call");
 	});
 
 	QUnit.test("UIArea via ID", function(assert) {
@@ -105,7 +105,7 @@ sap.ui.define([
 			function setRoot() {
 				var oControl = new Button();
 				oCore.setRoot(oContainerRef, oControl);
-				var oCont = bIsUiArea ? UIArea.registry.get(sContainerId) : Element.getElementById(sContainerId);
+				var oCont = bIsUiArea ? UIAreaRegistry.get(sContainerId) : Element.getElementById(sContainerId);
 				return [oControl.getId(), oCont];
 			}
 
@@ -118,7 +118,7 @@ sap.ui.define([
 		QUnit.module("sap.ui.core.Core.setRoot");
 
 		QUnit.test("Deferred call", function(assert) {
-			doCheckSetRootResult(assert, ["myPanel2", UIArea.registry.get("uiArea3")]);
+			doCheckSetRootResult(assert, ["myPanel2", UIAreaRegistry.get("uiArea3")]);
 		});
 
 		QUnit.test("UIArea via ID", function(assert) {

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

@@ -82,7 +82,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("fnWrapper trigger", function(assert) {
-		assert.expect(4);
+		assert.expect(6);
 		var done = assert.async();
 		var oHTMLElementFocusSpy = sinon.spy(HTMLElement.prototype, "focus");
 		var oInput = new Input();
@@ -100,7 +100,15 @@ sap.ui.define([
 		oInput.placeAt("qunit-fixture");
 		oInput.addEventDelegate({"onAfterRendering": function() {
 			oInput.focus();
+
+			// wrap the assertion in a 0 timeout to make sure that the shift of focus to the internal "span"
+			// is done by using a 0 timeout
+			setTimeout(function() {
+				assert.ok(oInput.getDomRef().contains(document.activeElement), "Focus should be within the input after a 0 timeout");
+			});
+
 			QUtils.triggerKeydown(oInput.getDomRef(), "s", true, false, false);
+			assert.ok(oInput.getDomRef().contains(document.activeElement), "Focus should be within the input directly after triggering the shortcut");
 		}});
 	});
 });

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

@@ -6,12 +6,13 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/HTML",
 	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"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, Element, HTML, UIArea, createAndAppendDiv, nextUIUpdate, TestButton, Press, jQuery) {
+], function(Log, Control, Element, HTML, UIArea, UIAreaRegistry, createAndAppendDiv, nextUIUpdate, TestButton, Press, jQuery) {
 	"use strict";
 
 	createAndAppendDiv("uiArea1");
@@ -60,7 +61,7 @@ sap.ui.define([
 	 * UIArea must be empty after the rendering
 	 */
 	QUnit.test("removeAllContent", async function(assert) {
-		UIArea.registry.get("uiArea1").removeAllContent();
+		UIAreaRegistry.get("uiArea1").removeAllContent();
 		await nextUIUpdate();
 		assert.equal(jQuery("#uiArea1").children().length, 0, "no more content");
 		assert.ok(Element.getElementById("text1"), "remove must not destroy child 1");
@@ -87,7 +88,7 @@ sap.ui.define([
 		assert.equal(jQuery($currentDom.get(1)).text(), "Text 1", "first span shows first text");
 		assert.equal(jQuery($currentDom.get(2)).text(), "Text 2", "second span shows second text");
 
-		UIArea.registry.get("uiArea2").removeAllContent();
+		UIAreaRegistry.get("uiArea2").removeAllContent();
 		await nextUIUpdate();
 		$currentDom = jQuery("#uiArea2").children();
 		assert.equal($currentDom.length, 1, "initial DOM still exists in UIArea");
@@ -127,7 +128,7 @@ sap.ui.define([
 		assert.equal(jQuery($currentDom.get(4)).text(), "After", "last span shows dynamically added end");
 
 		// now remove controls, check that the remainigs are as expected
-		UIArea.registry.get("uiArea2").removeAllContent();
+		UIAreaRegistry.get("uiArea2").removeAllContent();
 		await nextUIUpdate();
 		$currentDom = jQuery("#uiArea2").children();
 		assert.equal($currentDom.length, 3, "initial DOM still exists in UIArea");
@@ -180,7 +181,7 @@ sap.ui.define([
 		// ---- aspect 3: remove all content must not delete the preserved dOM ----
 
 		// remove content and rerender
-		UIArea.registry.get("uiArea1").removeAllContent();
+		UIAreaRegistry.get("uiArea1").removeAllContent();
 		await nextUIUpdate();
 
 		// check that UIArea is empoty, but preserved content still exists
@@ -296,7 +297,7 @@ sap.ui.define([
 		beforeEach: function() {
 			new Control().placeAt("uiArea1").destroy();
 			var oControl = new Control();
-			UIArea.registry.get("uiArea1").addDependent(oControl);
+			UIAreaRegistry.get("uiArea1").addDependent(oControl);
 			this.uiArea = oControl.getUIArea();
 			this.uiArea.addDependent(new Control());
 			this.spy(this.uiArea, "invalidate");