@openui5/sap.ui.core 1.120.1 → 1.120.3

package/test/sap/ui/core/qunit/generic/ControlMemoryLeaks.qunit.js

@@ -7,8 +7,9 @@ sap.ui.define([
 	"sap/ui/test/generic/TestBase",
 	"sap/ui/test/generic/Utils",
 	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(TestBase, Utils, Element, nextUIUpdate) {
+], function(TestBase, Utils, Element, ElementRegistry, nextUIUpdate) {
 	"use strict";
 
 	 // asserts that both given maps have the same entries
@@ -110,13 +111,13 @@ sap.ui.define([
 						await nextUIUpdate();
 
 						if (bFinalIteration) {
-							var mPostElements = Element.registry.all();
+							var mPostElements = ElementRegistry.all();
 
 							// controls left over by second instance are real leaks that will grow proportionally to instance count => ERROR
 							assert.equalElementsInControlList(mPostElements, mPreElements, "Memory leak check in " + sControlName);
 						} else {
 							// Render Control Instance 2 - any new controls leaked?
-							mPreElements = Element.registry.all();
+							mPreElements = ElementRegistry.all();
 						}
 					}.bind(this);
 

package/test/sap/ui/core/qunit/generic/legacy/ControlMemoryLeaks.qunit.js

@@ -15,12 +15,12 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/ObjectPath",
 	"sap/ui/VersionInfo",
-	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/core/Lib",
 	"sap/ui/dom/includeStylesheet",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, Element, Library, includeStylesheet, nextUIUpdate, require) {
+], function (Log, ObjectPath, VersionInfo, ElementRegistry, Library, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	/*global QUnit */
@@ -301,8 +301,7 @@ sap.ui.define([
 	async function checkControl(oControlClass, assert) {
 		var sControlName = oControlClass.getMetadata().getName();
 
-		var //mPrePreElements = Element.registry.all(),
-			oControl1 = new oControlClass(),
+		var oControl1 = new oControlClass(),
 			bCanRender = false;
 
 		// check whether this control can be rendered
@@ -334,7 +333,7 @@ sap.ui.define([
 
 		// Render Control Instance 2 - any new controls leaked?
 
-		var mPreElements = Element.registry.all(),
+		var mPreElements = ElementRegistry.all(),
 			oControl2 = new oControlClass();
 
 		fillControlProperties(oControl2);
@@ -357,7 +356,7 @@ sap.ui.define([
 
 		oControl2.destroy();
 		await nextUIUpdate();
-		var mPostElements = Element.registry.all();
+		var mPostElements = ElementRegistry.all();
 
 		// controls left over by second instance are real leaks that will grow proportionally to instance count => ERROR
 		assert.equalElementsInControlList(mPostElements, mPreElements, "Memory leak check in " + sControlName);
@@ -372,7 +371,7 @@ sap.ui.define([
 
 	QUnit.module("Memory.Controls", {
 		afterEach: function() {
-			Element.registry.forEach(function(oElement, sId) {
+			ElementRegistry.forEach(function(oElement, sId) {
 				oElement.destroy();
 			});
 		}

package/test/sap/ui/core/qunit/generic/legacy/DuplicateIdCheck.qunit.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	"sap/ui/VersionInfo",
 	"sap/ui/base/DataType",
 	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/core/Control",
 	"sap/ui/core/Item",
 	"sap/ui/core/Lib",
@@ -19,7 +20,7 @@ sap.ui.define([
 	"sap/ui/dom/includeStylesheet",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, DataType, Element, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, nextUIUpdate, require) {
+], function (Log, ObjectPath, VersionInfo, DataType, Element, ElementRegistry, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	var aKnownLibraries = [
@@ -440,7 +441,7 @@ sap.ui.define([
 
 	QUnit.module("Duplicate ID issues in Controls", {
 		afterEach: function() {
-			Element.registry.forEach(function(oElement, sId) {
+			ElementRegistry.forEach(function(oElement, sId) {
 				oElement.destroy();
 			});
 		}

package/test/sap/ui/core/qunit/generic/legacy/testsuite.generic.qunit.js

@@ -29,6 +29,9 @@ sap.ui.define(function() {
 			ControlMemoryLeaks: {
 				title: "QUnit Page for memory leak detection in UI5 controls"
 			},
+			/**
+			 * @deprecated As of version 1.120
+			 */
 			ControlRenderer: {
 				title: "QUnit Page for memory leak detection in UI5 controls"
 			},

package/test/sap/ui/core/qunit/i18n/LocaleData.qunit.js

@@ -1434,4 +1434,69 @@ sap.ui.define([
 		assert.deepEqual(LocaleData.prototype.getLanguages.call(oLocaleData), oExpectedResult);
 	});
 });
+
+	//*********************************************************************************************
+["narrow", "abbreviated", "wide"].forEach((sWidth) => {
+	QUnit.test("getMonths: returns first alternative, " + sWidth, function (assert) {
+		const oLocalData = {
+			_get() {}
+		};
+		this.mock(oLocalData).expects("_get")
+			.withExactArgs("ca-~scalendartype", "months", "format", sWidth)
+			.returns([["a", "b"], "c", "d", ["e", "f", "g"], "h"]);
+
+		// code under test
+		assert.deepEqual(LocaleData.prototype.getMonths.call(oLocalData, sWidth, "~sCalendarType"),
+			["a", "c", "d", "e", "h"]);
+	});
+});
+
+	//*********************************************************************************************
+["narrow", "abbreviated", "wide"].forEach((sWidth) => {
+	QUnit.test("_getMonthsWithAlternatives: " + sWidth, function (assert) {
+		const oLocalData = {
+			_get() {}
+		};
+		this.mock(oLocalData).expects("_get")
+			.withExactArgs("ca-~scalendartype", "months", "format", sWidth)
+			.returns("~result");
+
+		// code under test
+		assert.deepEqual(LocaleData.prototype._getMonthsWithAlternatives.call(oLocalData, sWidth, "~sCalendarType"),
+			"~result");
+	});
+});
+
+	//*********************************************************************************************
+["narrow", "abbreviated", "wide"].forEach((sWidth) => {
+	QUnit.test("getMonthsStandAlone: returns first alternative, " + sWidth, function (assert) {
+		const oLocalData = {
+			_get() {}
+		};
+		this.mock(oLocalData).expects("_get")
+			.withExactArgs("ca-~scalendartype", "months", "stand-alone", sWidth)
+			.returns([["a", "b"], "c", "d", ["e", "f", "g"], "h"]);
+
+		// code under test
+		assert.deepEqual(LocaleData.prototype.getMonthsStandAlone.call(oLocalData, sWidth, "~sCalendarType"),
+			["a", "c", "d", "e", "h"]);
+	});
+});
+
+	//*********************************************************************************************
+["narrow", "abbreviated", "wide"].forEach((sWidth) => {
+	QUnit.test("_getMonthsStandAloneWithAlternatives: " + sWidth, function (assert) {
+		const oLocalData = {
+			_get() {}
+		};
+		this.mock(oLocalData).expects("_get")
+			.withExactArgs("ca-~scalendartype", "months", "stand-alone", sWidth)
+			.returns("~result");
+
+		// code under test
+		assert.deepEqual(
+			LocaleData.prototype._getMonthsStandAloneWithAlternatives.call(oLocalData, sWidth, "~sCalendarType"),
+			"~result");
+	});
+});
 });

package/test/sap/ui/core/qunit/i18n/UI5Date.qunit.js

@@ -1242,4 +1242,111 @@ sap.ui.define([
 		// code under test
 		assert.strictEqual(oUI5Date.clone(), "~clone");
 	});
+
+	//*********************************************************************************************
+	function toLocalDateString(oDate) {
+		return oDate.getFullYear()
+			+ "-" + (oDate.getMonth() + 1).toString().padStart(2, "0")
+			+ "-" + oDate.getDate().toString().padStart(2, "0")
+			+ "T" + oDate.getHours().toString().padStart(2, "0")
+			+ ":" + oDate.getMinutes().toString().padStart(2, "0");
+	}
+
+[{ // America/Adak: UTC-10 (Standard), UTC-9 (DST); 02:00 am to 03:00 am resp. 02:00 am to 01:00 am
+	sTimezone: "America/Adak",
+	toDST: {aDate: [2024, 2, 10, 2], sResult: "2024-03-10T03:00"},
+	toStandard: {aDate: [2023, 10, 5, 2], sResult: "2023-11-05T02:00", sAandBTime: "2023-11-05T01:00"}
+}, { // America/Havana: UTC-5 (Standard), UTC-4 (DST); 12:00 am to 01:00 am resp. 01:00 am to 12:00 am
+	sTimezone: "America/Havana",
+	toDST: {aDate: [2024, 2, 10, 0], sResult: "2024-03-10T01:00"},
+	toStandard: {aDate: [2023, 10, 5, 1], sResult: "2023-11-05T01:00", sAandBTime: "2023-11-05T00:00"}
+}, { // BCP: 2370140369
+	// America/Santiago: UTC-4 (Standard), UTC-3 (DST); 12:00 am to 01:00 am resp. 12:00 am to 11:00 pm
+	sTimezone: "America/Santiago",
+	toDST: {aDate: [2023, 8, 3, 0], sResult: "2023-09-03T01:00"},
+	toStandard: {aDate: [2024, 3, 7], sResult: "2024-04-07T00:00", sAandBTime: "2024-04-06T23:00"}
+}, { // America/St_Johns: UTC-3:30 (Standard), UTC-2:30 (DST); 02:00 am to 03:00 am resp. 02:00 am to 01:00 am
+	sTimezone: "America/St_Johns",
+	toDST: {aDate: [2024, 2, 10, 2], sResult: "2024-03-10T03:00"},
+	toStandard: {aDate: [2023, 10, 5, 2], sResult: "2023-11-05T02:00", sAandBTime: "2023-11-05T01:00"}
+}, { // Pacific/Easter: UTC-6 (Standard), UTC-5 (DST); 10:00 pm to 11:00 pm resp. 10:00 pm to 09:00 pm
+	sTimezone: "Pacific/Easter",
+	toDST: {aDate: [2023, 8, 2, 22], sResult: "2023-09-02T23:00"},
+	toStandard: {aDate: [2024, 3, 6, 22], sResult: "2024-04-06T22:00", sAandBTime: "2024-04-06T21:00"}
+}, { // Atlantic/Azores: UTC-1 (Standard), UTC+0 (DST); 00:00 am to 01:00 am resp. 01:00 am to 12:00 am
+	sTimezone: "Atlantic/Azores",
+	toDST: {aDate: [2024, 2, 31, 0], sResult: "2024-03-31T01:00"},
+	toStandard: {aDate: [2023, 9, 29, 1], sResult: "2023-10-29T01:00", sAandBTime: "2023-10-29T00:00"}
+}, { // Antarctica/Troll: UTC+0 (Standard), UTC+2 (DST); 01:00 am to 03:00 am resp. 03:00 am to 01:00 am
+	sTimezone: "Antarctica/Troll",
+	toDST: {aDate: [2024, 2, 31, 1], sResult: "2024-03-31T03:00"},
+	toStandard: {
+		aDate: [2023, 9, 29, 3],
+		sResult: "2023-10-29T03:00",
+		sAandBTime: "2023-10-29T01:00",
+		iTimeshift: 7200000 // 2 hours timeshift!
+	}
+}, { // Africa/Casablanca: UTC+0 (Standard), UTC+1 (DST); 02:00 am to 03:00 am resp. 03:00 am to 02:00 am
+	sTimezone: "Africa/Casablanca",
+	toDST: {aDate: [2023, 3, 23, 2], sResult: "2023-04-23T03:00"},
+	toStandard: {aDate: [2024, 2, 10, 3], sResult: "2024-03-10T03:00", sAandBTime: "2024-03-10T02:00"}
+}, { // Europe/Dublin: UTC+0 (Standard), UTC+1 (DST); 01:00 am to 02:00 am resp. 02:00 am to 01:00 am
+	sTimezone: "Europe/Dublin",
+	toDST: {aDate: [2024, 2, 31, 1], sResult: "2024-03-31T02:00"},
+	toStandard: {aDate: [2023, 9, 29, 2], sResult: "2023-10-29T02:00", sAandBTime: "2023-10-29T01:00"}
+}, { // Africa/Cairo: UTC+2 (Standard), UTC+3 (DST); 12:00 am to 01:00 am resp. 12:00 am to 11:00 pm
+	sTimezone: "Africa/Cairo",
+	toDST: {aDate: [2024, 3, 26, 0], sResult: "2024-04-26T01:00"},
+	toStandard: {aDate: [2023, 9, 27, 0], sResult: "2023-10-27T00:00", sAandBTime: "2023-10-26T23:00"}
+}, { // Europe/Helsinki: UTC+2 (Standard), UTC+3 (DST); 03:00 am to 04:00 am resp. 04:00 am to 03:00 am
+	sTimezone: "Europe/Helsinki",
+	toDST: {aDate: [2024, 2, 31, 3], sResult: "2024-03-31T04:00"},
+	toStandard: {aDate: [2023, 9, 29, 4], sResult: "2023-10-29T04:00", sAandBTime: "2023-10-29T03:00"}
+}, { // Australia/Lord_Howe: UTC+10:30 (Standard), UTC+11 (DST); 02:00 am to 02:30 am resp. 02:00 am to 01:30 am
+	sTimezone: "Australia/Lord_Howe",
+	toDST: {aDate: [2023, 9, 1, 2], sResult: "2023-10-01T02:30"},
+	toStandard: {
+		aDate: [2024, 3, 7, 2],
+		sResult: "2024-04-07T02:00",
+		sAandBTime: "2024-04-07T01:30",
+		iTimeshift: 1800000 // 0.5 hours timeshift!
+	}
+}, { // Australia/Adelaide: UTC+9:30 (Standard), UTC+10:30 (DST); 02:00 am to 03:00 am resp. 03:00 am to 02:00 am
+	sTimezone: "Australia/Adelaide",
+	toDST: {aDate: [2023, 9, 1, 2], sResult: "2023-10-01T03:00"},
+	toStandard: {aDate: [2024, 3, 7, 3], sResult: "2024-04-07T03:00", sAandBTime: "2024-04-07T02:00"}
+}, { // Pacific/Auckland: UTC+12:00 (Standard), UTC+13:00 (DST); 02:00 am to 03:00 am resp. 03:00 am to 02:00 am
+	sTimezone: "Pacific/Auckland",
+	toDST: {aDate: [2023, 8, 24, 2], sResult: "2023-09-24T03:00"},
+	toStandard: {aDate: [2024, 3, 7, 3], sResult: "2024-04-07T03:00", sAandBTime: "2024-04-07T02:00"}
+}, { // Pacific/Chatham: UTC+12:45 (Standard), UTC+13:45 (DST); 02:45 am to 03:45 am resp. 03:45 am to 02:45 am
+	sTimezone: "Pacific/Chatham",
+	toDST: {aDate: [2023, 8, 24, 2, 45], sResult: "2023-09-24T03:45"},
+	toStandard: {aDate: [2024, 3, 7, 3, 45], sResult: "2024-04-07T03:45", sAandBTime: "2024-04-07T02:45"}
+}].forEach((oFixture) => {
+	const sTimezone = oFixture.sTimezone;
+	QUnit.test("Daylight saving time checks: " + sTimezone, function (assert) {
+		let oDate = new UI5Date(oFixture.toDST.aDate, sTimezone);
+		assert.strictEqual(toLocalDateString(oDate), oFixture.toDST.sResult, "to daylight saving time");
+
+		oDate = new UI5Date(oFixture.toStandard.aDate, sTimezone);
+		assert.strictEqual(toLocalDateString(oDate), oFixture.toStandard.sResult, "to standard time");
+
+		const sAandBTime = oFixture.toStandard.sAandBTime;
+		const iTimeshift = oFixture.toStandard.iTimeshift || 3600000;
+		const iBTimestamp = oDate.getTime() - iTimeshift;
+		// b-time in standard time zone
+		assert.strictEqual(toLocalDateString(new UI5Date([iBTimestamp], sTimezone)), sAandBTime, "b-time");
+		const iATimestamp = oDate.getTime() - (2 * iTimeshift);
+		// a-time in Daylight Saving time zone
+		assert.strictEqual(toLocalDateString(new UI5Date([iATimestamp], sTimezone)), sAandBTime, "a-time");
+	});
+});
+
+	//*********************************************************************************************
+	QUnit.test("Daylight saving time checks: special case for 'Pacific/Apia'", function (assert) {
+		// Independent State of Samoa changed time at the end of December 29, 2011
+		// It changed from UTC-11 (UTC-10 DST) to UTC+13 (UTC+14 DST until 2021 - currently always UTC+13)
+		assert.strictEqual(toLocalDateString(new UI5Date([2011, 11, 30, 0], "Pacific/Apia")), "2011-12-31T00:00");
+	});
 });

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

@@ -3,9 +3,9 @@ sap.ui.define([
 	"jquery.sap.ui",
 	"sap/ui/core/Control",
 	"sap/ui/core/Element",
-	"sap/ui/core/UIArea",
+	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(jQuery, Control, Element, UIArea, nextUIUpdate) {
+], function(jQuery, Control, Element, UIAreaRegistry, nextUIUpdate) {
 	"use strict";
 
 	var TestControl = Control.extend("sap.jsunittest.Test", {
@@ -39,7 +39,7 @@ sap.ui.define([
 	QUnit.test("OneRootOk", function(assert) {
 		jQuery("#uiArea1").root();
 
-		var oUIArea = UIArea.registry.get("uiArea1");
+		var oUIArea = UIAreaRegistry.get("uiArea1");
 		assert.notStrictEqual(oUIArea, null, "UI Area should have been created.");
 		assert.notStrictEqual(oUIArea, undefined, "UI Area should have been created.");
 	});
@@ -47,28 +47,28 @@ sap.ui.define([
 	QUnit.test("MultipleRootOk", function(assert) {
 		jQuery(".test").root();
 
-		var oUIArea = UIArea.registry.get("uiArea2");
+		var oUIArea = UIAreaRegistry.get("uiArea2");
 		assert.notStrictEqual(oUIArea, null, "UI Area 2 should have been created.");
 		assert.notStrictEqual(oUIArea, undefined, "UI Area 2 should have been created.");
 
-		oUIArea = UIArea.registry.get("uiArea3");
+		oUIArea = UIAreaRegistry.get("uiArea3");
 		assert.notStrictEqual(oUIArea, null, "UI Area 3 should have been created.");
 		assert.notStrictEqual(oUIArea, undefined, "UI Area 3 should have been created.");
 	});
 
 	QUnit.test("MultipleRootAndSliceOk", function(assert) {
-		var iNo1 = UIArea.registry.size;
+		var iNo1 = UIAreaRegistry.size;
 
 		jQuery(".test1").root();
 
-		var iNo2 = UIArea.registry.size;
+		var iNo2 = UIAreaRegistry.size;
 		assert.strictEqual(iNo2, iNo1 + 3, "Exaclty three UIAreas should have been created.");
 
-		var oUIArea = UIArea.registry.get("uiArea4");
+		var oUIArea = UIAreaRegistry.get("uiArea4");
 		assert.notStrictEqual(oUIArea, null, "UI Area 4 should have been created.");
 		assert.notStrictEqual(oUIArea, undefined, "UI Area 4 should have been created.");
 
-		var iNo3 = UIArea.registry.size;
+		var iNo3 = UIAreaRegistry.size;
 		assert.strictEqual(iNo3, iNo2, "No additional UIArea should have been created.");
 	});
 
@@ -81,11 +81,11 @@ sap.ui.define([
 	});
 
 	QUnit.test("RootReturnsAllRelevantUIAreasOk", function(assert) {
-		var iNo1 = UIArea.registry.size;
+		var iNo1 = UIAreaRegistry.size;
 
 		jQuery(".test2").root();
 
-		var iNo2 = UIArea.registry.size;
+		var iNo2 = UIAreaRegistry.size;
 		assert.strictEqual(iNo2, iNo1 + 3, "Exactly three UIArea should have been created.");
 
 		assert.strictEqual(jQuery("[id*=uiArea]").root().length + jQuery("[id*=id-]").root().length, iNo2, "jQuery method should return all relevant roots (i.e. UIArea DOMNodes), selector [id*=uiArea]");
@@ -137,7 +137,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("GetUIAreasOk", function(assert) {
-		var iNo = UIArea.registry.size;
+		var iNo = UIAreaRegistry.size;
 
 		var aUIAreas = jQuery("div").uiarea();
 

package/test/sap/ui/core/qunit/loader/syncMode_unavoidablySync.qunit.js

@@ -7,7 +7,7 @@ sap.ui.require([
 ], function(Log, ObjectPath) {
 	"use strict";
 
-
+	const privateLoaderAPI = sap.ui.loader._;
 
 	//****************************************************
 	// module loading (require/declare/define)
@@ -55,6 +55,59 @@ sap.ui.require([
 
 	});
 
+	QUnit.test("jQuery.sap.require, mismatch in jQuery.sap.declare", function (assert) {
+
+		const SCENARIO = "mismatchOfDeclare";
+		const MODULE_A = `${SCENARIO}/moduleA`;
+		const MODULE_B = `${SCENARIO}/moduleB`;
+		const MODULE_C = `${SCENARIO}/moduleC`;
+		const toDot = (mod) => mod.replace(/\//g, "."); // create dot notation
+
+		// 'moduleA' has a dependency to 'moduleB', but 'moduleB' declares itself as 'moduleC'
+		// After loading 'moduleA', 'moduleB' and 'moduleC' both should be READY. This is loader specific behavior.
+		//
+		// As 'moduleB/C' only writes to the global name 'moduleC', 'moduleB' has an export of `undefined`.
+		// This is module specific behavior, not related to the loader.
+		this.server.respondWith(/moduleA/, `
+jQuery.sap.declare("${toDot(MODULE_A)}");
+jQuery.sap.require("${toDot(MODULE_B)}");
+${toDot(MODULE_A)} = "A";
+`);
+		this.server.respondWith(/moduleB/, `
+jQuery.sap.declare("${toDot(MODULE_C)}");
+${toDot(MODULE_C)} = "C";
+`);
+
+		assert.equal(ObjectPath.get(`${toDot(MODULE_A)}`), undefined, "global property for 'moduleA' should be undefined");
+		assert.ok(!sap.ui.require(MODULE_A), "'moduleA' should not be declared");
+		assert.equal(ObjectPath.get(`${toDot(MODULE_B)}`), undefined, "global property for 'moduleB' should be undefined");
+		assert.ok(!sap.ui.require(MODULE_B), "'moduleB' should not be declared");
+		assert.equal(ObjectPath.get(`${toDot(MODULE_B)}`), undefined, "global property for 'moduleC' should be undefined");
+		assert.ok(!sap.ui.require(MODULE_C), "'moduleC' should not be declared");
+
+		jQuery.sap.require(`${toDot(MODULE_A)}`);
+		assert.equal(ObjectPath.get(`${toDot(MODULE_A)}`), "A", "require of 'moduleA' should have loaded 'moduleA'");
+		assert.ok(sap.ui.require(MODULE_A), "'moduleA' should be declared");
+		assert.equal(privateLoaderAPI.getModuleState(MODULE_B + ".js"), 4, "'moduleB' should be READY");
+		assert.equal(ObjectPath.get(`${toDot(MODULE_B)}`), undefined, "require of 'moduleA' should have loaded 'moduleB' (transitively)");
+		assert.equal(sap.ui.require(MODULE_B), undefined, "'moduleB' should have the expected export");
+		assert.equal(privateLoaderAPI.getModuleState(MODULE_C + ".js"), 4, "'moduleC' should be READY");
+		assert.equal(ObjectPath.get(`${toDot(MODULE_C)}`), "C", "require of 'moduleA' should have loaded 'moduleC' (transitively)");
+		assert.equal(sap.ui.require(MODULE_C), "C", "'moduleC' should have the expected export ('C')");
+
+		const done = assert.async();
+		sap.ui.require([
+			MODULE_B,
+			MODULE_C
+		], function(moduleB, moduleC) {
+			assert.strictEqual(moduleB, undefined, "export of 'moduleB' should be the expected one (undefined)");
+			assert.strictEqual(moduleC, "C", "export of 'moduleC' should be the expected one ('C')");
+			done();
+		}, function() {
+			assert.ok(false, "requring 'moduleB' and 'moduleC' should not fail");
+		});
+	});
+
 	QUnit.test("jQuery.sap.require, nested + cyclic", function (assert) {
 
 		this.server.respondWith(/first/, 'jQuery.sap.declare("my.first.module");' +

package/test/sap/ui/core/qunit/messages/messagesGeneral.qunit.js

@@ -31,7 +31,9 @@ sap.ui.define([
 
 	var oFakeMsgProcessor = {
 		_getFunctionImportMetadata: function(){},
-		_getReducedPath : function(){},
+		_getReducedPath : function (sPath) {
+			return sPath;
+		},
 		resolve: function(){},
 		_isCollection: function(){return false;}
 	};

package/test/sap/ui/core/qunit/mockserver/testdata/shopping/Products.json

@@ -13,7 +13,7 @@
 		"Id": "HT-1000",
 		"ImageUrl": "../localService/mockdata/images/HT-1000.jpg",
 		"IsFavoriteOfCurrentUser": false,
-		"LastModified": "/Date(1443183165000)/",
+		"LastModified": "2015-09-25T14:12:45",
 		"MainCategoryId": "Computer Systems",
 		"MainCategoryName": "Computer Systems",
 		"MeasureUnit": "each",

package/test/sap/ui/core/qunit/model/FilterProcessor.qunit.js

@@ -421,14 +421,6 @@ sap.ui.define([
 
 	});
 
-	//*********************************************************************************************
-	QUnit.test("combineFilters: filter c'tor throws error", function (assert) {
-		// code under test
-		assert.throws(() => {
-			FilterProcessor.combineFilters([Filter.NONE], [Filter.NONE]);
-		}, new Error("Filter.NONE not allowed in multiple filter"));
-	});
-
 	//*********************************************************************************************
 	QUnit.test("combineFilters: groupFilter throws error", function (assert) {
 		const aApplicationFilters = "~ApplicationFilters";
@@ -452,6 +444,28 @@ sap.ui.define([
 		}, oError);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("combineFilters: no Error if control or application filter is Filter.NONE", function (assert) {
+		const oFilterProcessorMock = this.mock(FilterProcessor);
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~Filters").returns(Filter.NONE);
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~ApplicationFilters").returns("~someGroupedFilter");
+
+		// code under test
+		assert.strictEqual(FilterProcessor.combineFilters("~Filters", "~ApplicationFilters"), Filter.NONE);
+
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~Filters").returns("~someGroupedFilter");
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~ApplicationFilters").returns(Filter.NONE);
+
+		// code under test
+		assert.strictEqual(FilterProcessor.combineFilters("~Filters", "~ApplicationFilters"), Filter.NONE);
+
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~Filters").returns(Filter.NONE);
+		oFilterProcessorMock.expects("groupFilters").withExactArgs("~ApplicationFilters").returns(Filter.NONE);
+
+		// code under test
+		assert.strictEqual(FilterProcessor.combineFilters("~Filters", "~ApplicationFilters"), Filter.NONE);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("apply: propagates error from groupFilters", function (assert) {
 		const aFilters = ["~oFilter", Filter.NONE];

package/test/sap/ui/core/qunit/mvc/AnyView.qunit.js

@@ -207,6 +207,9 @@ sap.ui.define([
 			}
 		});
 
+		/**
+		 * @deprecated since 1.120
+		 */
 		QUnit.test("Cloning: Event listeners are called on the correct controller instance", function(assert) {
 			var fnWaitForNestedViews = function (oView) {
 

package/test/sap/ui/core/qunit/mvc/Controller.qunit.js

@@ -3,10 +3,11 @@ sap.ui.define([
 	'sap/ui/core/Component',
 	'sap/ui/core/Fragment',
 	'sap/ui/core/Element',
+	'sap/ui/core/ElementRegistry',
 	'sap/ui/core/mvc/XMLView',
 	'sap/ui/core/mvc/Controller',
 	'sap/base/Log'
-], function(Component, Fragment, Element, XMLView, Controller, Log) {
+], function(Component, Fragment, Element, ElementRegistry, XMLView, Controller, Log) {
 	"use strict";
 
 	QUnit.module("Controller.create API");
@@ -70,7 +71,7 @@ sap.ui.define([
 
 	// helper function to check if a view fully destroys itself
 	function checkForDanglingControls(assert, oView) {
-		var aDangling = Element.registry.filter(function(o) {
+		var aDangling = ElementRegistry.filter(function(o) {
 			return o.getId().startsWith(oView.getId());
 		});
 

package/test/sap/ui/core/qunit/mvc/EventHandlerResolver.qunit.js

@@ -134,12 +134,12 @@ sap.ui.define([
 
 		// immediately call the resolving handler
 		EventHandlerResolver.resolveEventHandler("Module.someMethod()", oController, {Module: {}});
-		sinon.assert.calledWithExactly(logSpy, "Event handler name 'Module.someMethod()' could not be resolved to an event handler function");
+		assert.ok(logSpy.calledWith(sinon.match(/Event handler name 'Module.someMethod\(\)' could not be resolved to an event handler function/)));
 		logSpy.resetHistory();
 
 		// test without associated controller
 		EventHandlerResolver.resolveEventHandler("Module.someMethod()", null, {Module: {}});
-		sinon.assert.calledWithExactly(logSpy, "Event handler name 'Module.someMethod()' could not be resolved to an event handler function");
+		assert.ok(logSpy.calledWith(sinon.match(/Event handler name 'Module.someMethod\(\)' could not be resolved to an event handler function/)));
 
 		logSpy.restore();
 	});

package/test/sap/ui/core/qunit/mvc/View.qunit.js

@@ -862,41 +862,44 @@ sap.ui.define([
 		}.bind(this));
 	});
 
-	QUnit.test("Async typed Views embedded in XMLView", function(assert) {
-		return XMLView.create({
+	QUnit.test("Async typed Views embedded in XMLView", async function(assert) {
+		const oXMLView = await XMLView.create({
 			viewName : "testdata.mvc.XMLViewEmbeddingTypedViews"
-		}).then(function(oXMLView) {
-			assert.expect(15);
-			assert.equal(this.oAfterInitSpy.callCount, 5, "AfterInit event fired before resolving");
-
-			var oPanel = oXMLView.getContent()[0];
-			var oTypedView1 = oPanel.getContent()[0];
-			assert.ok(oTypedView1, "embedded view without async=true flag has been created");
-			assert.ok(oTypedView1.isA("testdata.mvc.TypedView"), "embedded view is a typed view");
-			assert.ok(oTypedView1.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
-
-			var oTypedView2 = oPanel.getContent()[1];
-			assert.ok(oTypedView2, "embedded view with async=false flag has been created");
-			assert.ok(oTypedView2.isA("testdata.mvc.TypedView"), "embedded view is a typed view");
-			// Note: the async factory should wait for async child views
-			assert.ok(oTypedView2.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
-
-			var oTypedView3 = oPanel.getContent()[2];
-			assert.ok(oTypedView3, "embedded view with async=false flag has been created");
-			assert.ok(oTypedView3.isA("testdata.mvc.TypedView"), "embedded view is a typed view");
-			assert.ok(oTypedView3.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
-
-			var oTypedView4 = oPanel.getContent()[3];
-			assert.ok(oTypedView4, "embedded view with async=true flag has been created");
-			assert.ok(oTypedView4.isA("testdata.mvc.TypedViewWithRenderer"), "embedded view is a typed view");
-			assert.ok(oTypedView4.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
-			assert.equal(oTypedView4.getMetadata().getRendererName(), "testdata.mvc.TypedViewWithRendererRenderer", "Own Renderer set correctly");
-			assert.strictEqual(
-				oTypedView4.getMetadata().getRenderer(),
-				sap.ui.require("testdata/mvc/TypedViewWithRendererRenderer"),
-				"Own Renderer set correctly");
-
-			oXMLView.destroy();
-		}.bind(this));
+		});
+
+		const oPanel = oXMLView.getContent()[0];
+		const aViews = oPanel.getContent();
+
+		// wait all nested views to be processed first
+		await Promise.all(aViews.map((oView) => oView.loaded()));
+
+		assert.equal(this.oAfterInitSpy.callCount, 5, "AfterInit event fired before resolving");
+
+		var oTypedView1 = oPanel.getContent()[0];
+		assert.ok(oTypedView1, "embedded view has been created");
+		assert.ok(oTypedView1.isA("testdata.mvc.TypedView"), "embedded view is a typed view");
+		assert.ok(oTypedView1.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
+
+		var oTypedView2 = oPanel.getContent()[1];
+		assert.ok(oTypedView2, "another embedded view has been created");
+		assert.ok(oTypedView2.isA("example.mvc.TypedView2"), "embedded view is a typed view");
+		assert.ok(oTypedView2.byId("Button1").isA("sap.m.Button"), "Content created successfully");
+
+		var oTypedView3 = oPanel.getContent()[2];
+		assert.ok(oTypedView3, "embedded view with its class name defined as tag name has been created");
+		assert.ok(oTypedView3.isA("testdata.mvc.TypedView"), "embedded view is a typed view");
+		assert.ok(oTypedView3.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
+
+		var oTypedView4 = oPanel.getContent()[3];
+		assert.ok(oTypedView4, "embedded view with its class name defined as tag name has been created");
+		assert.ok(oTypedView4.isA("testdata.mvc.TypedViewWithRenderer"), "embedded view is a typed view");
+		assert.ok(oTypedView4.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
+		assert.equal(oTypedView4.getMetadata().getRendererName(), "testdata.mvc.TypedViewWithRendererRenderer", "Own Renderer set correctly");
+		assert.strictEqual(
+			oTypedView4.getMetadata().getRenderer(),
+			sap.ui.require("testdata/mvc/TypedViewWithRendererRenderer"),
+			"Own Renderer set correctly");
+
+		oXMLView.destroy();
 	});
 });