@openui5/sap.ui.core 1.119.1 → 1.120.1

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/ODataModel_legacyAPIs.qunit.js

@@ -1939,17 +1939,17 @@ sap.ui.define([
 	});
 
 	QUnit.test("Empty Arguments", function(assert) {
-		this.oModel.checkFilterOperation();
+		this.oModel.checkFilter();
 		assert.ok(true, "No arguments lead to a positive result");
 
-		this.oModel.checkFilterOperation([]);
+		this.oModel.checkFilter([]);
 		assert.ok(true, "Empty array lead to a positive result");
 	});
 
 	QUnit.test("Simple Filters - Supported are OK", function(assert) {
 		// comma separated syntax
 		var oSupported = new Filter("x", FilterOperator.NE, "Foo");
-		this.oModel.checkFilterOperation(oSupported);
+		this.oModel.checkFilter(oSupported);
 		assert.ok(true, "Valid operators are supported");
 
 		// object syntax
@@ -1958,12 +1958,12 @@ sap.ui.define([
 			operator: FilterOperator.NE,
 			value1: "FooBar"
 		});
-		this.oModel.checkFilterOperation(oSupported2);
+		this.oModel.checkFilter(oSupported2);
 		assert.ok(true, "Valid operators are supported");
 
 		// local fnTest - comma separated (should be ignored)
 		var oSupported3 = new Filter("z", function() {});
-		this.oModel.checkFilterOperation(oSupported3);
+		this.oModel.checkFilter(oSupported3);
 		assert.ok(true, true, "local fnTest is ignored (comma separated syntax)");
 
 		// local fnTest - object syntax (should be ignored)
@@ -1971,7 +1971,7 @@ sap.ui.define([
 			path: "z",
 			test: function() {}
 		});
-		this.oModel.checkFilterOperation(oSupported4);
+		this.oModel.checkFilter(oSupported4);
 		assert.ok(true, "local fnTest is ignored (object syntax)");
 	});
 
@@ -1985,7 +1985,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported3);
+				this.oModel.checkFilter(oUnsupported3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators are not supported (object syntax)"
@@ -2000,7 +2000,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported4);
+				this.oModel.checkFilter(oUnsupported4);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators are not supported (object syntax)"
@@ -2017,7 +2017,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported3);
+				this.oModel.checkFilter(oUnsupported3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators are not supported (object syntax)"
@@ -2032,7 +2032,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported4);
+				this.oModel.checkFilter(oUnsupported4);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators are not supported (object syntax)"
@@ -2049,7 +2049,7 @@ sap.ui.define([
 			and: true
 		});
 
-		this.oModel.checkFilterOperation(oMultiFilter);
+		this.oModel.checkFilter(oMultiFilter);
 		assert.ok(true, "Valid operators in multi-filter are supported (object syntax)");
 	});
 
@@ -2065,7 +2065,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -2078,7 +2078,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -2088,7 +2088,7 @@ sap.ui.define([
 		var oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -2102,7 +2102,7 @@ sap.ui.define([
 		oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -2121,7 +2121,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -2134,7 +2134,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -2144,7 +2144,7 @@ sap.ui.define([
 		var oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -2159,7 +2159,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -2180,7 +2180,7 @@ sap.ui.define([
 
 		var oMultiFilter3 = new Filter([oMultiFilter2, oFilter4]);
 
-		this.oModel.checkFilterOperation(oMultiFilter3);
+		this.oModel.checkFilter(oMultiFilter3);
 		assert.ok(true, "Valid operators in multi-filter are supported");
 	});
 
@@ -2203,7 +2203,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter3);
+				this.oModel.checkFilter(oMultiFilter3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported"
@@ -2237,7 +2237,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter3);
+				this.oModel.checkFilter(oMultiFilter3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported"

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

@@ -2135,7 +2135,7 @@ sap.ui.define([
 			"sap/ui/model/odata/v2/ODataTreeBinding", "sap/ui/model/odata/ODataTreeBindingAdapter"],
 			function(ODataTreeBinding, ODataTreeBindingAdapter) {
 				var oBinding = new ODataTreeBinding({
-					checkFilterOperation: function() { }
+					checkFilter: function() { }
 				}, "/");
 				ODataTreeBindingAdapter.apply(oBinding);
 

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"));
 		});
 	});