@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -7,6 +7,7 @@ sap.ui.define([
 	"sap/ui/core/Configuration",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageManager",
 	"sap/ui/model/Binding",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
@@ -22,9 +23,9 @@ sap.ui.define([
 	"sap/ui/model/odata/v4/lib/_Requestor",
 	"sap/ui/core/library",
 	"sap/ui/test/TestUtils"
-], function (Log, SyncPromise, Configuration, CacheManager, Message, Binding, BindingMode,
-		BaseContext, Model, OperationMode, Context, ODataMetaModel, ODataModel, SubmitMode, _Helper,
-		_MetadataRequestor, _Parser, _Requestor, library, TestUtils) {
+], function (Log, SyncPromise, Configuration, CacheManager, Message, MessageManager, Binding,
+		BindingMode, BaseContext, Model, OperationMode, Context, ODataMetaModel, ODataModel,
+		SubmitMode, _Helper, _MetadataRequestor, _Parser, _Requestor, library, TestUtils) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.ODataModel",
@@ -83,8 +84,8 @@ sap.ui.define([
 			return new ODataModel({useBatch : true});
 		}, new Error("Unsupported parameter: useBatch"));
 		assert.throws(function () {
-			return new ODataModel({operationMode : OperationMode.Auto, serviceUrl : "/foo/"});
-		}, new Error("Unsupported operation mode: Auto"), "Unsupported OperationMode");
+			return new ODataModel({operationMode : OperationMode.Client, serviceUrl : "/foo/"});
+		}, new Error("Unsupported operation mode: Client"), "Unsupported OperationMode");
 
 		this.mock(ODataModel.prototype).expects("initializeSecurityToken").never();
 		this.mock(_Requestor.prototype).expects("sendOptimisticBatch").never();
@@ -114,7 +115,7 @@ sap.ui.define([
 		this.mock(_MetadataRequestor).expects("create")
 			.withExactArgs({"Accept-Language" : "ab-CD"}, "4.0", undefined, bStatistics
 				? {"sap-client" : "279", "sap-statistics" : true}
-				: {"sap-client" : "279"})
+				: {"sap-client" : "279"}, undefined)
 			.returns(oMetadataRequestor);
 		this.mock(ODataMetaModel.prototype).expects("fetchEntityContainer").withExactArgs(true);
 		this.mock(ODataModel.prototype).expects("initializeSecurityToken").withExactArgs();
@@ -161,10 +162,10 @@ sap.ui.define([
 				"sap-client" : "279",
 				"sap-context-token" : "20200716120000",
 				"sap-language" : "EN"
-			});
+			}, undefined);
 		this.mock(_Requestor).expects("create")
 			.withExactArgs(sServiceUrl, sinon.match.object, {"Accept-Language" : "ab-CD"},
-				{"sap-client" : "279", "sap-context-token" : "n/a"}, "4.0")
+				{"sap-client" : "279", "sap-context-token" : "n/a"}, "4.0", undefined)
 			.callThrough();
 
 		// code under test
@@ -228,14 +229,14 @@ sap.ui.define([
 
 			oRequestorCreateExpectation = this.mock(_Requestor).expects("create")
 				.withExactArgs(sServiceUrl, sinon.match.object, {"Accept-Language" : "ab-CD"},
-					sinon.match.object, sODataVersion)
+					sinon.match.object, sODataVersion, undefined)
 				.returns({
 					checkForOpenRequests : function () {},
 					checkHeaderNames : function () {}
 				});
 			oMetadataRequestorCreateExpectation = this.mock(_MetadataRequestor).expects("create")
 				.withExactArgs({"Accept-Language" : "ab-CD"}, sODataVersion, undefined,
-					sinon.match.object)
+					sinon.match.object, undefined)
 				.returns({});
 
 			// code under test
@@ -423,6 +424,43 @@ sap.ui.define([
 		assert.deepEqual(oModel.mMetadataHeaders, mHeaders);
 	});
 
+	//*********************************************************************************************
+[false, true].forEach(function (bWithCredentials) {
+	QUnit.test("Model creates _Requestor, withCredentials=" + bWithCredentials, function () {
+		this.mock(_MetadataRequestor).expects("create")
+			.withExactArgs({"Accept-Language" : "ab-CD"}, "4.0",
+				/*bIngnoreAnnotationsFromMetadata*/undefined, /*mQueryParams*/{},
+				/*bWithCredentials*/bWithCredentials);
+		this.mock(_Requestor).expects("create")
+			.withExactArgs(sServiceUrl, {
+					fetchEntityContainer : sinon.match.func,
+					fetchMetadata : sinon.match.func,
+					fireDataReceived : sinon.match.func,
+					fireDataRequested : sinon.match.func,
+					fireSessionTimeout : sinon.match.func,
+					getGroupProperty : sinon.match.func,
+					getMessagesByPath : sinon.match.func,
+					getOptimisticBatchEnabler : sinon.match.func,
+					getReporter : sinon.match.func,
+					isIgnoreETag : sinon.match.func,
+					onCreateGroup : sinon.match.func,
+					reportStateMessages : sinon.match.func,
+					reportTransitionMessages : sinon.match.func,
+					updateMessages : sinon.match.func
+				},
+				{"Accept-Language" : "ab-CD"},
+				{},
+				"4.0",
+				bWithCredentials)
+			.returns({
+				checkForOpenRequests : function () {},
+				checkHeaderNames : function () {}
+			});
+
+		this.createModel(undefined, {withCredentials : bWithCredentials});
+	});
+});
+
 	//*********************************************************************************************
 [false, true].forEach(function (bStatistics) {
 	QUnit.test("Model creates _Requestor, sap-statistics=" + bStatistics, function (assert) {
@@ -436,7 +474,6 @@ sap.ui.define([
 			oExpectedBind7,
 			oExpectedBind8,
 			oExpectedBind9,
-			oExpectedBind10,
 			oExpectedCreate = this.mock(_Requestor).expects("create"),
 			oModel,
 			oModelInterface,
@@ -452,7 +489,6 @@ sap.ui.define([
 			.withExactArgs(sServiceUrl, {
 					fetchEntityContainer : "~fnFetchEntityContainer~",
 					fetchMetadata : "~fnFetchMetadata~",
-					fireMessageChange : "~fnFireMessageChange~",
 					fireDataReceived : "~fnFireDataReceived~",
 					fireDataRequested : "~fnFireDataRequested~",
 					fireSessionTimeout : sinon.match.func,
@@ -463,35 +499,34 @@ sap.ui.define([
 					isIgnoreETag : sinon.match.func,
 					onCreateGroup : sinon.match.func,
 					reportStateMessages : "~fnReportStateMessages~",
-					reportTransitionMessages : "~fnReportTransitionMessages~"
+					reportTransitionMessages : "~fnReportTransitionMessages~",
+					updateMessages : sinon.match.func
 				},
 				{"Accept-Language" : "ab-CD"},
 				bStatistics
 					? {"sap-client" : "123", "sap-statistics" : true}
 					: {"sap-client" : "123"},
-				"4.0")
+				"4.0", undefined)
 			.returns(oRequestor);
 		oExpectedBind0 = this.mock(ODataMetaModel.prototype.fetchEntityContainer).expects("bind")
 			.returns("~fnFetchEntityContainer~");
 		oExpectedBind1 = this.mock(ODataMetaModel.prototype.fetchObject).expects("bind")
 			.returns("~fnFetchMetadata~");
-		oExpectedBind2 = this.mock(ODataModel.prototype.fireMessageChange).expects("bind")
-			.returns("~fnFireMessageChange~");
-		oExpectedBind3 = this.mock(ODataModel.prototype.fireDataReceived).expects("bind")
+		oExpectedBind2 = this.mock(ODataModel.prototype.fireDataReceived).expects("bind")
 			.returns("~fnFireDataReceived~");
-		oExpectedBind4 = this.mock(ODataModel.prototype.fireDataRequested).expects("bind")
+		oExpectedBind3 = this.mock(ODataModel.prototype.fireDataRequested).expects("bind")
 			.returns("~fnFireDataRequested~");
-		oExpectedBind5 = this.mock(ODataModel.prototype.getGroupProperty).expects("bind")
+		oExpectedBind4 = this.mock(ODataModel.prototype.getGroupProperty).expects("bind")
 			.returns("~fnGetGroupProperty~");
-		oExpectedBind6 = this.mock(ODataModel.prototype.getMessagesByPath).expects("bind")
+		oExpectedBind5 = this.mock(ODataModel.prototype.getMessagesByPath).expects("bind")
 			.returns("~fnGetMessagesByPath~");
-		oExpectedBind7 = this.mock(ODataModel.prototype.getOptimisticBatchEnabler).expects("bind")
+		oExpectedBind6 = this.mock(ODataModel.prototype.getOptimisticBatchEnabler).expects("bind")
 			.returns("~fnGetOptimisticBatchEnabler~");
-		oExpectedBind8 = this.mock(ODataModel.prototype.getReporter).expects("bind")
+		oExpectedBind7 = this.mock(ODataModel.prototype.getReporter).expects("bind")
 			.returns("~fnGetReporter~");
-		oExpectedBind9 = this.mock(ODataModel.prototype.reportTransitionMessages).expects("bind")
+		oExpectedBind8 = this.mock(ODataModel.prototype.reportTransitionMessages).expects("bind")
 			.returns("~fnReportTransitionMessages~");
-		oExpectedBind10 = this.mock(ODataModel.prototype.reportStateMessages).expects("bind")
+		oExpectedBind9 = this.mock(ODataModel.prototype.reportStateMessages).expects("bind")
 			.returns("~fnReportStateMessages~");
 
 		// code under test
@@ -509,7 +544,6 @@ sap.ui.define([
 		assert.strictEqual(oExpectedBind7.firstCall.args[0], oModel);
 		assert.strictEqual(oExpectedBind8.firstCall.args[0], oModel);
 		assert.strictEqual(oExpectedBind9.firstCall.args[0], oModel);
-		assert.strictEqual(oExpectedBind10.firstCall.args[0], oModel);
 		oModelInterface = oExpectedCreate.firstCall.args[1];
 		assert.strictEqual(oModelInterface, oModel.oInterface);
 
@@ -533,6 +567,12 @@ sap.ui.define([
 		// code under test
 		oModel.setIgnoreETag("~bIgnoreETag~");
 
+		this.mock(MessageManager).expects("updateMessages")
+			.withExactArgs("~oldMessages~", "~newMessages~");
+
+		// code under test
+		oModelInterface.updateMessages("~oldMessages~", "~newMessages~");
+
 		assert.strictEqual(oModelInterface.isIgnoreETag(), "~bIgnoreETag~");
 	});
 });
@@ -1755,8 +1795,8 @@ sap.ui.define([
 				return oMessage === aMessages[1] && oMessage.transition === true;
 			}), sResourcePath)
 			.returns("~UI5msg1~");
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match({newMessages : ["~UI5msg0~", "~UI5msg1~"]}));
+		this.mock(MessageManager).expects("updateMessages")
+			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
 
 		// code under test
 		oModel.reportTransitionMessages(aMessages, sResourcePath);
@@ -1772,6 +1812,7 @@ sap.ui.define([
 	QUnit.test("reportStateMessages", function () {
 		var aBarMessages = ["~rawMessage0~", "~rawMessage1~"],
 			aBazMessages = ["~rawMessage2~"],
+			oMessageManagerMock = this.mock(MessageManager),
 			oModel = this.createModel(),
 			oModelMock = this.mock(oModel);
 
@@ -1781,15 +1822,14 @@ sap.ui.define([
 			.withExactArgs(aBarMessages[1], "Team('42')", "foo/bar").returns("~UI5msg1~");
 		oModelMock.expects("createUI5Message")
 			.withExactArgs(aBazMessages[0], "Team('42')", "foo/baz").returns("~UI5msg2~");
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match(
-				{newMessages : ["~UI5msg0~", "~UI5msg1~", "~UI5msg2~"], oldMessages : []}));
+		oMessageManagerMock.expects("updateMessages")
+			.withExactArgs([], ["~UI5msg0~", "~UI5msg1~", "~UI5msg2~"]);
 
 		// code under test
 		oModel.reportStateMessages("Team('42')",
 			{"foo/bar" : aBarMessages, "foo/baz" : aBazMessages});
 
-		oModelMock.expects("fireMessageChange").never();
+		oMessageManagerMock.expects("updateMessages").never();
 
 		// code under test
 		oModel.reportStateMessages("Team('42')", {});
@@ -1806,17 +1846,14 @@ sap.ui.define([
 				"/FOO('3')/NavSingle/Name" : [{}, {}],
 				"/FOO('3')/NavSingleBar/Name" : [{}]
 			},
-			oModel = this.createModel(),
-			oModelMock = this.mock(oModel);
+			oMessageManagerMock = this.mock(MessageManager),
+			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
 
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match.object)
-			.callsFake(function (mArguments) {
-				var aNewMessages = mArguments.newMessages,
-					aOldMessages = mArguments.oldMessages;
-
+		oMessageManagerMock.expects("updateMessages")
+			.withExactArgs(sinon.match.array, sinon.match.array)
+			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][1]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')/bar"][0]) < 0);
@@ -1830,12 +1867,9 @@ sap.ui.define([
 		// code under test
 		oModel.reportStateMessages("FOO('1')", {});
 
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match.object)
-			.callsFake(function (mArguments) {
-				var aNewMessages = mArguments.newMessages,
-					aOldMessages = mArguments.oldMessages;
-
+		oMessageManagerMock.expects("updateMessages")
+			.withExactArgs(sinon.match.array, sinon.match.array)
+			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('3')/NavSingle"][0]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('3')/NavSingle/Name"][0]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('3')/NavSingle/Name"][1]) >= 0);
@@ -1859,18 +1893,14 @@ sap.ui.define([
 				"/FOO('3')/NavSingle/Name" : [{}, {}],
 				"/FOO('3')/NavSingleBar/Name" : [{}]
 			},
-			oModel = this.createModel(),
-			oModelMock = this.mock(oModel);
+			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('1')").returns("/FOO('1')");
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('2')").returns("/FOO('2')");
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match.object)
-			.callsFake(function (mArguments) {
-				var aNewMessages = mArguments.newMessages,
-					aOldMessages = mArguments.oldMessages;
-
+		this.mock(MessageManager).expects("updateMessages")
+			.withExactArgs(sinon.match.array, sinon.match.array)
+			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][1]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')/bar"][0]) >= 0);
@@ -1897,16 +1927,12 @@ sap.ui.define([
 				"/FOO('3')/NavSingle/Name" : [{}, {}],
 				"/FOO('3')/NavSingleBar/Name" : [{}]
 			},
-			oModel = this.createModel(),
-			oModelMock = this.mock(oModel);
+			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
-		oModelMock.expects("fireMessageChange")
-			.withExactArgs(sinon.match.object)
-			.callsFake(function (mArguments) {
-				var aNewMessages = mArguments.newMessages,
-					aOldMessages = mArguments.oldMessages;
-
+		this.mock(MessageManager).expects("updateMessages")
+			.withExactArgs(sinon.match.array, sinon.match.array)
+			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][1]) >= 0);
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')/bar"][0]) >= 0);
@@ -3262,6 +3288,9 @@ sap.ui.define([
 			.returns(oFixture.iStatus === 204
 				? Promise.resolve()
 				: Promise.reject(oError));
+		this.mock(oModel).expects("reportError").exactly(bSuccess ? 0 : 1)
+			.withExactArgs("Failed to delete " + sCanonicalPath, sClassName,
+				sinon.match.same(oError));
 		this.mock(aAllBindings[0]).expects("onDelete").exactly(bInAllBindings ? 1 : 0)
 			.withExactArgs(sCanonicalPath);
 		this.mock(aAllBindings[1]).expects("onDelete").exactly(bInAllBindings ? 1 : 0)

package/test/sap/ui/core/qunit/odata/v4/ODataModel.realOData.qunit.js

@@ -190,9 +190,6 @@ sap.ui.define([
 			"TEAMS('TEAM_01')/Name" : {message : {value : "Business Suite"}}
 		},
 		oModelInterface = {
-			fetchMetadata : function () {
-				throw new Error("Do not call me!");
-			},
 			fireSessionTimeout : function () {},
 			getGroupProperty : defaultGetGroupProperty,
 			isIgnoreETag : function () {},