@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -1603,7 +1603,8 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-	QUnit.test("_processSuccess: _updateChangedEntity is called correctly", function (assert) {
+[204, "204", 205, "205"].forEach(function (vStatusCode, i){
+	QUnit.test("_processSuccess: _updateChangedEntity is called correctly, #" + i, function (assert) {
 		var mEntityTypes = {},
 			oModel = {
 				oMetadata : {
@@ -1626,7 +1627,7 @@ sap.ui.define([
 				key : "key",
 				requestUri : "/service/path"
 			},
-			oResponse = {statusCode : 204};
+			oResponse = {statusCode : vStatusCode};
 
 		oModelMock.expects("_normalizePath").withExactArgs("/path").returns("normalizedPath");
 		this.mock(oModel.oMetadata).expects("_getEntityTypeByPath")
@@ -1657,6 +1658,7 @@ sap.ui.define([
 			/*fnSuccess*/ undefined, /*mGetEntities*/ {}, /*mChangeEntities*/ {}, mEntityTypes,
 			/*bBatch*/ false, "aRequests");
 	});
+});
 
 	//*********************************************************************************************
 [{
@@ -4794,7 +4796,7 @@ sap.ui.define([
 					}
 				},
 				bFunctionHasParameter
-					? {"~name0" : "~defaultValue0", "~name1" : "foo"}
+					? {"~name0" : undefined, "~name1" : "foo"}
 					: undefined),
 			oMetadata = {
 				_getCanonicalPathOfFunctionImport : function () {},
@@ -4808,7 +4810,6 @@ sap.ui.define([
 				bUseBatch : "~bUseBatch",
 				sServiceUrl : "/service/url",
 				_addEntity : function () {},
-				_createPropertyValue : function () {},
 				_createRequest : function () {},
 				_createRequestUrlWithNormalizedPath : function () {},
 				_getHeaders : function () {},
@@ -4865,20 +4866,12 @@ sap.ui.define([
 			.returns(oFunctionMetadataFixture.oFunctionMetadata);
 
 		if (bFunctionHasParameter) {
-			oModelMock.expects("_createPropertyValue")
-				.withExactArgs("~type0")
-				.returns("~defaultValue0");
-			oModelMock.expects("_createPropertyValue")
-				.withExactArgs("~type1")
-				.returns("~defaultValue1");
 			this.oLogMock.expects("warning")
 				.withExactArgs("No value given for parameter '~name0' of function import"
 					+ " '/~sFunctionName'", sinon.match.same(oModel), sClassName);
 			this.mock(ODataUtils).expects("formatValue")
 				.withExactArgs("foo", "~type1")
 				.returns("~value1");
-		} else {
-			oModelMock.expects("_createPropertyValue").never();
 		}
 
 		oModelMock.expects("_addEntity").withExactArgs(oExpectedOData)
@@ -5288,7 +5281,7 @@ sap.ui.define([
 			oModel = {
 				// used by ODataListBinding and ODataTreeBinding
 				_getCreatedContextsCache : function () {},
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () { return {}; }, // used by ODataListBinding
 				resolveDeep : function () {},
 				resolveFromCache : function () {}
@@ -6829,7 +6822,7 @@ sap.ui.define([
 				.withExactArgs("~oAbortedError");
 		}
 		oModelMock.expects("getMessagesByEntity")
-			.withExactArgs("~sKey", !bDeleteEntity)
+			.withExactArgs("~sKey", true)
 			.returns("~aMessages");
 		oMessagingMock.expects("removeMessages").withExactArgs("~aMessages");
 
@@ -6886,7 +6879,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oContext));
 		this.mock(oModel).expects("_removeEntity").withExactArgs("~sKey");
 		this.mock(oModel).expects("getMessagesByEntity")
-			.withExactArgs("~sKey", false)
+			.withExactArgs("~sKey", true)
 			.returns("~aMessages");
 		this.mock(Messaging).expects("removeMessages")
 			.withExactArgs("~aMessages");

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

@@ -128,13 +128,13 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [
-	{aControlMessages : [], bForceUpdate : false, bSameContext : true},
-	{aControlMessages : [], bForceUpdate : false, bSameContext : false},
-	{aControlMessages : [{}], bForceUpdate : true, bSameContext : false}
+	{aMessages : [], bForceUpdate : false, bSameContext : true},
+	{aMessages : [], bForceUpdate : false, bSameContext : false},
+	{aMessages : [{}], bForceUpdate : true, bSameContext : false}
 ].forEach(function (oFixture) {
 	var sTitle = "setContext: changed context (relative binding)"
 			+ "; same context = " + oFixture.bSameContext
-			+ "; number of control messages = " + oFixture.aControlMessages.length;
+			+ "; number of messages = " + oFixture.aMessages.length;
 
 	QUnit.test(sTitle, function (assert) {
 		var oContext = {
@@ -147,7 +147,7 @@ sap.ui.define([
 				isRelative : function () {}
 			},
 			oDataState = {
-				getControlMessages : function () {}
+				getMessages : function () {}
 			};
 
 		this.mock(oContext).expects("isPreliminary").withExactArgs().returns(false);
@@ -157,8 +157,7 @@ sap.ui.define([
 		this.mock(oBinding).expects("isRelative").withExactArgs().returns(true);
 		if (!oFixture.bSameContext) {
 			this.mock(oBinding).expects("getDataState").withExactArgs().returns(oDataState);
-			this.mock(oDataState).expects("getControlMessages").withExactArgs()
-				.returns(oFixture.aControlMessages);
+			this.mock(oDataState).expects("getMessages").withExactArgs().returns(oFixture.aMessages);
 		}
 
 		this.mock(oBinding).expects("checkUpdate").withExactArgs(oFixture.bForceUpdate);

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

@@ -1631,6 +1631,7 @@ sap.ui.define([
 					"hierarchy-node-for" : "~nodeKey",
 					"hierarchy-preorder-rank-for" : "~preorderRank"
 				},
+				_getHeaders() {},
 				_updateNodeInfoAfterSave : function () {},
 				getNumberOfExpandedLevels : function () {},
 				getResolvedPath : function () {}
@@ -1664,6 +1665,7 @@ sap.ui.define([
 				.and(sinon.match.has("select",
 					"~key0,~key1,~nodeKey,~descendantCount,~drillState,~preorderRank")))
 			.returns("~URLParameters");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		this.mock(oModel).expects("read")
 			.withExactArgs("~resolvedPath", {
 				error : "~fnError",
@@ -1678,6 +1680,7 @@ sap.ui.define([
 						and : true})
 				],
 				groupId : "~groupID",
+				headers : "~headers",
 				sorters : "~aSorters",
 				success : sinon.match.func,
 				urlParameters : "~URLParameters"
@@ -1721,6 +1724,7 @@ sap.ui.define([
 					"hierarchy-node-for" : "~nodeKey",
 					"hierarchy-preorder-rank-for" : "~preorderRank"
 				},
+				_getHeaders() {},
 				_updateNodeInfoAfterSave : function () {},
 				getNumberOfExpandedLevels : function () {},
 				getResolvedPath : function () {}
@@ -1747,6 +1751,7 @@ sap.ui.define([
 				.and(sinon.match.has("select",
 					"~key0,~key1,~nodeKey,~descendantCount,~drillState,~preorderRank")))
 			.returns("~URLParameters");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		this.mock(oModel).expects("read")
 			.withExactArgs("~resolvedPath", {
 				error : undefined,
@@ -1760,6 +1765,7 @@ sap.ui.define([
 						and : true})
 				],
 				groupId : "~groupID",
+				headers : "~headers",
 				sorters : [],
 				success : sinon.match.func,
 				urlParameters : "~URLParameters"
@@ -1826,4 +1832,212 @@ sap.ui.define([
 		// code under test
 		assert.strictEqual(ODataTreeBindingFlat.prototype._calcIndexDelta.call(oBinding, 5), 1);
 	});
-});
+
+	//*********************************************************************************************
+	QUnit.test("_requestServerIndexNodes: calls _getHeaders", function (assert) {
+		const oBinding = {
+			_aPendingRequests: [],
+			oModel: {
+				read() {}
+			},
+			oTreeProperties: {
+				"hierarchy-level-for": "~hierarchy-level-for"
+			},
+			_getHeaders() {},
+			getNumberOfExpandedLevels() {},
+			getResolvedPath() {}
+		};
+		const oBindingMock = this.mock(oBinding);
+		oBindingMock.expects("getNumberOfExpandedLevels").withExactArgs().returns(13);
+		oBindingMock.expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		oBindingMock.expects("_getHeaders").withExactArgs().returns("~headers");
+		const oReadExpectation = this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: sinon.match.func,
+				filters: [new Filter({filters: [new Filter("~hierarchy-level-for", "LE", 13)], and: true})],
+				groupId: undefined, // not relevant for this test
+				headers: "~headers",
+				sorters: [],
+				success: sinon.match.func,
+				urlParameters: ["$skip=3", "$top=142", "$inlinecount=allpages"]
+			})
+			.returns("~oReadHandle");
+
+		// code under test
+		const oResultPromise = ODataTreeBindingFlat.prototype._requestServerIndexNodes.call(oBinding, 3, 42, 100);
+
+		assert.deepEqual(oBinding._aPendingRequests,
+			[{oRequestHandle: "~oReadHandle", iSkip: 3, iTop: 142, iThreshold: 100}]);
+		assert.ok(oResultPromise instanceof Promise);
+
+		// code under test
+		oReadExpectation.args[0][1].success("~oData");
+
+		return oResultPromise.then((oResult) => {
+			assert.deepEqual(oResult, {oData: "~oData", iSkip: 3, iTop: 142});
+			assert.deepEqual(oBinding._aPendingRequests, []);
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_requestChildren: calls _getHeaders", function (assert) {
+		const oBinding = {
+			_aPendingChildrenRequests: [],
+			oModel: {
+				read() {}
+			},
+			oTreeProperties: {
+				"hierarchy-node-for": "~hierarchy-node-for",
+				"hierarchy-parent-node-for": "~hierarchy-parent-node-for"
+			},
+			_getHeaders() {},
+			getResolvedPath() {}
+		};
+		const oParentNode = {
+			key: "~parentNodeKey",
+			context: {
+				getProperty() {}
+			}
+		};
+		this.mock(oParentNode.context).expects("getProperty")
+			.withExactArgs("~hierarchy-node-for")
+			.returns("~sHierarchyNodeValue");
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
+		const oReadExpectation = this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: sinon.match.func,
+				filters: [
+					new Filter({
+						filters: [new Filter("~hierarchy-parent-node-for", "EQ", "~sHierarchyNodeValue")],
+						and: true
+					})],
+				groupId: undefined, // not relevant for this test
+				headers: "~headers",
+				sorters: [],
+				success: sinon.match.func,
+				urlParameters: ["$skip=~skip", "$top=~top", "$inlinecount=allpages"]
+			})
+			.returns("~oReadHandle");
+
+		// code under test
+		const oResultPromise = ODataTreeBindingFlat.prototype._requestChildren.call(oBinding, oParentNode,
+			"~skip", "~top");
+
+		assert.deepEqual(oBinding._aPendingChildrenRequests,
+			[{sParent: "~parentNodeKey", oRequestHandle: "~oReadHandle", iSkip: "~skip", iTop: "~top"}]);
+		assert.ok(oResultPromise instanceof Promise);
+
+		// code under test
+		oReadExpectation.args[0][1].success("~oData");
+
+		return oResultPromise.then((oResult) => {
+			assert.deepEqual(oResult, {oData: "~oData", iSkip: "~skip", iTop: "~top"});
+			assert.deepEqual(oBinding._aPendingChildrenRequests, []);
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_requestSubTree: calls _getHeaders", function (assert) {
+		const oBinding = {
+			_aPendingSubtreeRequests: [],
+			oModel: {
+				read() {}
+			},
+			oTreeProperties: {
+				"hierarchy-level-for": "~hierarchy-level-for",
+				"hierarchy-node-for": "~hierarchy-node-for"
+			},
+			_getHeaders() {},
+			getResolvedPath() {}
+		};
+		const oParentNode = {
+			key: "~parentNodeKey",
+			context: {
+				getProperty() {}
+			}
+		};
+		this.mock(oParentNode.context).expects("getProperty")
+			.withExactArgs("~hierarchy-node-for")
+			.returns("~sHierarchyNodeForProperty");
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		const oExpectedNodeFilter = new Filter("~hierarchy-node-for", "EQ", "~sHierarchyNodeForProperty");
+		const oExpectedLevelFilter = new Filter("~hierarchy-level-for", "LE", "~iLevel");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
+		const oReadExpectation = this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: sinon.match.func,
+				filters: [new Filter({filters: [oExpectedNodeFilter, oExpectedLevelFilter], and: true})],
+				groupId: undefined, // not relevant for this test
+				headers: "~headers",
+				sorters: [],
+				success: sinon.match.func,
+				urlParameters: []
+			})
+			.returns("~oReadHandle");
+
+		// code under test
+		const oResultPromise = ODataTreeBindingFlat.prototype._requestSubTree.call(oBinding, oParentNode, "~iLevel");
+
+		assert.deepEqual(oBinding._aPendingSubtreeRequests,
+			[{sParent: "~parentNodeKey", iLevel: "~iLevel", oRequestHandle: "~oReadHandle"}]);
+		assert.ok(oResultPromise instanceof Promise);
+
+		// code under test
+		oReadExpectation.args[0][1].success("~oData");
+
+		return oResultPromise.then((oResult) => {
+			assert.deepEqual(oResult, {oData: "~oData", iLevel: "~iLevel", sParent: "~parentNodeKey"});
+			assert.deepEqual(oBinding._aPendingSubtreeRequests, []);
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_generateSiblingsPositionRequest: calls _getHeaders", function (assert) {
+		const oBinding = {
+			oModel: {
+				createCustomParams() {},
+				read() {}
+			},
+			mParameters: {foo: "~bar"},
+			oTreeProperties: {
+				"hierarchy-sibling-rank-for": "~hierarchy-sibling-rank-for"
+			},
+			_getHeaders() {}
+		};
+		const oNode = {
+			context: {
+				getPath() {}
+			}
+		};
+		this.mock(oNode.context).expects("getPath").withExactArgs().returns("~sAbsolutePath");
+		this.mock(oBinding.oModel).expects("createCustomParams")
+			.withExactArgs(sinon.match((oParams) => {
+				assert.notStrictEqual(oParams, oBinding.mParameters);
+				assert.deepEqual(oParams, {
+					foo: "~bar",
+					select: "~hierarchy-sibling-rank-for"
+				});
+				return true;
+			}))
+			.returns("~mCustomParams");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
+		this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: "~error",
+				groupId: "~groupId",
+				headers: "~headers",
+				success: "~success",
+				urlParameters: "~mCustomParams"
+			})
+			.returns("~oReadHandle");
+		const mParameters = {
+			error: "~error",
+			groupId: "~groupId",
+			success: "~success"
+		};
+
+		// code under test
+		ODataTreeBindingFlat.prototype._generateSiblingsPositionRequest.call(oBinding, oNode, mParameters);
+	});
+});