@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -5,9 +5,10 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/Rendering",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/message/MessageManager",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/Binding",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
@@ -23,7 +24,7 @@ sap.ui.define([
 	"sap/ui/model/odata/v4/lib/_Requestor",
 	"sap/ui/core/library",
 	"sap/ui/test/TestUtils"
-], function (Log, SyncPromise, Configuration, CacheManager, Message, MessageManager, Binding,
+], function (Log, SyncPromise, Configuration, Rendering, CacheManager, Message, Messaging, Binding,
 		BindingMode, BaseContext, Model, OperationMode, Context, ODataMetaModel, ODataModel,
 		SubmitMode, _Helper, _MetadataRequestor, _Parser, _Requestor, library, TestUtils) {
 	"use strict";
@@ -567,7 +568,7 @@ sap.ui.define([
 		// code under test
 		oModel.setIgnoreETag("~bIgnoreETag~");
 
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs("~oldMessages~", "~newMessages~");
 
 		// code under test
@@ -1119,7 +1120,7 @@ sap.ui.define([
 				.twice();
 			oModelMock.expects("reportStateMessages").never();
 			oModelMock.expects("reportTransitionMessages")
-				.once()// add each error only once to the MessageManager
+				.once()// add each error only once to the Messaging
 				.withExactArgs("~extractedMessages~", "resource/path");
 
 			// code under test
@@ -1795,7 +1796,7 @@ sap.ui.define([
 				return oMessage === aMessages[1] && oMessage.transition === true;
 			}), sResourcePath)
 			.returns("~UI5msg1~");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
 
 		// code under test
@@ -1812,7 +1813,7 @@ sap.ui.define([
 	QUnit.test("reportStateMessages", function () {
 		var aBarMessages = ["~rawMessage0~", "~rawMessage1~"],
 			aBazMessages = ["~rawMessage2~"],
-			oMessageManagerMock = this.mock(MessageManager),
+			oMessagingMock = this.mock(Messaging),
 			oModel = this.createModel(),
 			oModelMock = this.mock(oModel);
 
@@ -1822,14 +1823,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~");
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs([], ["~UI5msg0~", "~UI5msg1~", "~UI5msg2~"]);
 
 		// code under test
 		oModel.reportStateMessages("Team('42')",
 			{"foo/bar" : aBarMessages, "foo/baz" : aBazMessages});
 
-		oMessageManagerMock.expects("updateMessages").never();
+		oMessagingMock.expects("updateMessages").never();
 
 		// code under test
 		oModel.reportStateMessages("Team('42')", {});
@@ -1846,12 +1847,12 @@ sap.ui.define([
 				"/FOO('3')/NavSingle/Name" : [{}, {}],
 				"/FOO('3')/NavSingleBar/Name" : [{}]
 			},
-			oMessageManagerMock = this.mock(MessageManager),
+			oMessagingMock = this.mock(Messaging),
 			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
 
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -1867,7 +1868,7 @@ sap.ui.define([
 		// code under test
 		oModel.reportStateMessages("FOO('1')", {});
 
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('3')/NavSingle"][0]) >= 0);
@@ -1898,7 +1899,7 @@ sap.ui.define([
 		oModel.mMessages = mMessages;
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('1')").returns("/FOO('1')");
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('2')").returns("/FOO('2')");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -1930,7 +1931,7 @@ sap.ui.define([
 			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -2281,7 +2282,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("addPrerenderingTask: queue", function (assert) {
-		var oExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		var oExpectation = this.mock(Rendering).expects("addPrerenderingTask")
 				.withExactArgs(sinon.match.func),
 			fnFirstPrerenderingTask = "first",
 			fnPrerenderingTask0 = "0",
@@ -2323,7 +2324,7 @@ sap.ui.define([
 				oModel.addPrerenderingTask(fnLastTask);
 			});
 
-		oAddTaskMock = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		oAddTaskMock = this.mock(Rendering).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func);
 		this.mock(window).expects("setTimeout").withExactArgs(sinon.match.func, 0).returns(42);
 		oModel.addPrerenderingTask(fnPrerenderingTask0);
@@ -2363,7 +2364,7 @@ sap.ui.define([
 			fnTask = this.spy(),
 			oWindowMock = this.mock(window);
 
-		oAddTaskExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		oAddTaskExpectation = this.mock(Rendering).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func);
 		oSetTimeoutExpectation = oWindowMock.expects("setTimeout")
 			.withExactArgs(sinon.match.func, 0);
@@ -2395,7 +2396,7 @@ sap.ui.define([
 			fnTask1 = this.spy(),
 			fnTask2 = "~task~2~";
 
-		oAddTaskExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask").twice()
+		oAddTaskExpectation = this.mock(Rendering).expects("addPrerenderingTask").twice()
 			.withExactArgs(sinon.match.func);
 		oSetTimeoutExpectation = this.mock(window).expects("setTimeout").thrice()
 			.withExactArgs(sinon.match.func, 0);

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

@@ -923,9 +923,14 @@ sap.ui.define([
 						"~bIsProperty~");
 
 					assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-					assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
-					assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
-						["childPath"]);
+					if (bCacheCreationPending) {
+						assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath,
+							oPromise);
+						assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
+							["childPath"]);
+					} else {
+						assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
+					}
 					return Promise.all([oPromise, oBinding.oCachePromise]).then(function (aResult) {
 						assert.strictEqual(aResult[0],
 							oFixture.hasChildQueryOptions && oFixture.canMergeQueryOptions
@@ -1194,8 +1199,12 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 		assert.notStrictEqual(oBinding.oCachePromise, oCachePromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
-		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
+		if (oFixture.cache === null) {
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
+		} else {
+			assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
+		}
 		return oBinding.oCachePromise.then(function (oCache0) {
 			assert.strictEqual(oPromise.getResult(),
 				oFixture.rejected ? undefined : "/reduced/child/path");
@@ -1747,8 +1756,7 @@ sap.ui.define([
 			"~bIsProperty~");
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sPath], oPromise);
-		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sPath]);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/reduced/child/path");
 			assert.strictEqual(oBinding.bHasPathReductionToParent, bReduced);
@@ -1914,7 +1922,8 @@ sap.ui.define([
 			fnFetchMetadata = function () {},
 			oParentBinding = new ODataParentBinding(),
 			oBinding = new ODataParentBinding({
-				oCache : undefined,
+				mCanUseCachePromiseByChildPath : {"SOITEMS_2_SO/Note" : "do not use"},
+				oCache : null,
 				oCachePromise : SyncPromise.resolve(Promise.resolve(null)),
 				oContext : {
 					getBinding : function () { return oParentBinding; },
@@ -1989,7 +1998,7 @@ sap.ui.define([
 			"~bIsProperty~");
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], "do not use");
 		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sChildPath]);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/SalesOrderList('42')/Note");
@@ -2021,6 +2030,7 @@ sap.ui.define([
 				getReducedPath : function () {}
 			},
 			oBinding = new ODataParentBinding({
+				oCache : {}, // not null
 				oContext : "do not use",
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },

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

@@ -2299,40 +2299,19 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("deregisterChangeListener", function () {
-		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE"),
-			oMock,
-			oOtherBinding = {
-				doDeregisterChangeListener : function () {}
-			},
-			sPath = "foo";
+		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE");
 
-		oMock = this.mock(oBinding).expects("withCache")
-			.withExactArgs(sinon.match.func, "", false, /*bWithOrWithoutCache*/true)
-			.returns(SyncPromise.resolve());
+		oBinding.sReducedPath = "/reduced/path";
+		this.mock(oBinding).expects("doDeregisterChangeListener")
+			.withExactArgs("/reduced/path", sinon.match.same(oBinding));
 
 		// code under test
 		oBinding.deregisterChangeListener();
 
-		this.mock(oOtherBinding).expects("doDeregisterChangeListener")
-			.withExactArgs(sPath, sinon.match.same(oBinding));
+		oBinding.sReducedPath = undefined;
 
-		// code under test - check that the function passed to withCache works as expected
-		oMock.firstCall.args[0](null, sPath, oOtherBinding);
-	});
-
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener: withCache rejects sync", function () {
-		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE"),
-			oError = new Error("fail intentionally"),
-			fnReporter = sinon.spy();
-
-		this.mock(oBinding).expects("withCache").returns(SyncPromise.reject(oError));
-		this.mock(this.oModel).expects("getReporter").withExactArgs().returns(fnReporter);
-
-		// code under test
+		// code under test - no further doDeregisterChangeListener
 		oBinding.deregisterChangeListener();
-
-		sinon.assert.calledOnceWithExactly(fnReporter, sinon.match.same(oError));
 	});
 
 	//*********************************************************************************************

package/test/sap/ui/core/qunit/odata/v4/data/metadata.json

@@ -169,6 +169,7 @@
 		"TEAM_2_EMPLOYEES" : {
 			"$kind" : "NavigationProperty",
 			"$isCollection" : true,
+			"$Partner" : "EMPLOYEE_2_TEAM",
 			"$Type" : "com.sap.gateway.default.iwbep.tea_busi.v0001.Worker"
 		},
 		"TEAM_2_MANAGER" : {
@@ -259,7 +260,8 @@
 		"EMPLOYEE_2_TEAM" : {
 			"$kind" : "NavigationProperty",
 			"$Type" : "com.sap.gateway.default.iwbep.tea_busi.v0001.TEAM",
-			"$Nullable" : false
+			"$Nullable" : false,
+			"$Partner" : "TEAM_2_EMPLOYEES"
 		},
 		"__CT__FAKE__Message" : {
 			"$kind" : "Property",

package/test/sap/ui/core/qunit/odata/v4/data/metadata.xml

@@ -63,7 +63,7 @@
 				<NavigationProperty Name="EMPLOYEE_2_MANAGER"
 					Type="com.sap.gateway.default.iwbep.tea_busi.v0001.MANAGER"/>
 				<NavigationProperty Name="EMPLOYEE_2_TEAM" Type="com.sap.gateway.default.iwbep.tea_busi.v0001.TEAM"
-					Nullable="false"/>
+					Nullable="false" Partner="TEAM_2_EMPLOYEES"/>
 				<Property Name="__CT__FAKE__Message" Type="SAP__self.__CT__FAKE__Message" />
 				<Annotation Term="com.sap.vocabularies.Common.v1.Messages" Path="__CT__FAKE__Message/__FAKE__Messages" />
 			</EntityType>
@@ -104,7 +104,7 @@
 				<Property Name="MANAGER_ID" Type="Edm.String" Nullable="false" MaxLength="4"/>
 				<Property Name="BudgetCurrency" Type="Edm.String" Nullable="false" MaxLength="5"/>
 				<Property Name="Budget" Type="Edm.Decimal" Nullable="false" Precision="16" Scale="variable"/>
-				<NavigationProperty Name="TEAM_2_EMPLOYEES"
+				<NavigationProperty Name="TEAM_2_EMPLOYEES" Partner="EMPLOYEE_2_TEAM"
 					Type="Collection(com.sap.gateway.default.iwbep.tea_busi.v0001.Worker)"/>
 				<NavigationProperty Name="TEAM_2_MANAGER"
 					Type="com.sap.gateway.default.iwbep.tea_busi.v0001.MANAGER" Nullable="false"/>