@openui5/sap.ui.core 1.121.3 → 1.121.5

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

@@ -81,6 +81,8 @@ sap.ui.define([
 		assert.strictEqual(oBinding.oCachePromise.getResult(), null);
 		assert.ok(oBinding.hasOwnProperty("mCacheQueryOptions"));
 		assert.strictEqual(oBinding.mCacheQueryOptions, undefined);
+		assert.ok(oBinding.hasOwnProperty("fnDeregisterChangeListener"));
+		assert.strictEqual(oBinding.fnDeregisterChangeListener, undefined);
 		assert.ok(oBinding.hasOwnProperty("oFetchCacheCallToken"));
 		assert.strictEqual(oBinding.oFetchCacheCallToken, undefined);
 		assert.ok(oBinding.hasOwnProperty("mLateQueryOptions"));
@@ -95,7 +97,6 @@ sap.ui.define([
 	QUnit.test("destroy", function (assert) {
 		var oBinding = new ODataBinding(),
 			oCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {}
 			},
 			// we might become asynchronous due to auto $expand/$select reading $metadata
@@ -107,8 +108,7 @@ sap.ui.define([
 		oBinding.mCacheQueryOptions = {};
 		oBinding.oContext = {}; // @see sap.ui.model.Binding's c'tor
 		oBinding.oFetchCacheCallToken = {};
-		this.mock(oCache).expects("deregisterChangeListener")
-			.withExactArgs("", sinon.match.same(oBinding));
+		this.mock(oBinding).expects("deregisterChangeListener").withExactArgs();
 		this.mock(oCache).expects("setActive").withExactArgs(false);
 
 		// code under test
@@ -1678,7 +1678,6 @@ sap.ui.define([
 			},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {},
 				setLateQueryOptions : function () {}
 			},
@@ -1693,8 +1692,8 @@ sap.ui.define([
 			.withExactArgs("/resource/path", sinon.match.same(mMergedQueryOptions), undefined,
 				undefined, "~sGroupId~", sinon.match.same(oOldCache))
 			.returns(oNewCache);
-		this.mock(oOldCache).expects("deregisterChangeListener").exactly(bOldCacheIsReused ? 0 : 1)
-			.withExactArgs("", sinon.match.same(oBinding));
+		this.mock(oBinding).expects("deregisterChangeListener").exactly(bOldCacheIsReused ? 0 : 1)
+			.withExactArgs();
 		this.mock(oOldCache).expects("setActive").exactly(bOldCacheIsReused ? 0 : 1)
 			.withExactArgs(false);
 		this.mock(oOldCache).expects("setLateQueryOptions")
@@ -1744,7 +1743,6 @@ sap.ui.define([
 			oContext = {},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {}
 			},
 			mQueryOptions = {},
@@ -1775,8 +1773,7 @@ sap.ui.define([
 			.returns(oCache);
 		this.mock(oCache).expects("setLateQueryOptions").exactly(bHasLateQueryOptions ? 1 : 0)
 			.withExactArgs(sinon.match.same(mLateQueryOptions));
-		this.mock(oOldCache).expects("deregisterChangeListener")
-			.withExactArgs("", sinon.match.same(oBinding));
+		this.mock(oBinding).expects("deregisterChangeListener").withExactArgs();
 		this.mock(oOldCache).expects("setActive").withExactArgs(false);
 
 		assert.strictEqual(
@@ -1871,7 +1868,6 @@ sap.ui.define([
 			},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {}
 			},
 			mQueryOptions = {};
@@ -1890,8 +1886,7 @@ sap.ui.define([
 				sinon.match.same(oContext), "deep/resource/path", "~sGroupId~",
 				sinon.match.same(oOldCache))
 			.returns(oCache1);
-		this.mock(oOldCache).expects("deregisterChangeListener")
-			.withExactArgs("", sinon.match.same(oBinding));
+		this.mock(oBinding).expects("deregisterChangeListener").withExactArgs();
 		this.mock(oOldCache).expects("setActive").withExactArgs(false);
 
 		assert.strictEqual(
@@ -3033,70 +3028,23 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-["", "relative/path"].forEach(function (sRelativePath) {
-	QUnit.test(`doDeregisterChangeListener: matching cache, path=${sRelativePath}`, function () {
-		const oCache = {
-			deregisterChangeListener : mustBeMocked
-		};
-		const oBinding = new ODataBinding({
-			oCachePromise : SyncPromise.resolve(oCache)
-		});
-
-		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("/resolved/path");
-		this.mock(_Helper).expects("getRelativePath")
-			.withExactArgs("/absolute/path", "/resolved/path").returns(sRelativePath);
-		this.mock(oCache).expects("deregisterChangeListener")
-			.withExactArgs(sRelativePath, "~oListener~");
+	QUnit.test("deregisterChangeListener", function (assert) {
+		const oBinding = new ODataBinding();
+		const fnDeregisterChangeListener = sinon.spy();
 
 		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-});
+		oBinding.setDeregisterChangeListener(fnDeregisterChangeListener);
 
-	//*********************************************************************************************
-[false, true].forEach(function (bCache) {
-	QUnit.test(`doDeregisterChangeListener: no ${bCache ? "matching " : ""} cache`, function () {
-		const oBinding = new ODataBinding({
-			oCachePromise : SyncPromise.resolve(bCache ? {} : null),
-			oContext : {
-				getBinding : mustBeMocked
-			},
-			bRelative : true
-		});
-		const oParentBinding = {
-			doDeregisterChangeListener : mustBeMocked
-		};
-
-		this.mock(oBinding).expects("getResolvedPath").exactly(bCache ? 1 : 0)
-			.withExactArgs().returns("/resolved/path");
-		this.mock(_Helper).expects("getRelativePath").exactly(bCache ? 1 : 0)
-			.withExactArgs("/absolute/path", "/resolved/path").returns(undefined);
-		this.mock(oBinding.oContext).expects("getBinding").withExactArgs().returns(oParentBinding);
-		this.mock(oParentBinding).expects("doDeregisterChangeListener")
-			.withExactArgs("/absolute/path", "~oListener~");
+		assert.strictEqual(oBinding.fnDeregisterChangeListener, fnDeregisterChangeListener);
 
 		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-});
-
-	//*********************************************************************************************
-	QUnit.test("doDeregisterChangeListener: no cache and no valid context", function () {
-		const oBinding = new ODataBinding();
+		oBinding.deregisterChangeListener();
 
-		// code under test - unresolved
-		oBinding.doDeregisterChangeListener();
+		assert.ok(fnDeregisterChangeListener.calledOnceWithExactly());
+		assert.strictEqual(oBinding.fnDeregisterChangeListener, undefined);
 
-		oBinding.oContext = {getBinding : "do not call"};
-
-		// code under test - absolute with context
-		oBinding.doDeregisterChangeListener();
-
-		oBinding.bRelative = true;
-		oBinding.oContext = {};
-
-		// code under test - base context
-		oBinding.doDeregisterChangeListener();
+		// code under test
+		oBinding.deregisterChangeListener();
 	});
 
 	//*********************************************************************************************
@@ -3106,7 +3054,6 @@ sap.ui.define([
 		[
 			"adjustPredicate",
 			"destroy",
-			"doDeregisterChangeListener",
 			"hasPendingChangesForPath"
 		].forEach(function (sMethod) {
 			assert.strictEqual(asODataBinding.prototype[sMethod], oBinding[sMethod]);

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

@@ -385,8 +385,7 @@ sap.ui.define([
 	QUnit.test("mixin", function (assert) {
 		var oBinding = this.bindContext("/EMPLOYEES('42')"),
 			oMixin = {},
-			aOverriddenFunctions = ["adjustPredicate", "destroy", "doDeregisterChangeListener",
-				"doSetProperty", "doSuspend"];
+			aOverriddenFunctions = ["adjustPredicate", "destroy", "doSetProperty", "doSuspend"];
 
 		asODataParentBinding(oMixin);
 
@@ -703,7 +702,10 @@ sap.ui.define([
 		});
 
 		this.mock(oBinding).expects("createReadGroupLock").withExactArgs("group", true)
-			.returns(oGroupLock2);
+			.callsFake(function () {
+				oBinding.oReadGroupLock = oGroupLock2;
+			});
+		this.mock(oBinding.oCache).expects("hasChangeListeners").withExactArgs().returns(true);
 
 		// code under test (as called by ODataBinding#refresh)
 		oBinding.refreshInternal("", "group", true);
@@ -893,8 +895,8 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/OperationImport(...)/$Parameter/" + oFixture.path)
 			.returns("$Parameter/" + oFixture.path);
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), oFixture.path,
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oBinding.oOperation), oFixture.path,
 				sinon.match.same(oListener));
 
 		assert.strictEqual(
@@ -961,8 +963,8 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/OperationImport(...)/$Parameter/address/city")
 			.returns("$Parameter/address/city");
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), "address/city",
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oBinding.oOperation), "address/city",
 				sinon.match.same(oListener));
 
 		assert.strictEqual(
@@ -3484,7 +3486,9 @@ sap.ui.define([
 				});
 			}),
 			fnFetchCache,
-			oGroupLock = {},
+			oGroupLock = {
+				unlock : mustBeMocked
+			},
 			fnHasChangeListeners,
 			sPath = {/*EMPLOYEES('42')*/},
 			oRefreshResult;
@@ -3498,7 +3502,9 @@ sap.ui.define([
 		fnHasChangeListeners = this.mock(oBinding.oCache).expects("hasChangeListeners")
 			.withExactArgs().returns(bHasChangeListeners);
 		this.mock(oBinding).expects("createReadGroupLock").withExactArgs("myGroup", false)
-			.returns(oGroupLock);
+			.callsFake(function () {
+				oBinding.oReadGroupLock = oGroupLock;
+			});
 		this.mock(oBinding).expects("removeCachesAndMessages")
 			.withExactArgs(sinon.match.same(sPath));
 		fnFetchCache = oBindingMock.expects("fetchCache")
@@ -3506,6 +3512,8 @@ sap.ui.define([
 				bKeepCacheOnError ? "myGroup" : undefined);
 		this.mock(oBinding).expects("createRefreshPromise").exactly(bHasChangeListeners ? 1 : 0)
 			.withExactArgs(bKeepCacheOnError).callThrough();
+		this.mock(oGroupLock).expects("unlock").exactly(bHasChangeListeners ? 0 : 1)
+			.withExactArgs();
 		this.mock(oBinding).expects("refreshDependentBindings")
 			.withExactArgs(sinon.match.same(sPath), "myGroup", sinon.match.same(bCheckUpdate),
 				bKeepCacheOnError)
@@ -3518,6 +3526,7 @@ sap.ui.define([
 			});
 
 		assert.strictEqual(oBinding.bHasFetchedExpandSelectProperties, false);
+		assert.strictEqual(oBinding.oReadGroupLock, bHasChangeListeners ? oGroupLock : undefined);
 		sinon.assert.callOrder(fnHasChangeListeners, fnFetchCache);
 		if (bHasChangeListeners) { // simulate fetchValue triggered by a property binding
 			oBinding.resolveRefreshPromise(Promise.resolve());
@@ -3585,6 +3594,7 @@ sap.ui.define([
 				.callsFake(function () {
 					oBinding.oReadGroupLock = oReadGroupLock;
 				});
+			this.mock(oBinding.oCache).expects("hasChangeListeners").withExactArgs().returns(true);
 			this.mock(_Cache).expects("createSingle").returns(oCache);
 
 			// code under test
@@ -4496,8 +4506,6 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/Operation(...)/$Parameter/name")
 			.returns("$Parameter/name");
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), "name", null);
 
 		// code under test value setting
 		oBinding.setParameter("name", "value");
@@ -5202,37 +5210,6 @@ sap.ui.define([
 		});
 	});
 
-	//*********************************************************************************************
-	QUnit.test("doDeregisterChangeListener: super", function () {
-		const oBinding = this.bindContext("/EMPLOYEES('42')");
-
-		this.mock(asODataParentBinding.prototype).expects("doDeregisterChangeListener")
-			.on(oBinding).withExactArgs("/absolute/path", "~oListener~");
-
-		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-
-	//*********************************************************************************************
-[undefined, "", "relative/path"].forEach(function (sRelativePath, i) {
-	QUnit.test(`doDeregisterChangeListener: operation binding, ${sRelativePath}`, function () {
-		const oBinding = this.bindContext("/Operation(...)");
-
-		this.mock(_Helper).expects("getRelativePath")
-			.withExactArgs("/absolute/path", "/Operation(...)/$Parameter")
-			.returns(sRelativePath);
-		this.mock(_Helper).expects("removeByPath").exactly(i ? 1 : 0)
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), sRelativePath,
-				"~oListener~");
-		this.mock(asODataParentBinding.prototype).expects("doDeregisterChangeListener")
-			.exactly(i ? 0 : 1)
-			.on(oBinding).withExactArgs("/absolute/path", sinon.match.same("~oListener~"));
-
-		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-});
-
 	//*********************************************************************************************
 	QUnit.test("doSetProperty: non operational binding", function (assert) {
 		var oBinding = this.bindContext("/Employee('42')"),

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

@@ -2583,10 +2583,10 @@ sap.ui.define([
 [
 	{success : true},
 	{success : true, refreshKeptElementsFails : true},
+	{success : true, destroyedWhileRefreshing : true},
 	{success : false}
 ].forEach(function (oFixture) {
-	var sTitle = "refreshInternal: relative with own cache, success=" + oFixture.success
-			+ ", refreshKeptElements fails = " + oFixture.refreshKeptElementsFails;
+	var sTitle = "refreshInternal: relative with own cache, " + JSON.stringify(oFixture);
 
 	QUnit.test(sTitle, function (assert) {
 		var oBinding,
@@ -2629,12 +2629,18 @@ sap.ui.define([
 		this.mock(oBinding).expects("fetchCache")
 			.withExactArgs(sinon.match.same(oContext), false, /*bKeepQueryOptions*/true, undefined);
 		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup")
-			.returns(oRefreshKeptElementsPromise);
+			.callsFake(function () {
+				if (oFixture.destroyedWhileRefreshing) {
+					oBinding.oHeaderContext = undefined;
+				}
+				return oRefreshKeptElementsPromise;
+			});
 		this.mock(oBinding).expects("createRefreshPromise").withExactArgs(undefined).callThrough();
 		this.mock(oBinding).expects("reset")
 			.withExactArgs(ChangeReason.Refresh, undefined, "myGroup");
 		this.mock(oBinding.oHeaderContext).expects("checkUpdateInternal")
-			.exactly(oFixture.success && !oFixture.refreshKeptElementsFails ? 1 : 0)
+			.exactly(oFixture.success && !oFixture.refreshKeptElementsFails
+				&& !oFixture.destroyedWhileRefreshing ? 1 : 0)
 			.withExactArgs()
 			.returns(oHeaderContextCheckUpdatePromise);
 
@@ -2647,7 +2653,9 @@ sap.ui.define([
 		return oRefreshResult.then(function (oResult) {
 			assert.ok(oFixture.success);
 			assert.notOk(oFixture.refreshKeptElementsFails);
-			assert.strictEqual(oResult, oHeaderContextCheckUpdatePromise.getResult());
+			if (!oFixture.destroyedWhileRefreshing) {
+				assert.strictEqual(oResult, oHeaderContextCheckUpdatePromise.getResult());
+			}
 		}, function (oError0) {
 			assert.strictEqual(oError0, oError);
 			assert.ok(!oFixture.success || oFixture.refreshKeptElementsFails);

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

@@ -5092,12 +5092,6 @@ sap.ui.define([
 			var oListBindingWithoutUI = oModel.bindList("/SalesOrderList"),
 				oCreatedPromise = oListBindingWithoutUI.create({}, true).created();
 
-			// This error is unavoidable as #fetchValue runs right after creating the context, but
-			// fails as the context is deleted already.
-			that.oLogMock.expects("error")
-				.withArgs(sinon.match("Failed to drill-down into ($uid="),
-					sSalesOrderService + "SalesOrderList", "sap.ui.model.odata.v4.lib._Cache");
-
 			assert.ok(oModel.hasPendingChanges());
 			assert.ok(oListBindingWithoutUI.hasPendingChanges());
 			assert.strictEqual(oListBindingWithoutUI.getLength(), 1 + 10/*length is not final*/);
@@ -23265,12 +23259,6 @@ sap.ui.define([
 
 			assert.strictEqual(oTable.getBinding("rows").getContexts().length, 2);
 
-			that.oLogMock.expects("error").withExactArgs("Failed to drill-down into"
-				+ " (Country='UK',Region='Z')/Region, invalid segment: (Country='UK',Region='Z')",
-				"/aggregation/BusinessPartners"
-				+ "?$apply=groupby((Country,Region),aggregate(SalesAmount))",
-				"sap.ui.model.odata.v4.lib._Cache");
-
 			// code under test
 			assert.strictEqual(oThirdRow.getProperty("Region"), undefined,
 				"$byPredicate has been cleaned up");
@@ -61406,4 +61394,34 @@ make root = ${bMakeRoot}`;
 			]);
 		});
 	});
+
+	//*********************************************************************************************
+	// Scenario: setBindingContext of a table w/o cache below a context binding w/o own properties.
+	// See that this context binding can refresh properly afterwards.
+	// SNOW: DINC0117588
+	QUnit.test("DINC0117588", async function (assert) {
+		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
+		const sView = `
+<FlexBox id="root" binding="{/TEAMS('0')}">
+	<Table id="table" items="{TEAM_2_EMPLOYEES}">
+		<Text id="id" text="{ID}"/>
+	</Table>
+</FlexBox>`;
+
+		this.expectRequest("TEAMS('0')?$select=Team_Id&$expand=TEAM_2_EMPLOYEES($select=ID)", {
+				TeamId : "0",
+				TEAM_2_EMPLOYEES : [
+					{ID : "1"}
+				]
+			})
+			.expectChange("id", ["1"]);
+
+		await this.createView(assert, sView, oModel);
+
+		this.oView.byId("table").setBindingContext(null);
+
+		await this.waitForChanges(assert);
+
+		await this.oView.byId("root").getBindingContext().requestRefresh();
+	});
 });

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

@@ -4106,7 +4106,6 @@ sap.ui.define([
 		[
 			"adjustPredicate",
 			"destroy",
-			"doDeregisterChangeListener",
 			"getGeneration",
 			"hasPendingChangesForPath",
 			"isUnchangedParameter",

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

@@ -2246,7 +2246,6 @@ sap.ui.define([
 
 		oPropertyBinding.oCheckUpdateCallToken = {};
 		oPropertyBinding.vValue = "foo";
-		this.mock(oPropertyBinding).expects("deregisterChangeListener").withExactArgs();
 		this.mock(this.oModel).expects("bindingDestroyed")
 			.withExactArgs(sinon.match.same(oPropertyBinding));
 		this.mock(asODataBinding.prototype).expects("destroy").on(oPropertyBinding).withExactArgs();
@@ -2361,23 +2360,6 @@ sap.ui.define([
 		oBinding.resetInvalidDataState();
 	});
 
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener", function () {
-		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE");
-
-		oBinding.sReducedPath = "/reduced/path";
-		this.mock(oBinding).expects("doDeregisterChangeListener")
-			.withExactArgs("/reduced/path", sinon.match.same(oBinding));
-
-		// code under test
-		oBinding.deregisterChangeListener();
-
-		oBinding.sReducedPath = undefined;
-
-		// code under test - no further doDeregisterChangeListener
-		oBinding.deregisterChangeListener();
-	});
-
 	//*********************************************************************************************
 	QUnit.test("visitSideEffects", function () {
 		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE");

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

@@ -1113,8 +1113,8 @@ sap.ui.define([
 	QUnit.test("_Cache#registerChangeListener", function () {
 		var oCache = new _Cache(this.oRequestor, "TEAMS");
 
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "path", "listener");
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oCache), "path", "listener");
 
 		oCache.registerChangeListener("path", "listener");
 	});
@@ -1123,47 +1123,28 @@ sap.ui.define([
 	QUnit.test("_Cache#registerChangeListener: $$sharedRequest", function () {
 		var oCache = new _Cache(this.oRequestor, "TEAMS", undefined, false, undefined, true);
 
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "", "listener2");
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oCache), "", "listener2");
 
 		oCache.registerChangeListener("path", "listener1");
 		oCache.registerChangeListener("", "listener2");
 	});
 
-	//*********************************************************************************************
-	QUnit.test("_Cache#deregisterChangeListener", function () {
-		var oCache = new _Cache(this.oRequestor, "TEAMS");
-
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "path", "listener");
-
-		oCache.deregisterChangeListener("path", "listener");
-	});
-
-	//*********************************************************************************************
-	QUnit.test("_Cache#deregisterChangeListener: $$sharedRequest", function () {
-		var oCache = new _Cache(this.oRequestor, "TEAMS", undefined, false, undefined, true);
-
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "", "listener2");
-
-		oCache.deregisterChangeListener("path", "listener1");
-		oCache.deregisterChangeListener("", "listener2");
-	});
-
 	//*********************************************************************************************
 	QUnit.test("_Cache#hasChangeListeners", function (assert) {
-		var oCache = new _Cache(this.oRequestor, "TEAMS");
-
-		// code under test
-		assert.strictEqual(oCache.hasChangeListeners(), false);
+		const oCache = new _Cache(this.oRequestor, "TEAMS");
+		const oHelperMock = this.mock(_Helper);
 
-		oCache.registerChangeListener("path", "listener");
+		oHelperMock.expects("isEmptyObject")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners))
+			.returns(false);
 
 		// code under test
 		assert.strictEqual(oCache.hasChangeListeners(), true);
 
-		oCache.deregisterChangeListener("path", "listener");
+		oHelperMock.expects("isEmptyObject")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners))
+			.returns(true);
 
 		// code under test
 		assert.strictEqual(oCache.hasChangeListeners(), false);
@@ -1783,6 +1764,20 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("_Cache#drillDown: unexpected missing predicate", function (assert) {
+		const oCache = new _Cache(this.oRequestor, "Products");
+
+		this.oLogMock.expects("info").withExactArgs(
+			"Failed to drill-down into ('42')/entity/foo/bar/baz, invalid segment: ('42')",
+			"/~/Products", sClassName);
+
+		return oCache.drillDown([], "('42')/entity/foo/bar/baz")
+			.then(function (vValue) {
+				assert.strictEqual(vValue, undefined);
+			});
+	});
+
 	//*********************************************************************************************
 [0, "None"].forEach(function (vPermissions) {
 	QUnit.test("_Cache#drillDown: @Core.Permissions: " + vPermissions, function (assert) {
@@ -8267,7 +8262,10 @@ sap.ui.define([
 			oCache = this.createCache(sResourcePath),
 			fnCancelCallback = sinon.spy(),
 			iCountAfterCreate = bInactive ? 26 : 27,
-			oCountChangeListener = {onChange : function () {}},
+			oCountChangeListener = {
+				onChange : function () {},
+				setDeregisterChangeListener : function () {}
+			},
 			oCountChangeListenerMock = this.mock(oCountChangeListener),
 			oGroupLock = {
 				cancel : function () {},
@@ -8493,7 +8491,8 @@ sap.ui.define([
 			oListener = {
 				onChange : function () {
 					assert.ok(false);
-				}
+				},
+				setDeregisterChangeListener : function () {}
 			},
 			that = this;
 
@@ -8535,7 +8534,10 @@ sap.ui.define([
 				oCacheMock = this.mock(oCache),
 				oCancelNestedExpectation,
 				aCollection = [],
-				oCountChangeListener = {onChange : function () {}},
+				oCountChangeListener = {
+					onChange : function () {},
+					setDeregisterChangeListener : function () {}
+				},
 				oCreatePromise,
 				oGroupLock = {getGroupId : function () {}},
 				oHelperMock = this.mock(_Helper),
@@ -8667,7 +8669,8 @@ sap.ui.define([
 			oCache.registerChangeListener(sPathInCache + sTransientPredicate + "/Name", {
 				onChange : function () {
 					assert.ok(false, "No change event for Name");
-				}
+				},
+				setDeregisterChangeListener : function () {}
 			});
 
 			if (bDropTransientElement) { // side-effects refresh might drop transient element
@@ -9447,7 +9450,10 @@ sap.ui.define([
 
 	QUnit.test(sTitle, function (assert) {
 		var oCache = _Cache.create(this.oRequestor, "Employees"),
-			oCountChangeListener = {onChange : function () {}},
+			oCountChangeListener = {
+				onChange : function () {},
+				setDeregisterChangeListener : function () {}
+			},
 			oCreateGroupLock = {getGroupId : function () {}},
 			oHelperMock = this.mock(_Helper),
 			oPromise,

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

@@ -14,6 +14,8 @@ sap.ui.define([
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Helper";
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	/**
 	 * Checks the given cloned error according to the given expectations.
 	 *
@@ -5451,4 +5453,32 @@ sap.ui.define([
 				}
 			});
 	});
+
+	//*********************************************************************************************
+	QUnit.test("registerChangeListener", function () {
+		const oOwner = {
+			mChangeListeners : "~listeners1~"
+		};
+		const oListener = {
+			setDeregisterChangeListener : mustBeMocked
+		};
+
+		this.mock(_Helper).expects("addByPath")
+			.withExactArgs("~listeners1~", "~path~", sinon.match.same(oListener));
+		const oCallbackExpectation = this.mock(oListener).expects("setDeregisterChangeListener")
+			.withExactArgs(sinon.match.func);
+
+		// code under test
+		_Helper.registerChangeListener(oOwner, "~path~", oListener);
+
+		oOwner.mChangeListeners = "~listeners2~";
+		this.mock(_Helper).expects("removeByPath")
+			.withExactArgs("~listeners2~", "~path~", sinon.match.same(oListener));
+
+		// code under test
+		oCallbackExpectation.args[0][0]();
+
+		// code under test
+		_Helper.registerChangeListener(oOwner, "~path~");
+	});
 });