@openui5/sap.ui.core 1.117.1 → 1.118.0

package/test/sap/ui/core/qunit/odata/v4/lib/_Cache.qunit.js

@@ -384,12 +384,10 @@ sap.ui.define([
 				"@odata.etag" : sEtag
 			}, {}],
 			fnCallback = this.spy(),
-			oCountExpectation,
 			oDeleted = {index : "~insert~"},
 			oError = new Error(""),
 			oGroupLock = {getGroupId : function () {}},
 			oHelperMock = this.mock(_Helper),
-			oIndexExpectation,
 			oMessage1 = {code : "CODE1"},
 			oMessage2 = {code : "CODE2", persistent : true},
 			oMessageExpectation,
@@ -398,14 +396,12 @@ sap.ui.define([
 			oPromise,
 			oRequestExpectation,
 			oRequestPromise,
-			oSpliceExpectation,
+			oRestoreExpectation,
 			bSuccess = oFixture.iStatus === 200 || oFixture.iStatus === 404;
 
 		function checkCleanedUp() {
 			assert.notOk("@$ui5.context.isDeleted" in aCacheData[1]);
 			assert.deepEqual(aCacheData.$deleted, ["a", "b", "c"]);
-			assert.strictEqual(aCacheData.$created, oFixture.bCreated ? 2 : 1);
-			assert.strictEqual(oCache.iActiveElements, oFixture.bCreated && !sPath ? 2 : 1);
 			if (oFixture.bInactive) {
 				sinon.assert.calledOnceWithExactly(fnCallback, 1, -1);
 			} else {
@@ -427,16 +423,12 @@ sap.ui.define([
 				.exactly(oFixture.bMessagesToRestore ? 1 : 0)
 				.withExactArgs(undefined, oFixture.iStatus < 0
 					? [oMessage1, oMessage2] : [oMessage1]);
-			aCacheData.$count = 2; // ensure that count is updated
-			oCountExpectation = oHelperMock.expects("addToCount").exactly(iOnFailure)
-				.withExactArgs(sinon.match.same(oCache.mChangeListeners), sPath,
-					sinon.match.same(aCacheData), 1);
-			aCacheData.$created = 1;
-			oCache.iActiveElements = 1;
-			oSpliceExpectation = that.mock(aCacheData).expects("splice").exactly(iOnFailure)
-				.withExactArgs("~insert~", 0, sinon.match.same(aCacheData[1]));
-			oIndexExpectation = that.mock(oCache).expects("adjustIndexes").exactly(iOnFailure)
-				.withExactArgs(sPath, sinon.match.same(aCacheData), "~insert~", 1, 2);
+			oRestoreExpectation = that.mock(oCache).expects("restoreElement").exactly(iOnFailure)
+				.withExactArgs(sinon.match.same(aCacheData), "~insert~",
+					sinon.match.same(aCacheData[1]), sPath, 2)
+				.callsFake(() => {
+					assert.deepEqual(aCacheData.$deleted.length, 4);
+				});
 			if (oFixture.iStatus !== 200) {
 				if (oFixture.iStatus < 0) { // simulate the cancel
 					oError.canceled = true;
@@ -445,9 +437,7 @@ sap.ui.define([
 					oRequestExpectation.args[0][6]();
 
 					assert.strictEqual(oMessageExpectation.called, !!oFixture.bMessagesToRestore);
-					assert.ok(oCountExpectation.called);
-					assert.ok(oSpliceExpectation.called);
-					assert.ok(oIndexExpectation.called);
+					assert.ok(oRestoreExpectation.called);
 					checkCleanedUp();
 				}
 				throw oError;
@@ -462,9 +452,6 @@ sap.ui.define([
 		this.mock(oCache).expects("fetchValue")
 			.withExactArgs(sinon.match.same(_GroupLock.$cached), sPath)
 			.returns(SyncPromise.resolve(aCacheData));
-		this.mock(_Cache).expects("from$skip")
-			.withExactArgs(oFixture.bCreated ? "-1" : "0", sinon.match.same(aCacheData))
-			.returns(1);
 		oError.status = oFixture.iStatus;
 		oHelperMock.expects("getPrivateAnnotation")
 			.withExactArgs(aCacheData[1], "predicate").callThrough();
@@ -507,9 +494,8 @@ sap.ui.define([
 				sinon.match.same(oRequestPromise));
 
 		// code under test
-		oPromise = oCache._delete(oGroupLock, "Equipments('1')",
-			(sPath && sPath + "/") + (oFixture.bCreated ? "-1" : "0"), oFixture.oEntity,
-			fnCallback);
+		oPromise = oCache._delete(oGroupLock, "Equipments('1')", (sPath && sPath + "/") + "1",
+			oFixture.oEntity, fnCallback);
 
 		assert.strictEqual(aCacheData[1]["@$ui5.context.isDeleted"], true);
 		sinon.assert.calledOnceWithExactly(fnCallback, 1, -1);
@@ -605,8 +591,7 @@ sap.ui.define([
 		};
 
 		oCache.fetchValue = function () {};
-		aCacheData.$count = 2; // ensure that count is not updated
-		this.mock(_Helper).expects("setCount").never();
+		this.mock(oCache).expects("restoreElement").never();
 		this.mock(oCache).expects("fetchValue")
 			.withExactArgs(sinon.match.same(_GroupLock.$cached), "")
 			.returns(SyncPromise.resolve(aCacheData));
@@ -670,9 +655,6 @@ sap.ui.define([
 		this.mock(oCache).expects("fetchValue")
 			.withExactArgs(sinon.match.same(_GroupLock.$cached), "EMPLOYEE_2_EQUIPMENTS")
 			.returns(SyncPromise.resolve(aCacheData));
-		this.mock(_Cache).expects("from$skip")
-			.withExactArgs("1", sinon.match.same(aCacheData))
-			.returns(1);
 		// not interested in buildQueryString
 		this.oRequestorMock.expects("request").never();
 		this.mock(oCache).expects("requestCount").never();
@@ -721,8 +703,6 @@ sap.ui.define([
 		this.mock(oCache).expects("fetchValue")
 			.withExactArgs(sinon.match.same(_GroupLock.$cached), "SO_2_SOITEM")
 			.returns(SyncPromise.resolve(aElements));
-		this.mock(_Cache).expects("from$skip").withExactArgs("-1", sinon.match.same(aElements))
-			.returns(1);
 		oHelperMock.expects("getPrivateAnnotation")
 			.withExactArgs(sinon.match.same(oElement), "predicate").returns("n/a");
 		oHelperMock.expects("getPrivateAnnotation")
@@ -738,7 +718,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oElement), "Deleted from deep create");
 
 		// code under test
-		oPromise = oCache._delete(oGroupLock, undefined, "SO_2_SOITEM/-1", null, fnCallback);
+		oPromise = oCache._delete(oGroupLock, undefined, "SO_2_SOITEM/1", null, fnCallback);
 
 		assert.strictEqual(oPromise.getResult(), undefined);
 		assert.deepEqual(aPostBodyCollection, ["~a~", "~c~"]);
@@ -997,6 +977,36 @@ sap.ui.define([
 		assert.deepEqual(aCacheData.$byPredicate, {"('2')" : aCacheData[0]});
 	});
 
+	//*********************************************************************************************
+["", "~path~"].forEach(function (sPath) {
+	[false, true].forEach(function (bTransient) {
+	QUnit.test(`_Cache#restoreElement, path=${sPath}, transient=${bTransient}`, function (assert) {
+		const oCache = new _Cache(this.oRequestor, "TEAMS");
+		oCache.iLimit = 234;
+		oCache.iActiveElements = 1;
+		const aElements = [];
+		aElements.$created = 2;
+
+		this.mock(oCache).expects("adjustIndexes")
+			.withExactArgs(sPath, sinon.match.same(aElements), 42, 1, "~iDeletedIndex~");
+		this.mock(_Helper).expects("getPrivateAnnotation")
+			.withExactArgs("~oElement~", "transientPredicate")
+			.returns(bTransient ? "($uid=id-1-23)" : undefined);
+		this.mock(_Helper).expects("addToCount")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), sPath,
+				sinon.match.same(aElements), 1);
+		this.mock(aElements).expects("splice").withExactArgs(42, 0, "~oElement~");
+
+		// code under test
+		oCache.restoreElement(aElements, 42, "~oElement~", sPath, "~iDeletedIndex~");
+
+		assert.strictEqual(oCache.iLimit, bTransient || sPath ? 234 : 235);
+		assert.strictEqual(aElements.$created, bTransient ? 3 : 2);
+		assert.strictEqual(oCache.iActiveElements, bTransient && !sPath ? 2 : 1);
+	});
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("_Cache#registerChangeListener", function () {
 		var oCache = new _Cache(this.oRequestor, "TEAMS");
@@ -5605,6 +5615,13 @@ sap.ui.define([
 			"insert a created entity at the end: only non-created entities move");
 	});
 
+	//*********************************************************************************************
+	QUnit.test("Cache#adjustIndexes: no path and no aReadRequests", function () {
+		const oCache = new _Cache(this.oRequestor, "Employees"); // would be an _AggregationCache
+
+		oCache.adjustIndexes("", [], 1);
+	});
+
 	//*********************************************************************************************
 [false, true].forEach(function (bSharedRequest) {
 	QUnit.test("CollectionCache: bSharedRequest = " + bSharedRequest, function (assert) {
@@ -8037,6 +8054,7 @@ sap.ui.define([
 	QUnit.test("CollectionCache#read: $count & create, bInactive=" + bInactive, function (assert) {
 		var sResourcePath = "Employees",
 			oCache = this.createCache(sResourcePath),
+			fnCancelCallback = sinon.spy(),
 			iCountAfterCreate = bInactive ? 26 : 27,
 			oCountChangeListener = {onChange : function () {}},
 			oCountChangeListenerMock = this.mock(oCountChangeListener),
@@ -8069,7 +8087,8 @@ sap.ui.define([
 				oCache.registerChangeListener("$count", oCountChangeListener);
 
 				return oCache.create(oGroupLock, SyncPromise.resolve("Employees"), "",
-					sTransientPredicate, {}, null, false, function fnSubmitCallback() {});
+					sTransientPredicate, {}, false, null, function fnSubmitCallback() {},
+					fnCancelCallback);
 			})
 			.then(function () {
 				var oReadGroupLock = {
@@ -8086,8 +8105,14 @@ sap.ui.define([
 				assert.strictEqual(oCache.iActiveElements, bInactive ? 0 : 1);
 
 				oCountChangeListenerMock.expects("onChange").exactly(bInactive ? 0 : 1)
-					.withExactArgs(26, undefined);
-				that.mock(oGroupLock).expects("cancel").withExactArgs();
+					.withExactArgs(26, undefined)
+					.callsFake(function () {
+						assert.strictEqual(fnCancelCallback.callCount, 0, "not yet");
+					});
+				that.mock(oGroupLock).expects("cancel").withExactArgs()
+					.callsFake(function () {
+						assert.strictEqual(fnCancelCallback.callCount, 1);
+					});
 
 				// code under test - cancel the create
 				oPostRequest.args[0][6]();
@@ -8552,7 +8577,7 @@ sap.ui.define([
 
 		// code under test
 		oCache._delete(null, "TEAMS('0')/TEAM_2_EMPLOYEES",
-			sPathInCache + "/-1", //TODO sPathInCache + sTransientPredicate
+			sPathInCache + "/1", //TODO sPathInCache + sTransientPredicate
 			null, false, fnDeleteCallback);
 
 		assert.strictEqual(aCollection.$count, 41);
@@ -8973,7 +8998,7 @@ sap.ui.define([
 						"No 'update' allowed while waiting for server response",
 						oError.message);
 				});
-			oCache._delete(oDeleteGroupLock, "n/a", /*TODO sTransientPredicate*/"-1")
+			oCache._delete(oDeleteGroupLock, "n/a", /*TODO sTransientPredicate*/"0")
 				.then(function () {
 					assert.ok(false, "unexpected success - _delete");
 				}, function (oError) {
@@ -9182,6 +9207,9 @@ sap.ui.define([
 				that.oRequestorMock.expects("relocate")
 					.withExactArgs(sParkedGroupId, sinon.match.same(oPostBody), sUpdateGroupId);
 
+				if (oFixture.createGroupId === "$inactive.$auto") {
+					oCache.setInactive(sTransientPredicate, false); // activate
+				}
 				// code under test - first update -> relocate
 				aPromises.push(oCache.update(oGroupLock1, "Name", "John Doe", that.spy(), "n/a",
 					sTransientPredicate));
@@ -9202,15 +9230,9 @@ sap.ui.define([
 	//*********************************************************************************************
 	//TODO move to _Cache!
 [false, true].forEach(function (bInactive) {
-	[false, true].forEach(function (bStayInactive) {
-		[false, true].forEach(function (bAtEndOfCreated) {
-			var sTitle = "CollectionCache: create entity without initial data, bInactive="
-				+ bInactive + ", bStayInactive= " + bStayInactive + ", bAtEndOfCreated="
-				+ bAtEndOfCreated;
-
-			if (!bInactive && bStayInactive) {
-				return;
-			}
+	[false, true].forEach(function (bAtEndOfCreated) {
+		var sTitle = "CollectionCache: create entity without initial data, bInactive="
+			+ bInactive + ", bAtEndOfCreated=" + bAtEndOfCreated;
 
 	QUnit.test(sTitle, function (assert) {
 		var oCache = _Cache.create(this.oRequestor, "Employees"),
@@ -9277,27 +9299,13 @@ sap.ui.define([
 		}
 
 		this.mock(oUpdateGroupLock).expects("getGroupId").withExactArgs().returns("updateGroup");
-		oHelperMock.expects("updateAll").exactly(bStayInactive ? 1 : 0)
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), sTransientPredicate,
-				sinon.match.same(oCache.aElements[bAtEndOfCreated ? 1 : 0]),
-				{"@$ui5.context.isInactive" : 1}).callThrough();
-		this.oRequestorMock.expects("relocate").exactly(bInactive && !bStayInactive ? 1 : 0)
-			.withExactArgs("$inactive.updateGroup",
-				sinon.match.same(oCache.aElements[bAtEndOfCreated ? 1 : 0]["@$ui5._"].postBody),
-				"updateGroup");
 		oHelperMock.expects("updateAll")
 			.withExactArgs({}, sTransientPredicate, sinon.match.object, {Name : "foo"});
-		this.mock(oCountChangeListener).expects("onChange")
-			.exactly(bInactive && !bStayInactive ? 1 : 0)
-			.withExactArgs(43, undefined);
 		oCache.registerChangeListener("$count", oCountChangeListener);
 		oHelperMock.expects("updateAll")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), sTransientPredicate,
-				sinon.match.same(oCache.aElements[bAtEndOfCreated ? 1 : 0]),
-					bInactive && !bStayInactive
-						? {Name : "foo", "@$ui5.context.isInactive" : false}
-						: {Name : "foo"}
-				).callThrough();
+				sinon.match.same(oCache.aElements[bAtEndOfCreated ? 1 : 0]), {Name : "foo"})
+			.callThrough();
 		oHelperMock.expects("updateSelected")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), sTransientPredicate,
 				sinon.match.same(oCache.aElements[bAtEndOfCreated ? 1 : 0]),
@@ -9310,29 +9318,20 @@ sap.ui.define([
 		this.mock(oUpdateGroupLock).expects("unlock").withExactArgs();
 
 		// code under test
-		oCache.update(oUpdateGroupLock, "Name", "foo", this.spy(), undefined, sTransientPredicate,
-			undefined, undefined, undefined, undefined, bStayInactive);
+		oCache.update(oUpdateGroupLock, "Name", "foo", this.spy(), undefined, sTransientPredicate);
 
 		assert.strictEqual(oCache.aElements[bAtEndOfCreated ? 1 : 0]["@$ui5._"].transient,
-			bStayInactive ? "$inactive.updateGroup" : "updateGroup");
-
-		if (bInactive) {
-			assert.strictEqual(
-				_Helper.hasPrivateAnnotation(oCache.aElements[bAtEndOfCreated ? 1 : 0],
-					"initialData"), bStayInactive);
-			assert.strictEqual(
-				oCache.aElements[bAtEndOfCreated ? 1 : 0]["@$ui5.context.isInactive"],
-				bStayInactive ? 1 : false, "isInactive");
-			assert.strictEqual(oCache.iActiveElements, bStayInactive ? 0 : 1);
-		} else {
-			assert.strictEqual(
-				oCache.aElements[bAtEndOfCreated ? 1 : 0]["@$ui5.context.isInactive"], undefined);
-			assert.strictEqual(oCache.iActiveElements, 1);
-		}
+			bInactive ? "$inactive.updateGroup" : "updateGroup");
+		assert.strictEqual(
+			_Helper.hasPrivateAnnotation(oCache.aElements[bAtEndOfCreated ? 1 : 0],
+				"initialData"), bInactive);
+		assert.strictEqual(
+			oCache.aElements[bAtEndOfCreated ? 1 : 0]["@$ui5.context.isInactive"],
+			bInactive ? true : undefined, "isInactive");
+		assert.strictEqual(oCache.iActiveElements, bInactive ? 0 : 1);
 
 		return oPromise;
 	});
-		});
 	});
 });
 
@@ -9644,7 +9643,7 @@ sap.ui.define([
 
 		// code under test
 		oDeletePromise = oCache._delete(null, "n/a",
-			/*TODO sTransientPredicate*/"-1", null, false, function () {
+			/*TODO sTransientPredicate*/"0", null, false, function () {
 				throw new Error();
 			});
 
@@ -9727,7 +9726,7 @@ sap.ui.define([
 				.returns(Promise.resolve());
 
 			// code under test
-			return oCache._delete(oDeleteGroupLock, sEditUrl, /*TODO sTransientPredicate*/"-1",
+			return oCache._delete(oDeleteGroupLock, sEditUrl, /*TODO sTransientPredicate*/"0",
 					null, fnCallback)
 				.then(function () {
 					sinon.assert.calledOnceWithExactly(fnCallback, 0, -1);
@@ -10685,6 +10684,40 @@ sap.ui.define([
 		assert.strictEqual(oCache.isDeletingInOtherGroup("group"), true);
 	});
 
+	//*********************************************************************************************
+[false, 1].forEach(function (bInactive) {
+	QUnit.test(`CollectionCache#setInactive(${bInactive})`, function (assert) {
+		const iActivateCount = bInactive ? 0 : 1;
+		const oCache = this.createCache("Employees");
+		oCache.iActiveElements = 42;
+		this.mock(oCache).expects("getValue").withExactArgs("($uid=id-1-23)").returns("~oElement~");
+		this.mock(_Helper).expects("updateAll")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "($uid=id-1-23)",
+				"~oElement~", {"@$ui5.context.isInactive" : bInactive});
+		this.mock(_Helper).expects("deletePrivateAnnotation").exactly(iActivateCount)
+			.withExactArgs("~oElement~", "initialData");
+		this.mock(_Helper).expects("addToCount").exactly(iActivateCount)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "",
+				sinon.match.same(oCache.aElements), 1);
+
+		// code under test
+		oCache.setInactive("($uid=id-1-23)", bInactive);
+
+		assert.strictEqual(oCache.iActiveElements, bInactive ? 42 : 43);
+	});
+});
+
+	//*********************************************************************************************
+	QUnit.test("CollectionCache#setEmpty", function (assert) {
+		const oCache = this.createCache("Employees");
+
+		// code under test
+		oCache.setEmpty();
+
+		assert.strictEqual(oCache.aElements.$count, 0);
+		assert.strictEqual(oCache.iLimit, 0);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("SingleCache", function (assert) {
 		var oCache,

package/test/sap/ui/core/qunit/odata/v4/lib/_Helper.qunit.js

@@ -2009,6 +2009,16 @@ sap.ui.define([
 			"/service/Foo('1')/Bar(baz='2',qux=3)");
 	});
 
+	//*********************************************************************************************
+	QUnit.test("makeRelativeUrl", function (assert) {
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/baz", "/foo/bar"), "baz");
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/bar/qux", "/foo/baz"), "bar/qux");
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/baz", "/foo/bar/qux"), "../baz");
+		assert.strictEqual(
+			_Helper.makeRelativeUrl("/Bar(baz='2',qux=3)", "/Foo"),
+			"Bar(baz='2',qux=3)");
+	});
+
 	//*********************************************************************************************
 	QUnit.test("drillDown", function (assert) {
 		var oObject = {

package/test/sap/ui/core/qunit/odata/v4/lib/_Requestor.qunit.js

@@ -5465,8 +5465,15 @@ sap.ui.define([
 	});
 
 	//*****************************************************************************************
-	QUnit.test("processOptimisticBatch: n+1 start, optimistic batch matches", function (assert) {
-		var sKey = window.location.href,
+[false, true, undefined].forEach((bEnabled) => { // undefined -> no enabler assigned
+	[false, true].forEach((bCacheManagerRejects) => {
+	const sTitle = `processOptimisticBatch: n+1 start, optimistic batch matches, 
+		enabler=${bEnabled}, del rejects=${bCacheManagerRejects}`;
+	QUnit.test(sTitle, function (assert) {
+		var done = assert.async(),
+			oError = new Error("CacheManager.del rejected"),
+			iGetReporterCount,
+			sKey = window.location.href,
 			oOptimisticBatch = {
 				firstBatch : {
 					requests : "~optimisticRequests~",
@@ -5475,26 +5482,108 @@ sap.ui.define([
 				key : sKey,
 				result : "~optimisticBatchResult~"
 			},
-			oRequestor = _Requestor.create("/", oModelInterface);
+			fnEnabler = bEnabled === undefined ? undefined : sinon.stub().resolves(bEnabled),
+			oRequestor = _Requestor.create("/", oModelInterface),
+			fnReporter = function (oError0) {
+				assert.strictEqual(oError0, oError);
+				done();
+			};
+
+		if (bEnabled) {
+			iGetReporterCount = 1;
+		} else {
+			iGetReporterCount = bEnabled !== undefined ? 1 : 0;
+		}
 
 		oRequestor.oOptimisticBatch = oOptimisticBatch;
+
 		this.mock(_Requestor).expects("matchesOptimisticBatch")
 			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
 			.returns(true);
+
+		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").returns(fnEnabler);
+		this.mock(oModelInterface).expects("getReporter").exactly(iGetReporterCount)
+			.withExactArgs().returns(fnReporter);
+		if (bEnabled === false) {
+			if (bCacheManagerRejects) {
+				this.mock(CacheManager).expects("del")
+					.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey).rejects(oError);
+			} else {
+				this.mock(CacheManager).expects("del")
+					.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey).resolves();
+				this.oLogMock.expects("info")
+					.withExactArgs("optimistic batch: disabled, response deleted", sKey,
+						sClassName);
+				done();
+			}
+		}
 		this.oLogMock.expects("info")
 			.withExactArgs("optimistic batch: success, response consumed", sKey, sClassName);
 		this.mock(CacheManager).expects("set").never();
-		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").never();
 
 		// code under test
 		assert.strictEqual(oRequestor.processOptimisticBatch("~requests~", "~group~"),
 			"~optimisticBatchResult~");
 
 		assert.strictEqual(oRequestor.oOptimisticBatch, null);
+
+		if (bEnabled !== undefined) {
+			assert.strictEqual(fnEnabler.calledOnce, true);
+		}
+		if (bEnabled !== false) {
+			done();
+		}
+	});
+	});
+});
+
+	//*****************************************************************************************
+	const sTitle = "processOptimisticBatch: n+1 start, optimistic batch matches, enabler rejects";
+	QUnit.test(sTitle, function (assert) {
+		var oError = new Error("Enabler rejects"),
+			sKey = window.location.href,
+			oOptimisticBatch = {
+				firstBatch : {
+					requests : "~optimisticRequests~",
+					groupId : "~optimisticGroup~"
+				},
+				key : sKey,
+				result : "~optimisticBatchResult~"
+			},
+			fnEnabler = sinon.stub().rejects(oError),
+			oRequestor = _Requestor.create("/", oModelInterface),
+			fnReporter = function (oError0) {
+				assert.strictEqual(oError0, oError);
+			};
+
+		oRequestor.oOptimisticBatch = oOptimisticBatch;
+
+		this.mock(_Requestor).expects("matchesOptimisticBatch")
+			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
+			.returns(true);
+
+		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").returns(fnEnabler);
+		this.mock(oModelInterface).expects("getReporter").withExactArgs().returns(fnReporter);
+
+		this.oLogMock.expects("info")
+			.withExactArgs("optimistic batch: disabled, response deleted", sKey, sClassName)
+			.never();
+		this.oLogMock.expects("info")
+			.withExactArgs("optimistic batch: success, response consumed", sKey, sClassName);
+		this.mock(CacheManager).expects("set").never();
+		this.mock(CacheManager).expects("del").never();
+
+		// code under test
+		assert.strictEqual(oRequestor.processOptimisticBatch("~requests~", "~group~"),
+			"~optimisticBatchResult~");
+
+		assert.strictEqual(fnEnabler.calledOnce, true);
 	});
 
 	//*****************************************************************************************
-	QUnit.test("processOptimisticBatch: mismatch, CacheManager.del rejects", function (assert) {
+[false, true].forEach((bRejects) => {
+	const sTitle = `processOptimisticBatch: mismatch, CacheManager.del rejects=${bRejects}`;
+	QUnit.test(sTitle, function (assert) {
 		// Note: this test covers also the successful CacheManager.del case
 		var oCacheManagerMock = this.mock(CacheManager),
 			done = assert.async(),
@@ -5519,11 +5608,19 @@ sap.ui.define([
 		this.mock(_Requestor).expects("matchesOptimisticBatch")
 			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
 			.returns(false);
-		this.oLogMock.expects("warning")
-			.withExactArgs("optimistic batch: mismatch, response skipped", sKey, sClassName);
-		oCacheManagerMock.expects("del")
-			.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
-			.rejects(oError);
+
+		if (bRejects) {
+			oCacheManagerMock.expects("del")
+				.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
+				.rejects(oError);
+		} else {
+			oCacheManagerMock.expects("del")
+				.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
+				.resolves();
+			this.oLogMock.expects("warning")
+				.withExactArgs("optimistic batch: mismatch, response skipped", sKey, sClassName);
+			done();
+		}
 		oModelInterfaceMock.expects("getReporter")
 			.withExactArgs()
 			.returns(fnReporter);
@@ -5537,6 +5634,7 @@ sap.ui.define([
 
 		assert.strictEqual(oRequestor.oOptimisticBatch, null);
 	});
+});
 
 	//*****************************************************************************************
 	QUnit.test("hasOnlyPatchesWithoutSideEffects", function (assert) {

package/test/sap/ui/core/qunit/odata/v4/lib/_V2Requestor.qunit.js

@@ -1735,7 +1735,7 @@ sap.ui.define([
 			oRequestor = _Requestor.create("/", oModelInterface, undefined, undefined, "2.0");
 
 		// code under test
-		oRequestor.reportHeaderMessages("[]");
+		oRequestor.reportHeaderMessages("resource/path", "[]");
 
 		assert.notOk(fnreportTransitionMessages.called);
 	});

package/test/sap/ui/core/qunit/opa/Opa5PageObject.qunit.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/test/Opa5",
 	"sap/ui/test/PageObjectFactory",
 	"sap/base/Log",
-	"./utils/view"
-], function (Opa, Opa5, PageObjectFactory, Log, viewUtils) {
+	"./utils/view",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Opa, Opa5, PageObjectFactory, Log, viewUtils, nextUIUpdate) {
 	"use strict";
 
 	// preset some globals to avoid issues with QUnit's 'noglobals' option
@@ -226,15 +227,13 @@ sap.ui.define([
 		beforeEach: function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			Promise.all([
+			return Promise.all([
 				viewUtils.createXmlView("foo", "myFooView"),
 				viewUtils.createXmlView("bar", "myBarView")
 			]).then(function (aViews) {
 				this.oView = aViews[0].placeAt("qunit-fixture");
 				this.oView2 = aViews[1].placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});