@openui5/sap.ui.core 1.119.0 → 1.120.0

package/test/sap/ui/core/qunit/odata/AnnotationHelper.qunit.js

@@ -11,6 +11,9 @@ sap.ui.define([
 	"sap/ui/model/odata/AnnotationHelper",
 	"sap/ui/model/odata/_AnnotationHelperBasics",
 	"sap/ui/model/odata/_AnnotationHelperExpression",
+	"sap/ui/model/odata/v2/ODataModel",
+	"sap/ui/test/TestUtils",
+	// following imports are only used while template processing
 	"sap/ui/model/odata/type/Boolean",
 	"sap/ui/model/odata/type/Byte",
 	"sap/ui/model/odata/type/DateTime",
@@ -25,11 +28,10 @@ sap.ui.define([
 	"sap/ui/model/odata/type/Single",
 	"sap/ui/model/odata/type/String",
 	"sap/ui/model/odata/type/Time",
-	"sap/ui/model/odata/v2/ODataModel",
-	"sap/ui/test/TestUtils"
+	"sap/ui/model/odata/v4/ODataUtils",
+	"sap/ui/thirdparty/URITemplate"
 ], function (Log, ObjectPath, BindingParser, ManagedObject, UI5Date, JSONModel, AnnotationHelper, Basics, Expression,
-		Boolean, Byte, DateTime, DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, SByte, Single, StringType,
-		Time, ODataModel, TestUtils
+		ODataModel, TestUtils
 ) {
 	/*global QUnit, sinon */
 	/*eslint max-nested-callbacks: 0, no-multi-str: 0, no-warning-comments: 0*/

package/test/sap/ui/core/qunit/odata/ODataAnnotations.qunit.js

@@ -395,6 +395,9 @@ sap.ui.define([
 			var oMetadata = oModel.getServiceMetadata();
 			var oAnnotations = oModel.getServiceAnnotations();
 
+			// private member used because oModel.annotationsLoaded() returns null
+			oModel.pAnnotationsLoaded.catch(() => {/* avoid Uncaught (in promise) */});
+
 			if (bServiceValid) {
 				if (sAnnotationsValid === "all" || sAnnotationsValid === "some") {
 					// This should have worked.
@@ -462,6 +465,9 @@ sap.ui.define([
 					fnRejectMetadata = reject;
 				});
 
+			// private member used because oModel.annotationsLoaded() returns null
+			oModel.pAnnotationsLoaded.catch(() => {/* avoid Uncaught (in promise) */});
+
 			// Metadata must be loaded before annotations
 			oModel.attachMetadataLoaded(function() {
 				bMetadataLoaded = true;
@@ -591,6 +597,8 @@ sap.ui.define([
 					fnRejectMetadata = reject;
 				});
 
+			oModel.annotationsLoaded().catch(() => {/* avoid Uncaught (in promise) */});
+
 			// Metadata must be loaded before annotations
 			oModel.attachMetadataLoaded(function() {
 				bMetadataLoaded = true;
@@ -650,6 +658,7 @@ sap.ui.define([
 					oModel.destroy();
 				});
 			} else if (!bServiceValid){
+				oAnnotationsPromise.catch(() => {/* avoid Uncaught (in promise) */});
 				return oMetadataPromise.then(function () {
 					assert.ok(false);
 				}, function () {
@@ -723,6 +732,9 @@ sap.ui.define([
 					fnRejectMetadata = reject;
 				});
 
+			// private member used because oModel.annotationsLoaded() returns null
+			oModel.pAnnotationsLoaded.catch(() => {/* avoid Uncaught (in promise) */});
+
 			// Use internal metadata loaded event, because in case of joined loading, the real one
 			// does not fire until Annotations are there
 			if (oModel.oMetadata.getServiceMetadata()){
@@ -853,6 +865,8 @@ sap.ui.define([
 					fnRejectMetadata = reject;
 				});
 
+			oModel.annotationsLoaded().catch(() => {/* avoid Uncaught (in promise) */});
+
 			// Use internal metadata loaded event, because in case of joined loading, the real one
 			// does not fire until Annotations are there
 			if (oModel.oMetadata.getServiceMetadata()){
@@ -978,6 +992,8 @@ sap.ui.define([
 			loadMetadataAsync: false
 		});
 
+		// private member used because oModel.annotationsLoaded() returns null
+		oModel.pAnnotationsLoaded.catch(() => {/* avoid Uncaught (in promise) */});
 
 		// Everything should be ready right now due to synchronous operation mode
 		var oMetadata = oModel.getServiceMetadata();

package/test/sap/ui/core/qunit/odata/ODataMetaModel.qunit.js

@@ -2296,7 +2296,8 @@ sap.ui.define([
 	// Note: http://www.html5rocks.com/en/tutorials/es6/promises/ says that
 	// "Any errors thrown in the constructor callback will be implicitly passed to reject()."
 	QUnit.test("Errors thrown inside load(), async = false", function (assert) {
-		var oDataModel, oError;
+		var oDataModel, oError,
+			that = this;
 
 		this.oLogMock.expects("warning").exactly(1)
 			.withExactArgs(sIgnoreThisWarning);
@@ -2322,6 +2323,12 @@ sap.ui.define([
 				throw new Error("Unexpected success");
 			}, function (ex0) {
 				assert.strictEqual(ex0, oError, ex0.message);
+
+				that.mock(oDataModel.oMetadata).expects("refresh").rejects(oError);
+				that.mock(Log).expects("fatal").withExactArgs(oError);
+
+				// code under test (failed refresh results in console error)
+				oDataModel.refreshMetadata();
 			});
 		});
 	});

package/test/sap/ui/core/qunit/odata/ODataUtils.qunit.js

@@ -18,7 +18,11 @@ sap.ui.define([
 	}
 
 	//*********************************************************************************************
-	QUnit.module("sap.ui.model.odata.ODataUtils");
+	QUnit.module("sap.ui.model.odata.ODataUtils", {
+		before() {
+			this.__ignoreIsolatedCoverage__ = true;
+		}
+	});
 
 	//*********************************************************************************************
 	QUnit.test("formatValue", function(assert) {

package/test/sap/ui/core/qunit/odata/type/DateTimeBase.qunit.js

@@ -33,11 +33,11 @@ sap.ui.define([
 		oDateTimeUTC = UI5Date.getInstance(Date.UTC(2014, 10, 27, 13, 47, 26)),
 		oDateTimeWithMS = UI5Date.getInstance(2014, 10, 27, 13, 47, 26, 456),
 		sFormattedDateOnly = "Nov 27, 2014",
-		sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM",
+		sFormattedDateTime = "Nov 27, 2014, 1:47:26\u202FPM",
 //		sFormattedDateTimeWithMS = "Nov 27, 2014, 1:47:26.456 PM",
 		iFullYear = UI5Date.getInstance().getFullYear(),
 		oMessages = {
-			"EnterDateTime" : "EnterDateTime Dec 31, " + iFullYear + ", 11:59:58 PM",
+			"EnterDateTime" : "EnterDateTime Dec 31, " + iFullYear + ", 11:59:58\u202FPM",
 			"EnterDate" : "EnterDate Dec 31, " + iFullYear
 		};
 
@@ -291,7 +291,7 @@ sap.ui.define([
 		QUnit.test("format option UTC", function (assert) {
 			var oType = createInstance(sTypeName, {UTC : true}),
 				oDateTime = UI5Date.getInstance(Date.UTC(2014, 10, 27, 13, 47, 26)),
-				sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM";
+				sFormattedDateTime = "Nov 27, 2014, 1:47:26\u202FPM";
 
 			assert.strictEqual(oType.formatValue(oDateTime, "string"), sFormattedDateTime);
 			assert.deepEqual(oType.parseValue(sFormattedDateTime, "string"), oDateTime);
@@ -983,7 +983,7 @@ sap.ui.define([
 	QUnit.test("V4: format option UTC", function (assert) {
 		var oType = new DateTimeOffset({UTC : true}, {V4 : true}),
 			sDateTime = "2014-11-27T13:47:26Z",
-			sFormattedDateTime = "Nov 27, 2014, 1:47:26 PM",
+			sFormattedDateTime = "Nov 27, 2014, 1:47:26\u202FPM",
 			oFormattedDateTime = UI5Date.getInstance(Date.UTC(2014, 10, 27, 13, 47, 26));
 
 		oType._resetModelFormatter();

package/test/sap/ui/core/qunit/odata/type/DateTimeWithTimezone.qunit.js

@@ -323,19 +323,19 @@ sap.ui.define([
 }, {
 	formatOptions : {showDate : true, showTime : true, showTimezone : true},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "Europe/Berlin"],
-	result : "Dec 30, 2021, 5:00:00 AM Europe, Berlin"
+	result : "Dec 30, 2021, 5:00:00\u202FAM Europe, Berlin"
 }, {
 	formatOptions : {showDate : true, showTime : true, showTimezone : false},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "Europe/Berlin"],
-	result : "Dec 30, 2021, 5:00:00 AM"
+	result : "Dec 30, 2021, 5:00:00\u202FAM"
 }, {
 	formatOptions : {showDate : true, showTime : true, showTimezone : true},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "America/New_York"],
-	result : "Dec 29, 2021, 11:00:00 PM Americas, New York"
+	result : "Dec 29, 2021, 11:00:00\u202FPM Americas, New York"
 }, {
 	formatOptions : {showDate : true, showTime : true, showTimezone : false},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "America/New_York"],
-	result : "Dec 29, 2021, 11:00:00 PM"
+	result : "Dec 29, 2021, 11:00:00\u202FPM"
 }, {
 	formatOptions : {showDate : false, showTime : false, showTimezone : true},
 	values : [null, "Europe/Berlin"],
@@ -351,7 +351,7 @@ sap.ui.define([
 }, {
 	formatOptions : {showDate : false, showTime : true, showTimezone : true},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "America/New_York"],
-	result : "11:00:00 PM Americas, New York"
+	result : "11:00:00\u202FPM Americas, New York"
 }, {
 	formatOptions : {showDate : true, showTime : false, showTimezone : false},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "America/New_York"],
@@ -359,7 +359,7 @@ sap.ui.define([
 }, {
 	formatOptions : {showDate : false, showTime : true, showTimezone : false},
 	values : [UI5Date.getInstance(Date.UTC(2021, 11, 30, 4, 0, 0)), "America/New_York"],
-	result : "11:00:00 PM"
+	result : "11:00:00\u202FPM"
 }].forEach(function (oFixture, i) {
 	QUnit.test("formatValue: Integrative tests: " + oFixture.result + ", #" + i, function (assert) {
 		var oType = new DateTimeWithTimezone(oFixture.formatOptions);

package/test/sap/ui/core/qunit/odata/type/Time.qunit.js

@@ -114,11 +114,11 @@ sap.ui.define([
 		assert.strictEqual(oType.formatValue(null, "foo"), null, "null");
 
 		assert.strictEqual(oType.formatValue(oTime, "any"), oTime, "null");
-		assert.strictEqual(oType.formatValue(oTime, "string"), "1:53:49 PM", "null");
+		assert.strictEqual(oType.formatValue(oTime, "string"), "1:53:49\u202FPM", "null");
 
 		this.mock(oType).expects("getPrimitiveType").withExactArgs("sap.ui.core.CSSSize")
 			.returns("string");
-		assert.strictEqual(oType.formatValue(oTime, "sap.ui.core.CSSSize"), "1:53:49 PM");
+		assert.strictEqual(oType.formatValue(oTime, "sap.ui.core.CSSSize"), "1:53:49\u202FPM");
 	});
 
 	//*********************************************************************************************
@@ -224,8 +224,7 @@ sap.ui.define([
 				assert.ok(false);
 			} catch (e) {
 				assert.ok(e instanceof ValidateException, "ValidateException: exception");
-				assert.strictEqual(e.message, "EnterTime 11:59:58 PM",
-					"ValidateException: message");
+				assert.strictEqual(e.message, "EnterTime 11:59:58\u202FPM", "ValidateException: message");
 			}
 		});
 	});

package/test/sap/ui/core/qunit/odata/type/TimeOfDay.qunit.js

@@ -181,16 +181,16 @@ sap.ui.define([
 		assert.strictEqual(oType.formatValue(null, "foo"), null);
 
 		assert.strictEqual(oType.formatValue(sValue, "any"), sValue);
-		assert.strictEqual(oType.formatValue(sValue, "string"), "1:53:49 PM");
+		assert.strictEqual(oType.formatValue(sValue, "string"), "1:53:49\u202FPM");
 
-		assert.strictEqual(oType.formatValue("13:53:49", "string"), "1:53:49 PM");
+		assert.strictEqual(oType.formatValue("13:53:49", "string"), "1:53:49\u202FPM");
 
 		assert.deepEqual(oType.formatValue("02:53:49", "object"), oDate, "Object");
 		assert.deepEqual(oType.formatValue(sValue, "object"), oDateWithMS, "Object with ms");
 
 		this.mock(oType).expects("getPrimitiveType").withExactArgs("sap.ui.core.CSSSize")
 			.returns("string");
-		assert.strictEqual(oType.formatValue(sValue, "sap.ui.core.CSSSize"), "1:53:49 PM");
+		assert.strictEqual(oType.formatValue(sValue, "sap.ui.core.CSSSize"), "1:53:49\u202FPM");
 	});
 
 	//*********************************************************************************************
@@ -323,7 +323,7 @@ sap.ui.define([
 			var oType = new TimeOfDay({}, {nullable : false});
 
 			assert.throws(oType.validateValue.bind(oType, null),
-				new ValidateException("EnterTime 11:59:58 PM"));
+				new ValidateException("EnterTime 11:59:58\u202FPM"));
 		});
 	});
 

package/test/sap/ui/core/qunit/odata/v2/ODataListBindingNoFakeService.qunit.js

@@ -1072,14 +1072,15 @@ sap.ui.define([
 			aFullTargets : ["~parentEntity~", "~deepPath~(~keyPredicate~)/B"],
 			message : "in"
 		}]
-	}, { // BCP 2370088390: only messages on transient entries (filter null expected)
+	}, { // BCP 2370088390: only messages for transient entries (Filter.NONE expected)
 		aCreatedContextDeepPaths : ["~deepPath~(~uid0~)", "~deepPath~(~uid1~)", "~deepPath~(~uid2~)"],
 		aFilterForPredicate : [],
 		aMessages : [
 			{aFullTargets : ["~deepPath~(~uid0~)"], message : "in"},
 			{aFullTargets : ["~deepPath~(~uid1~)/property"], message : "in"}
-		]
-	}, { // BCP 2370088390: messages on both persistent and transient entries (filter w/o transient expected)
+		],
+		bFilterNoneExpected : true
+	}, { // BCP 2370088390: messages for both persistent and transient entries (filter w/o transient expected)
 		aCreatedContextDeepPaths : ["~deepPath~(~uid0~)", "~deepPath~(~uid1~)", "~deepPath~(~uid2~)"],
 		aFilterForPredicate : ["(~keyPredicate~)"],
 		aMessages : [
@@ -1098,7 +1099,7 @@ sap.ui.define([
 			aCreatedContexts = (oFixture.aCreatedContextDeepPaths || [])
 				.map((sDeepPath) => ({ getDeepPath() {return sDeepPath;} })),
 			aFilterForPredicate = oFixture.aFilterForPredicate,
-			aFilters = [],
+			aFilters = oFixture.bFilterNoneExpected ? [Filter.NONE] : [],
 			aMessages = oFixture.aMessages,
 			oModel = {getMessagesByPath : function () {}},
 			oBinding = {
@@ -1940,6 +1941,12 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("getDownloadUrl: return null for Filter.NONE", function (assert) {
+		// code under test
+		assert.strictEqual(ODataListBinding.prototype.getDownloadUrl.call({oCombinedFilter : Filter.NONE}), null);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("_initSortersFilters: getResolvedPath is called", function (assert) {
 		var oBinding = {getResolvedPath : function () {}};
@@ -2506,8 +2513,10 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("getContexts: do not load data in case of transient parent", function (assert) {
+[false, true].forEach((bFilterNone) => {
+	QUnit.test("getContexts: do not load data: " + bFilterNone ? "Filter.NONE" : "transient parent", function (assert) {
 		var oBinding = {
+				oCombinedFilter : bFilterNone ? Filter.NONE : undefined,
 				bLengthFinal : true,
 				bRefresh : true,
 				_fireChange : function () {},
@@ -2523,7 +2532,10 @@ sap.ui.define([
 		this.mock(oBinding).expects("_updateLastStartAndLength")
 			.withExactArgs(0, 2, undefined, undefined);
 		this.mock(oBinding).expects("_getContexts").withExactArgs(0, 2).returns(aContexts);
-		this.mock(oBinding).expects("_hasTransientParentContext").withExactArgs().returns(true);
+		this.mock(oBinding).expects("_hasTransientParentContext")
+			.withExactArgs()
+			.exactly(bFilterNone ? 0 : 1)
+			.returns(true);
 		this.mock(oBinding).expects("isFirstCreateAtEnd").withExactArgs().returns(false);
 		this.mock(oBinding).expects("_fireChange").withExactArgs({reason : ChangeReason.Change});
 
@@ -2532,6 +2544,7 @@ sap.ui.define([
 
 		assert.strictEqual(aResultContexts, aContexts);
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("_updateLastStartAndLength: bKeepCurrent = false", function (assert) {
@@ -3344,7 +3357,8 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-	QUnit.test("filter: removes persisted created entries", function (assert) {
+[false, true].forEach((bFilterNone) => {
+	QUnit.test("filter: removes persisted created entries, with Filter.NONE: " + bFilterNone, function (assert) {
 		var oRemoveExpectation, oResetDataExpectation,
 			aApplicationFilters = [],
 			oBinding = {
@@ -3360,7 +3374,7 @@ sap.ui.define([
 				useClientMode : function () {}
 			},
 			oBindingMock = this.mock(oBinding),
-			aFilters = [];
+			aFilters = bFilterNone ? [Filter.NONE] : [];
 
 		this.mock(oBinding.oModel).expects("checkFilterOperation")
 			.withExactArgs(sinon.match.same(aFilters));
@@ -3371,11 +3385,12 @@ sap.ui.define([
 		}.bind(this)());
 		this.mock(FilterProcessor).expects("combineFilters")
 			.withExactArgs(sinon.match.same(aFilters), sinon.match.same(aApplicationFilters))
-			.returns("~oCombinedFilter");
+			.returns(bFilterNone ? Filter.NONE : "~oCombinedFilter");
 		oBindingMock.expects("useClientMode").withExactArgs().twice().returns(false);
-		oBindingMock.expects("createFilterParams").withExactArgs("~oCombinedFilter");
-		oBindingMock.expects("addComparators").withExactArgs(sinon.match.same(aFilters));
-		oBindingMock.expects("addComparators").withExactArgs(sinon.match.same(aApplicationFilters));
+		oBindingMock.expects("createFilterParams").exactly(bFilterNone ? 0 : 1).withExactArgs("~oCombinedFilter");
+		oBindingMock.expects("addComparators").exactly(bFilterNone ? 0 : 1).withExactArgs(sinon.match.same(aFilters));
+		oBindingMock.expects("addComparators").exactly(bFilterNone ? 0 : 1)
+			.withExactArgs(sinon.match.same(aApplicationFilters));
 		oRemoveExpectation = oBindingMock.expects("_removePersistedCreatedContexts")
 			.withExactArgs();
 		oResetDataExpectation = oBindingMock.expects("resetData").withExactArgs();
@@ -3391,9 +3406,10 @@ sap.ui.define([
 		assert.strictEqual(ODataListBinding.prototype.filter.call(oBinding, aFilters), oBinding);
 
 		assert.strictEqual(oBinding.aFilters, aFilters);
-		assert.strictEqual(oBinding.oCombinedFilter, "~oCombinedFilter");
+		assert.strictEqual(oBinding.oCombinedFilter, bFilterNone ? Filter.NONE : "~oCombinedFilter");
 		assert.ok(oResetDataExpectation.calledImmediatelyAfter(oRemoveExpectation));
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("filter: handle created persisted in Client mode", function (assert) {
@@ -3642,15 +3658,22 @@ sap.ui.define([
 	bResolved : true,
 	bResult : false,
 	bTransient : false
+}, {
+	filterNone : Filter.NONE,
+	bResolved : undefined,
+	bResult : true,
+	bTransient : undefined
 }].forEach(function (oFixture, i) {
 	QUnit.test("resetData: set bLengthFinal #" + i, function (assert) {
 		var oBinding = {
+				oCombinedFilter : oFixture.filterNone,
 				_hasTransientParentContext : function () {},
 				isResolved : function () {}
 			};
 
 		this.mock(oBinding).expects("_hasTransientParentContext")
 			.withExactArgs()
+			.exactly(oFixture.bTransient === undefined ? 0 : 1)
 			.returns(oFixture.bTransient);
 		this.mock(oBinding).expects("isResolved")
 			.withExactArgs()