@openui5/sap.ui.core 1.123.1 → 1.124.1

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

@@ -86,10 +86,6 @@ sap.ui.define([
 			});
 		assert.ok(bCreatedPromisePending, "Created Promise still pending");
 
-		assert.throws(function () {
-			// code under test
-			oContext.setCreatedPersisted();
-		}, new Error("Already 'created', currently transient: true"));
 		assert.throws(function () {
 			// code under test
 			oContext.setPersisted();
@@ -101,27 +97,6 @@ sap.ui.define([
 		});
 	});
 
-	//*********************************************************************************************
-	QUnit.test("setCreatedPersisted", function (assert) {
-		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/foo", 42);
-
-		// code under test
-		oContext.setCreatedPersisted();
-
-		assert.strictEqual(oContext.isInactive(), undefined);
-		assert.strictEqual(oContext.isTransient(), false);
-		assert.ok(oContext.created() instanceof Promise);
-
-		assert.throws(function () {
-			// code under test
-			oContext.setCreatedPersisted();
-		}, new Error("Already 'created', currently transient: false"));
-
-		return oContext.created().then(function (vResult) {
-			assert.strictEqual(vResult, undefined);
-		});
-	});
-
 	//*********************************************************************************************
 	QUnit.test("setPersisted", function (assert) {
 		const oContext
@@ -245,6 +220,16 @@ sap.ui.define([
 			undefined);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("getIndex/getModelIndex: return index after destroy", function (assert) {
+		const oContext = Context.create(undefined/*oModel*/, undefined/*oBinding*/, "/foo", 42);
+
+		// code under test
+		assert.strictEqual(oContext.getIndex(), 42);
+		// code under test
+		assert.strictEqual(oContext.getModelIndex(), 42);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("path must be absolute", function (assert) {
 		assert.throws(function () {
@@ -498,11 +483,10 @@ sap.ui.define([
 			assert.notOk(oContext.mChangeListeners);
 
 			this.mock(oBinding).expects("fetchValue").never();
-			this.mock(_Helper).expects("addByPath")
-				.withExactArgs(sinon.match.object, "", "~listener~")
-				.callsFake((mChangeListeners) => {
-					assert.strictEqual(mChangeListeners, oContext.mChangeListeners);
-					assert.deepEqual(mChangeListeners, {});
+			this.mock(_Helper).expects("registerChangeListener")
+				.withExactArgs(sinon.match.same(oContext), "", "~listener~")
+				.callsFake(() => {
+					assert.deepEqual(oContext.mChangeListeners, {});
 				});
 		}
 
@@ -2187,20 +2171,34 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-[0, 1, 2, 3].forEach((i) => { // 0: w/ parent, 1: null parent, 2: no parent, 3: no args
-	QUnit.test(`move: #${i}`, function (assert) {
+[undefined, {}, {parent : undefined}, {nextSibling : undefined},
+	{nextSibling : undefined, parent : undefined}].forEach(function (mParameters, i) {
+	QUnit.test("move: no move happens, " + i, async function (assert) {
+		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('42')", 42);
+
+		// code under test
+		const oPromise = oContext.move(mParameters);
+
+		assert.ok(oPromise instanceof Promise);
+		assert.strictEqual(await oPromise, undefined);
+	});
+});
+
+	//*********************************************************************************************
+[null, Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')", 23)].forEach((oParent) => {
+	[undefined, null, Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('24')", 24)]
+		.forEach((oSibling) => {
+	QUnit.test(`move: parent=${oParent}, nextSibling=${oSibling}`, function (assert) {
 		const oBinding = {
 			move : mustBeMocked
 		};
 		const oContext = Context.create({/*oModel*/}, oBinding, "/EMPLOYEES('42')", 42);
+		this.mock(oContext).expects("isAncestorOf")
+			.withExactArgs(sinon.match.same(oParent)).returns(false);
 		let bResolved = false;
-		this.stub(oContext, "toString"); // called by SinonJS, would call #isTransient :-(
-		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
-		this.mock(oContext).expects("isTransient").withExactArgs().returns(false);
-		this.mock(oContext).expects("isAncestorOf").withExactArgs(i ? null : "~oParent~")
-			.returns(false);
 		this.mock(oBinding).expects("move")
-			.withExactArgs(sinon.match.same(oContext), i ? null : "~oParent~")
+			.withExactArgs(sinon.match.same(oContext), sinon.match.same(oParent),
+				sinon.match.same(oSibling))
 			.returns(new SyncPromise(function (resolve) {
 				setTimeout(function () {
 					bResolved = true;
@@ -2208,47 +2206,28 @@ sap.ui.define([
 				}, 0);
 			}));
 
-		let oPromise;
-		switch (i) {
-			case 0:
-				// code under test
-				oPromise = oContext.move({parent : "~oParent~"});
-				break;
-
-			case 1:
-				// code under test
-				oPromise = oContext.move({parent : null});
-				break;
-
-			case 2:
-				// code under test
-				oPromise = oContext.move({});
-				break;
-
-			default:
-				// code under test
-				oPromise = oContext.move();
-		}
+		// code under test
+		const oPromise = oContext.move({nextSibling : oSibling, parent : oParent});
 
 		assert.ok(oPromise instanceof Promise);
 		return oPromise.then(function () {
 			assert.ok(bResolved, "not too soon");
 		});
 	});
+	});
 });
 
 	//*********************************************************************************************
 	QUnit.test("move: Unsupported parent context", function (assert) {
 		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('42')", 42);
-		this.stub(oContext, "toString"); // called by SinonJS, would call #isTransient :-(
-		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
-		this.mock(oContext).expects("isTransient").withExactArgs().returns(false);
-		this.mock(oContext).expects("isAncestorOf").withExactArgs("~oParent~").returns(true);
+		const oParent = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')", 23);
+		this.mock(oContext).expects("isAncestorOf").withExactArgs(sinon.match.same(oParent))
+			.returns(true);
 
 		assert.throws(function () {
 			// code under test
-			oContext.move({parent : "~oParent~"});
-		}, new Error("Unsupported parent context: ~oParent~"));
+			oContext.move({parent : oParent});
+		}, new Error("Unsupported parent context: " + oParent));
 	});
 
 	//*********************************************************************************************
@@ -2257,15 +2236,15 @@ sap.ui.define([
 			move : mustBeMocked
 		};
 		const oContext = Context.create({/*oModel*/}, oBinding, "/EMPLOYEES('42')", 42);
-		this.stub(oContext, "toString"); // called by SinonJS, would call #isTransient :-(
-		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
-		this.mock(oContext).expects("isTransient").withExactArgs().returns(false);
-		this.mock(oContext).expects("isAncestorOf").withExactArgs("~oParent~").returns(false);
-		this.mock(oBinding).expects("move").withExactArgs(sinon.match.same(oContext), "~oParent~")
+		const oParent = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')", 23);
+		this.mock(oContext).expects("isAncestorOf").withExactArgs(sinon.match.same(oParent))
+			.returns(false);
+		this.mock(oBinding).expects("move")
+			.withExactArgs(sinon.match.same(oContext), sinon.match.same(oParent), undefined)
 			.returns(SyncPromise.reject("~error~"));
 
 		// code under test
-		const oPromise = oContext.move({parent : "~oParent~"});
+		const oPromise = oContext.move({parent : oParent});
 
 		assert.ok(oPromise instanceof Promise);
 		return oPromise.then(function () {
@@ -2283,7 +2262,7 @@ sap.ui.define([
 
 		assert.throws(function () {
 			// code under test
-			oContext.move();
+			oContext.move({parent : null});
 		}, new Error("Cannot move " + oContext));
 	});
 
@@ -2296,7 +2275,7 @@ sap.ui.define([
 
 		assert.throws(function () {
 			// code under test
-			oContext.move();
+			oContext.move({parent : null});
 		}, new Error("Cannot move " + oContext));
 	});
 
@@ -2309,10 +2288,51 @@ sap.ui.define([
 
 		assert.throws(function () {
 			// code under test
-			oContext.move();
+			oContext.move({parent : null});
 		}, new Error("Cannot move " + oContext));
 	});
 
+	//*********************************************************************************************
+	QUnit.test("move: Cannot move; parent deleted", function (assert) {
+		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('42')", 42);
+		const oParent = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')", 23);
+		// Note: cannot easily mock #toString which calls #isDeleted etc.
+		this.mock(oParent).expects("isDeleted").withExactArgs().atLeast(1).returns(true);
+
+		assert.throws(function () {
+			// code under test
+			oContext.move({parent : oParent});
+		}, new Error("Cannot move to " + oParent));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("move: Cannot move; parent transient", function (assert) {
+		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('42')", 42);
+		const oParent = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')", 23);
+		// Note: cannot easily mock #toString which calls #isDeleted etc.
+		this.mock(oParent).expects("isDeleted").withExactArgs().atLeast(1).returns(false);
+		this.mock(oParent).expects("isTransient").withExactArgs().atLeast(1).returns(true);
+
+		assert.throws(function () {
+			// code under test
+			oContext.move({parent : oParent});
+		}, new Error("Cannot move to " + oParent));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("move: Cannot move; parent outside collection", function (assert) {
+		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('42')", 42);
+		const oParent = Context.create({/*oModel*/}, {/*oBinding*/}, "/EMPLOYEES('23')");
+		// Note: cannot easily mock #toString which calls #isDeleted etc.
+		this.mock(oParent).expects("isDeleted").withExactArgs().atLeast(1).returns(false);
+		this.mock(oParent).expects("isTransient").withExactArgs().atLeast(1).returns(false);
+
+		assert.throws(function () {
+			// code under test
+			oContext.move({parent : oParent});
+		}, new Error("Cannot move to " + oParent));
+	});
+
 	//*********************************************************************************************
 	QUnit.test("patch", function (assert) {
 		var oCache = {
@@ -4570,32 +4590,41 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-[false, true].forEach(function (bHasChangeListeners) {
-	QUnit.test("setSelected: with change listeners=" + bHasChangeListeners, function () {
-		const oCache = {setProperty : mustBeMocked};
-		const oBinding = {getHeaderContext : "~function~", _getAllExistingContexts : mustBeMocked};
+[false, true].forEach(function (bIsHeaderContext) {
+	[false, true].forEach(function (bHasChangeListeners) {
+		if (!bIsHeaderContext && bHasChangeListeners) {
+			return; // unrealistic
+		}
+		const sTitle = `setSelected: is header context=${bIsHeaderContext},
+			with change listeners=${bHasChangeListeners}`;
+
+	QUnit.test(sTitle, function () {
+		const oBinding = {getHeaderContext : mustBeMocked, _getAllExistingContexts : mustBeMocked};
 		// Note: oBinding is optional, it might already be missing in certain cases!
 		const oContext = Context.create({/*oModel*/}, oBinding, "/some/path", 42);
-		const aRowContexts = [
-			{setSelected : mustBeMocked},
-			{setSelected : mustBeMocked}
-		];
 
 		if (bHasChangeListeners) {
 			oContext.mChangeListeners = "~mChangeListeners~";
+		}
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oBinding).expects("getHeaderContext").returns(bIsHeaderContext ? oContext : null);
+		if (bIsHeaderContext) {
+			const aRowContexts = [
+				{setSelected : mustBeMocked},
+				{setSelected : mustBeMocked}
+			];
 			this.mock(oBinding).expects("_getAllExistingContexts").withExactArgs()
 				.returns(aRowContexts);
 			aRowContexts.forEach((oRowContext) => {
 				this.mock(oRowContext).expects("setSelected").withExactArgs("~selected~");
 			});
 		}
-
-		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
 		this.mock(_Helper).expects("fireChange").exactly(bHasChangeListeners ? 1 : 0)
 			.withExactArgs("~mChangeListeners~", "", "~selected~");
 		this.mock(oContext).expects("withCache")
 			.withExactArgs(sinon.match.func, "")
 			.callsFake((fnProcessor) => {
+				const oCache = {setProperty : mustBeMocked};
 				this.mock(oCache).expects("setProperty")
 					.withExactArgs("@$ui5.context.isSelected", "~selected~", "~sPath~");
 
@@ -4606,35 +4635,59 @@ sap.ui.define([
 		// code under test
 		oContext.setSelected("~selected~");
 	});
+	});
 });
 
 	//*********************************************************************************************
-	QUnit.test("setSelected: special cases", function () {
+	QUnit.test("setSelected: binding destroyed", function () {
 		const oBinding = {
-			getHeaderContext : function () {}
+			getHeaderContext : mustBeMocked
 		};
-		const oCache = {};
 		const oContext = Context.create({/*oModel*/}, oBinding, "/some/path", 42);
-		const oContextMock = this.mock(oContext);
 
-		oContextMock.expects("isDeleted").withExactArgs().returns(false);
-		oContextMock.expects("withCache")
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oBinding).expects("getHeaderContext").returns(undefined);
+		this.mock(oContext).expects("withCache")
 			.withExactArgs(sinon.match.func, "")
 			.callsFake((fnProcessor) => {
 				oContext.oBinding = undefined;
 
-				return fnProcessor(oCache, "~sPath~");
+				return fnProcessor({}, "~sPath~");
 			});
-		oContextMock.expects("doSetSelected").withExactArgs(true);
+		this.mock(oContext).expects("doSetSelected").withExactArgs(true);
 
 		// code under test - binding destroyed
 		oContext.setSelected(true);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("setSelected: flag already set", function () {
+		const oBinding = {
+			getHeaderContext : mustBeMocked,
+			onKeepAliveChanged : mustBeMocked
+		};
+		const oContext = Context.create({/*oModel*/}, oBinding, "/some/path", 42);
 
-		// no additional calls to withCache
-		oContextMock.expects("doSetSelected").withExactArgs(false);
+		oContext.mChangeListeners = "~mChangeListeners~";
+		this.mock(oContext).expects("isDeleted").twice().withExactArgs().returns(false);
+		this.mock(oBinding).expects("getHeaderContext").twice().returns(undefined);
+		this.mock(_Helper).expects("fireChange").withExactArgs("~mChangeListeners~", "", true);
+		this.mock(oContext).expects("withCache")
+			.withExactArgs(sinon.match.func, "")
+			.callsFake((fnProcessor) => {
+				const oCache = {setProperty : mustBeMocked};
+				this.mock(oCache).expects("setProperty")
+					.withExactArgs("@$ui5.context.isSelected", true, "~sPath~");
 
-		// code under test - flag unchanged
-		oContext.setSelected(false);
+				return fnProcessor(oCache, "~sPath~");
+			});
+		this.mock(oBinding).expects("onKeepAliveChanged").twice().withExactArgs(oContext);
+
+		// code under test
+		oContext.setSelected(true);
+
+		// code under test
+		oContext.setSelected(true);
 	});
 
 	//*********************************************************************************************
@@ -4911,32 +4964,6 @@ sap.ui.define([
 		}, "~oError~");
 	});
 
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener", function (assert) {
-		const oContext = Context.create({/*oModel*/}, {/*oBinding*/}, "/path");
-		let oListener = {
-			getPath : () => "foo"
-		};
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(), false, "no mChangeListeners");
-
-		oContext.mChangeListeners = {};
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(oListener), false, "wrong path");
-
-		oListener = {
-			getPath : () => "@$ui5.context.isSelected"
-		};
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oContext.mChangeListeners), "",
-				sinon.match.same(oListener));
-
-		// code under test
-		assert.strictEqual(oContext.deregisterChangeListener(oListener), true);
-	});
-
 	//*********************************************************************************************
 [0, 1].forEach(function (iFailureIndex) {
 	QUnit.test("updateAfterCreate, fail=" + iFailureIndex, function () {

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
@@ -1717,7 +1717,6 @@ sap.ui.define([
 			},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {},
 				setLateQueryOptions : function () {}
 			},
@@ -1732,8 +1731,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")
@@ -1783,7 +1782,6 @@ sap.ui.define([
 			oContext = {},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {}
 			},
 			mQueryOptions = {},
@@ -1814,8 +1812,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(
@@ -1910,7 +1907,6 @@ sap.ui.define([
 			},
 			mMergedQueryOptions = {},
 			oOldCache = {
-				deregisterChangeListener : function () {},
 				setActive : function () {}
 			},
 			mQueryOptions = {};
@@ -1929,8 +1925,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(
@@ -2629,7 +2624,11 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [
-	"$$canonicalPath", "$$noPatch", "$$ownRequest", "$$patchWithoutSideEffects"
+	"$$canonicalPath",
+	"$$clearSelectionOnFilter",
+	"$$noPatch",
+	"$$ownRequest",
+	"$$patchWithoutSideEffects"
 ].forEach(function (sName) {
 	QUnit.test("checkBindingParameters, " + sName, function (assert) {
 		var aAllowedParameters = [sName],
@@ -3068,70 +3067,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();
 	});
 
 	//*********************************************************************************************
@@ -3141,7 +3093,6 @@ sap.ui.define([
 		[
 			"adjustPredicate",
 			"destroy",
-			"doDeregisterChangeListener",
 			"hasPendingChangesForPath"
 		].forEach(function (sMethod) {
 			assert.strictEqual(asODataBinding.prototype[sMethod], oBinding[sMethod]);