@openui5/sap.ui.core 1.124.0 → 1.124.2

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

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/02/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/03/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/04/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/05/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/06/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/07/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/08/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/09/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/10/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/11/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.124.0" #MainVersion#
+  version: "1.124.2" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

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

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

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

@@ -1351,6 +1351,103 @@ sap.ui.define([
 		}.bind(this));
 	});
 
+	QUnit.test("metadata v4 with sap-system URL parameter", async function(assert) {
+		this.stubGetUriParameters({ sapSystem: "URL_123" });
+
+		this.oComponent = await Component.create({
+			name: "sap.ui.test.v4models.sapSystem"
+		});
+
+		this.assertModelInstances({
+			"v4-ODataModel": this.modelSpy.odataV4,
+			"v4-ODataModel-ServiceOrigin": this.modelSpy.odataV4,
+			"v4-ODataModel-OtherOrigins": this.modelSpy.odataV4
+		});
+
+		// model: "v4-ODataModel"
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service;o=URL_123/'
+		});
+
+		// model: "v4-ODataModel-ServiceOrigin" with a trailing slash and URL Parameters
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/trailing/slash;o=URL_123/?sap-client=foo&sap-server=bar',
+			annotationURI: [
+				'/path/to/odata/service/with/trailing/slash;o=URL_123/annotations.xml?sap-language=EN&sap-client=foo',
+				'test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+			],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// model: "v4-ODataModel-OtherOrigins" with multi origin annotations
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=URL_123/?sap-client=foo&sap-server=bar',
+			annotationURI: ["/path/to/other/odata/service;o=URL_123/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
+							"test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/other/odata/service;o=URL_123/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+							"/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/?sap-language=EN&sap-client=foo",
+							"/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo"
+							],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// destroy the component
+		this.oComponent.destroy();
+
+		// check if all models got destroyed (uses the models from #assertModelInstances)
+		this.assertModelsDestroyed();
+	});
+
+	QUnit.test("metadata v4 with sap-system startup parameter", async function(assert) {
+		this.stubGetUriParameters();
+
+		this.oComponent = await Component.create({
+			name: "sap.ui.test.v4models.sapSystem",
+			componentData: {
+				startupParameters: {
+					"sap-system": "STARTUP123"
+				}
+			}
+		});
+
+		this.assertModelInstances({
+			"v4-ODataModel": this.modelSpy.odataV4,
+			"v4-ODataModel-ServiceOrigin": this.modelSpy.odataV4,
+			"v4-ODataModel-OtherOrigins": this.modelSpy.odataV4
+		});
+
+		// model: "v4-ODataModel"
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service;o=STARTUP123/'
+		});
+
+		// model: "v4-ODataModel-ServiceOrigin" with a trailing slash and URL Parameters
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/trailing/slash;o=STARTUP123/?sap-client=foo&sap-server=bar',
+			annotationURI: [
+				'/path/to/odata/service/with/trailing/slash;o=STARTUP123/annotations.xml?sap-language=EN&sap-client=foo',
+				'test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+			],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// model: "v4-ODataModel-OtherOrigins" with multi origin annotations
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=STARTUP123/?sap-client=foo&sap-server=bar',
+			annotationURI: ["/path/to/other/odata/service;o=STARTUP123/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
+							"test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/other/odata/service;o=STARTUP123/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+							"/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/?sap-language=EN&sap-client=foo",
+							"/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo"
+							],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// destroy the component
+		this.oComponent.destroy();
+
+		// check if all models got destroyed (uses the models from #assertModelInstances)
+		this.assertModelsDestroyed();
+	});
+
 	QUnit.test("metadata v2 with dataSources (extension inheritance)", function(assert) {
 		this.stubGetUriParameters();
 

package/test/sap/ui/core/qunit/component/testdata/v4models/sapSystem/Component.js

@@ -0,0 +1,16 @@
+/*
+ * ${copyright}
+ */
+
+// Provides class sap.ui.test.v4models.sapSystem.Component
+sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent) {
+	"use strict";
+
+	return UIComponent.extend("sap.ui.test.v4models.sapSystem.Component", {
+		interfaces: ["sap.ui.core.IAsyncContentCreation"],
+		metadata: {
+			manifest: "json"
+		}
+	});
+
+});

package/test/sap/ui/core/qunit/component/testdata/v4models/sapSystem/manifest.json

@@ -0,0 +1,102 @@
+{
+
+	"_version": "1.0.0",
+
+	"sap.app": {
+		"_version": "1.0.0",
+		"id": "sap.ui.test.v4models.sapSystem",
+		"type": "application",
+		"applicationVersion": {
+			"version": "1.0.0"
+		},
+		"i18n": "i18n.properties",
+		"title": "{{title}}",
+		"description": "{{description}}",
+		"dataSources": {
+
+			"dataSourceODataV4": {
+				"uri": "/path/to/odata/service/with/trailing/slash/",
+				"type": "OData",
+				"settings": {
+					"annotations": ["originAnnotations", "annotations2"]
+				}
+			},
+
+			"originAnnotations" : {
+				"uri": "/path/to/odata/service/with/trailing/slash/annotations.xml",
+				"type": "ODataAnnotation"
+			},
+
+			"annotations2": {
+				"uri": "path/to/local/odata/annotations/2",
+				"type": "ODataAnnotation"
+			},
+
+
+
+			"ODataWithMultiOriginAnnotations": {
+				"uri": "/path/to/odata/service/with/multi/origin/annotations/",
+				"type": "OData",
+				"settings": {
+					"annotations": ["annotationWithOtherOrigin1", "annotationWithOtherOrigin2", "annotationWithOtherOrigin3", "annotationWithOtherOrigin4"]
+				}
+			},
+
+			"annotationWithOtherOrigin1": {
+				"uri": "/path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin2": {
+				"uri": "path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin3": {
+				"uri": "/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin4": {
+				"uri": "/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			}
+		}
+	},
+
+	"sap.ui": {
+		"_version": "1.0.0",
+		"technology": "UI5"
+	},
+
+	"sap.ui5": {
+
+		"dependencies": {
+			"minUI5Version": "1.120.0",
+			"libs": {
+				"sap.ui.core": {
+					"minVersion": "1.120.0"
+				}
+			}
+		},
+
+		"models": {
+			"v4-ODataModel": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"settings": {
+					"serviceUrl": "/path/to/odata/service/"
+				}
+			},
+
+			"v4-ODataModel-ServiceOrigin": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"dataSource": "dataSourceODataV4"
+			},
+
+			"v4-ODataModel-OtherOrigins": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"dataSource": "ODataWithMultiOriginAnnotations"
+			}
+		}
+	}
+}

package/test/sap/ui/core/qunit/json/JSONModel.qunit.js

@@ -999,4 +999,25 @@ sap.ui.define([
 		oLabel.unbindElement();
 		assert.equal(oLabel.getText(), "", "text value from model");
 	});
+
+	//*********************************************************************************************
+	// DINC0180763
+	QUnit.test("loadData: calls _ajax with jsonp=false", function () {
+		const oModel = {
+			_ajax() {},
+			fireRequestSent() {}
+		};
+		this.mock(oModel).expects("fireRequestSent").withExactArgs({
+			async: false, headers: "~mHeaders", info: "cache=~bCache;bMerge=~bMerge",
+			infoObject: {cache: "~bCache", merge: "~bMerge"}, type: "~sType", url: "~sURL"
+		});
+		this.mock(oModel).expects("_ajax").withExactArgs({
+			async: false, cache: "~bCache", data: "~oParameters", dataType: 'json', error: sinon.match.func,
+			headers: "~mHeaders", jsonp: false, success: sinon.match.func, type: "~sType", url: "~sURL"
+		});
+
+		// code under test
+		JSONModel.prototype.loadData.call(oModel, "~sURL", "~oParameters", false, "~sType", "~bMerge", "~bCache",
+			"~mHeaders");
+	});
 });

package/test/sap/ui/core/qunit/odata/v2/ODataModel.integration.qunit.js

@@ -10844,11 +10844,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [{
-					ForceElementOrgID : "4711"
+					ForceElementOrgID : "4711",
 					// HierarchyNode : "32,FA163E2C58541EDA8E9C92E909255DAF",
 					// HierarchyParentNode : "",
 					// HierarchyLevel : 0,
-					// HierarchyDescendantCount : 0,
+					HierarchyDescendantCount : 0
 					// DrillDownState : "collapsed"
 				}]
 			})
@@ -10913,6 +10913,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				__count : "2",
 				results : [{
 					__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('1')"},
+					HierarchyDescendantCount : 0,
 					MaintenanceOrder : "Foo"
 				}]
 			})
@@ -10942,6 +10943,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					__count : "2",
 					results : [{
 						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('1')"},
+						HierarchyDescendantCount : 0,
 						MaintenanceOrder : "Bar"
 					}]
 				});
@@ -11018,6 +11020,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					__count : "1",
 					results : [{
 						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('1')"},
+						HierarchyDescendantCount : 0,
 						MaintenanceOrder : "Bar"
 					}]
 				})
@@ -11372,12 +11375,12 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
 		}).then(() => {
-			this.expectValue("weight", "12.3410000 KWH");
+			this.expectValue("weight", "12 KWH");
 
 			// code under test
 			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
 
-			return this.waitForChanges(assert, "change scale to undefined -> unit's decimals wins");
+			return this.waitForChanges(assert, "change scale to undefined -> type Decimal default scale 0 wins");
 		});
 	});
 
@@ -11388,15 +11391,17 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// b) the amount part data type's scale and
 	// with a fix unit decimal places of 7 for the used unit code
 	// JIRA: CPOUI5MODELS-1600
+	// SNOW: DINC0152691 => consider scale default value 0 for sap.ui.model.odata.type.Decimal
 [
 	{iMaxFractionDigits: 1, iScale: 3, sExpected: "12.3 KWH"},  // maxFractionDigits wins
 	{iMaxFractionDigits: 9, iScale: 3, sExpected: "12.3410000 KWH"}, // unit's decimal places wins
 	{iMaxFractionDigits: undefined, iScale: 3, sExpected: "12.341 KWH"}, // scale wins
 	{iMaxFractionDigits: undefined, iScale: "'variable'", sExpected: "12.3410000 KWH"}, // unit's decimal places wins
-	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12.3410000 KWH"} // unit's decimal places wins
+	// DINC0152691: Decimal type scale defaults to 0 => scale wins
+	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12 KWH"}
 ].forEach(({iMaxFractionDigits, iScale, sExpected}, i) => {
 	QUnit.test(`CPOUI5MODELS-1600: UnitType with unit maxFractionDigits, ${i}`, function (assert) {
-		const sURLParameter = "CPOUI5MODELS-1600=true" + i; // unqiue URL for each test needed
+		const sURLParameter = "CPOUI5MODELS-1600=true" + i; // unique URL for each test needed
 		const oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${sURLParameter}`,
 			{defaultBindingMode : "TwoWay", tokenHandling : false});
 		const sScaleConstraint = iScale ? `, scale : ${iScale}` : "";
@@ -11500,12 +11505,12 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
 		}).then(() => {
-			this.expectValue("price", "12.3410000\u00a0FOO");
+			this.expectValue("price", "12\u00a0FOO");
 
 			// code under test
 			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
 
-			return this.waitForChanges(assert, "change scale to undefined -> currency's decimals wins");
+			return this.waitForChanges(assert, "change scale to undefined ->  type Decimal default scale 0 wins");
 		});
 	});
 
@@ -11516,12 +11521,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// b) the amount part data type's scale and
 	// with a fix currency decimal places of 7 for the used currency
 	// JIRA: CPOUI5MODELS-1600
+	// SNOW: DINC0152691 => consider scale default value 0 for sap.ui.model.odata.type.Decimal
 [
 	{iMaxFractionDigits: 1, iScale: 3, sExpected: "12.3\u00a0FOO"},  // maxFractionDigits wins
 	{iMaxFractionDigits: 9, iScale: 3, sExpected: "12.3410000\u00a0FOO"}, // currency's decimal places wins
 	{iMaxFractionDigits: undefined, iScale: 3, sExpected: "12.341\u00a0FOO"}, // scale wins
 	{iMaxFractionDigits: undefined, iScale: "'variable'", sExpected: "12.3410000\u00a0FOO"}, // currency's decimal places wins
-	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12.3410000\u00a0FOO"} // currency's decimal places wins
+	// DINC0152691: Decimal type scale defaults to 0 => scale wins
+	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12\u00a0FOO"}
 ].forEach(({iMaxFractionDigits, iScale, sExpected}, i) => {
 	QUnit.test(`CPOUI5MODELS-1619: CurrencyType with unit maxFractionDigits: ${i}`, function (assert) {
 		const sURLParameter = "CPOUI5MODELS-1619=" + i; // unqiue URL for each test needed
@@ -20278,7 +20285,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					ErhaOrderItem : "100",
 					ErhaOrderItemName : "100",
 					HierarchyParentNode : "",
-					HierarchyDescendantCount : 1,
+					HierarchyDescendantCount : "1",
 					HierarchyDistanceFromRoot : 0,
 					HierarchyDrillState : "expanded",
 					HierarchyNode : "100",

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

@@ -1087,7 +1087,7 @@ sap.ui.define([
 				results : [{
 					drillStateFor : sDrillState,
 					levelFor : "~level",
-					nodeDescendantCountFor : "~magnitude"
+					nodeDescendantCountFor : "42"
 				}]
 			},
 			oExpectedNode = {
@@ -1099,7 +1099,7 @@ sap.ui.define([
 				isDeepOne : false,
 				key : "~key('42')",
 				level : "~level",
-				magnitude : "~magnitude",
+				magnitude : 42,
 				nodeState : {
 					collapsed : false,
 					expanded : false,
@@ -1135,6 +1135,98 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+[1, "2", "1e5", "9007199254740991"].forEach(function (vMagnitude) {
+	QUnit.test("_addServerIndexNodes: magnitude is safe integer: " + vMagnitude, function (assert) {
+		const oBinding = {
+				_aNodes : [],
+				_mSelected : {},
+				oContext : "~oContext",
+				oModel : {
+					getContext() {},
+					getKey() {},
+					resolveDeep() {}
+				},
+				sPath : "~sPath",
+				oTreeProperties : {
+					"hierarchy-drill-state-for" : "drillStateFor",
+					"hierarchy-level-for" : "levelFor",
+					"hierarchy-node-descendant-count-for" : "nodeDescendantCountFor"
+				}
+			},
+			oData = {
+				__count : "1",
+				results : [{
+					drillStateFor : "~sDrillState",
+					levelFor : "~level",
+					nodeDescendantCountFor : vMagnitude
+				}]
+			};
+
+		this.mock(oBinding.oModel).expects("getKey")
+			.withExactArgs(sinon.match.same(oData.results[0]))
+			.returns("~key('42')");
+		this.mock(oBinding.oModel).expects("resolveDeep").withExactArgs("~sPath", "~oContext").returns("~deepPath");
+		this.mock(oBinding.oModel).expects("getContext")
+			.withExactArgs("/~key('42')", "~deepPath('42')")
+			.returns("~context");
+
+		// code under test
+		ODataTreeBindingFlat.prototype._addServerIndexNodes.call(oBinding, oData, 0);
+
+		assert.ok(typeof oBinding._aNodes[0].magnitude === "number");
+	});
+});
+
+	//*********************************************************************************************
+[
+	{magnitude : "Foo", expected : '"Foo"'},
+	{magnitude : 9007199254740992, expected : "9007199254740992"},
+	{magnitude : "9007199254740999", expected : '"9007199254740999"'}
+].forEach(function (oFixture) {
+	QUnit.test("_addServerIndexNodes: magnitude is not a safe integer: " + oFixture.magnitude, function (assert) {
+		const oBinding = {
+				_aNodes : [],
+				_mSelected : {},
+				oContext : "~oContext",
+				oModel : {
+					getContext() {},
+					getKey() {},
+					resolveDeep() {}
+				},
+				sPath : "~sPath",
+				oTreeProperties : {
+					"hierarchy-drill-state-for" : "drillStateFor",
+					"hierarchy-level-for" : "levelFor",
+					"hierarchy-node-descendant-count-for" : "nodeDescendantCountFor"
+				},
+				getResolvedPath() {}
+			},
+			oData = {
+				__count : "1",
+				results : [{
+					drillStateFor : "~sDrillState",
+					levelFor : "~level",
+					nodeDescendantCountFor : oFixture.magnitude
+				}]
+			};
+
+		this.mock(oBinding.oModel).expects("getKey")
+			.withExactArgs(sinon.match.same(oData.results[0]))
+			.returns("~key('42')");
+		this.mock(oBinding.oModel).expects("resolveDeep").withExactArgs("~sPath", "~oContext").returns("~deepPath");
+		this.mock(oBinding.oModel).expects("getContext")
+			.withExactArgs("/~key('42')", "~deepPath('42')")
+			.returns("~context");
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~path");
+		this.oLogMock.expects("error")
+			.withExactArgs("The value of magnitude is not a safe integer: " + oFixture.expected, "~path", sClassName);
+
+		// code under test
+		ODataTreeBindingFlat.prototype._addServerIndexNodes.call(oBinding, oData, 0);
+	});
+});
+
 	//*********************************************************************************************
 ["leaf", "collapsed"].forEach(function (sDrillState) {
 	var sTitle = "_createChildNode: node has initiallyIsLeaf (drill state = " + sDrillState + ")";

package/test/sap/ui/core/qunit/odata/v4/Context.qunit.js

@@ -483,11 +483,10 @@ sap.ui.define([
 			assert.notOk(oContext.mChangeListeners);
 
 			this.mock(oBinding).expects("fetchValue").never();
-			this.mock(_Helper).expects("addByPath")
-				.withExactArgs(sinon.match.object, "", "~listener~")
-				.callsFake((mChangeListeners) => {
-					assert.strictEqual(mChangeListeners, oContext.mChangeListeners);
-					assert.deepEqual(mChangeListeners, {});
+			this.mock(_Helper).expects("registerChangeListener")
+				.withExactArgs(sinon.match.same(oContext), "", "~listener~")
+				.callsFake(() => {
+					assert.deepEqual(oContext.mChangeListeners, {});
 				});
 		}
 
@@ -4965,32 +4964,6 @@ sap.ui.define([
 		}, "~oError~");
 	});
 
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener", function (assert) {
-		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/path");
-		let oListener = {
-			getPath : () => "foo"
-		};
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(), false, "no mChangeListeners");
-
-		oContext.mChangeListeners = {};
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(oListener), false, "wrong path");
-
-		oListener = {
-			getPath : () => "@$ui5.context.isSelected"
-		};
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oContext.mChangeListeners), "",
-				sinon.match.same(oListener));
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(oListener), true);
-	});
-
 	//*********************************************************************************************
 [0, 1].forEach(function (iFailureIndex) {
 	QUnit.test("updateAfterCreate, fail=" + iFailureIndex, function () {