@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -40,7 +40,10 @@ sap.ui.define([
 			oElement["@$ui5.node.isExpanded"] = undefined;
 			oPlaceholder["@$ui5.node.isExpanded"] = undefined;
 		}
-		this.mock(_Helper).expects("copyPrivateAnnotation")
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("copyPrivateAnnotation")
+			.withExactArgs(sinon.match.same(oPlaceholder), "cache", sinon.match.same(oElement));
+		oHelperMock.expects("copyPrivateAnnotation")
 			.withExactArgs(sinon.match.same(oPlaceholder), "spliced", sinon.match.same(oElement));
 
 		// code under test
@@ -64,7 +67,10 @@ sap.ui.define([
 			oPlaceholder = _AggregationHelper.createPlaceholder(0, 42, oCache);
 
 		this.mock(_AggregationHelper).expects("checkNodeProperty").never();
-		this.mock(_Helper).expects("copyPrivateAnnotation")
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("copyPrivateAnnotation")
+			.withExactArgs(sinon.match.same(oPlaceholder), "cache", sinon.match.same(oElement));
+		oHelperMock.expects("copyPrivateAnnotation")
 			.withExactArgs(sinon.match.same(oPlaceholder), "spliced", sinon.match.same(oElement));
 
 		// code under test
@@ -82,7 +88,10 @@ sap.ui.define([
 
 		this.mock(_AggregationHelper).expects("checkNodeProperty").never();
 		assert.notOk("@$ui5.node.isExpanded" in oPlaceholder);
-		this.mock(_Helper).expects("copyPrivateAnnotation").thrice()
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("copyPrivateAnnotation").thrice()
+			.withExactArgs(sinon.match.same(oPlaceholder), "cache", sinon.match.same(oElement));
+		oHelperMock.expects("copyPrivateAnnotation").thrice()
 			.withExactArgs(sinon.match.same(oPlaceholder), "spliced", sinon.match.same(oElement));
 
 		// code under test
@@ -1157,13 +1166,17 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-[undefined, 1, 2, 3].forEach(function (iExpandTo) {
+[undefined, 1, 2, 3, Number.MAX_SAFE_INTEGER, Infinity].forEach(function (iExpandTo) {
 	[false, true].forEach(function (bStored) {
 		[false, true].forEach(function (bAllLevels) {
 			var sTitle = "buildApply4Hierarchy: top levels of nodes, $select, expandTo : "
 				+ iExpandTo + ", property paths already stored: " + bStored
 				+ ", all levels: " + bAllLevels;
 
+			if (iExpandTo >= Number.MAX_SAFE_INTEGER && bAllLevels) {
+				return;
+			}
+
 	QUnit.test(sTitle, function (assert) {
 		var oAggregation = {
 				expandTo : iExpandTo,
@@ -1196,7 +1209,6 @@ sap.ui.define([
 			oAggregation.$ParentNavigationProperty = "SomeParentNavigation";
 		}
 		if (bAllLevels) {
-			iExpectedLevels = 999;
 			aExpectedSelect = ["ID", "SomeNodeID", "DistFromRoot", "myDrillState"];
 			oExpectedAggregation = {
 				$DistanceFromRootProperty : "DistFromRoot"
@@ -1236,7 +1248,10 @@ sap.ui.define([
 			// code under test
 			_AggregationHelper.buildApply4Hierarchy(oAggregation, mQueryOptions, bAllLevels),
 			{
-				$apply : "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/Foo"
+				$apply : bAllLevels || iExpandTo >= Number.MAX_SAFE_INTEGER
+					? "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/Foo"
+					+ ",HierarchyQualifier='X',NodeProperty='SomeNodeID')"
+					: "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/Foo"
 					+ ",HierarchyQualifier='X',NodeProperty='SomeNodeID',Levels=" + iExpectedLevels
 					+ ")",
 				$select : aExpectedSelect,

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

@@ -473,7 +473,7 @@ sap.ui.define([
 				return oDeleted;
 			});
 		this.mock(oCache).expects("removeElement")
-			.withExactArgs(sinon.match.same(aCacheData), 1, "('1')", sPath)
+			.withExactArgs(1, "('1')", sinon.match.same(aCacheData), sPath)
 			.callsFake(function () {
 				assert.ok(bAddDeleted, "removeElement called after addDeleted");
 			});
@@ -614,7 +614,8 @@ sap.ui.define([
 				}
 				bDeleted = true;
 			}));
-		this.mock(oCache).expects("removeElement").withExactArgs(aCacheData, undefined, "('1')", "")
+		this.mock(oCache).expects("removeElement")
+			.withExactArgs(undefined, "('1')", sinon.match.same(aCacheData), "")
 			// symbolic value would lead to a stronger test, but the value is checked internally
 			.returns(undefined);
 
@@ -659,7 +660,7 @@ sap.ui.define([
 		this.oRequestorMock.expects("request").never();
 		this.mock(oCache).expects("requestCount").never();
 		this.mock(oCache).expects("removeElement")
-			.withExactArgs(sinon.match.same(aCacheData), 1, "('1')", "EMPLOYEE_2_EQUIPMENTS")
+			.withExactArgs(1, "('1')", sinon.match.same(aCacheData), "EMPLOYEE_2_EQUIPMENTS")
 			.returns(1);
 		this.oModelInterfaceMock.expects("getMessagesByPath")
 			.withExactArgs("/EMPLOYEES('42')/EMPLOYEE_2_EQUIPMENTS('1')", true)
@@ -711,7 +712,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oElement), "transientPredicate").returns("($uid=1)");
 		this.mock(this.oRequestor).expects("removePost").never();
 		oRemoveElementExpectation = this.mock(oCache).expects("removeElement")
-			.withExactArgs(sinon.match.same(aElements), 1, "($uid=1)", "SO_2_SOITEM");
+			.withExactArgs(1, "($uid=1)", sinon.match.same(aElements), "SO_2_SOITEM");
 		oHelperMock.expects("getPrivateAnnotation")
 			.withExactArgs(sinon.match.same(oElement), "reject").returns(fnReject);
 		oHelperMock.expects("cancelNestedCreates")
@@ -858,7 +859,7 @@ sap.ui.define([
 					.withExactArgs(sPath, sinon.match.same(aCacheData), 1, -1);
 
 				// code under test
-				iIndex = oCache.removeElement(aCacheData, 2, "('1')", sPath);
+				iIndex = oCache.removeElement(2, "('1')", aCacheData, sPath);
 
 				assert.strictEqual(aCacheData.$created, bCreated ? 1 : 0);
 				assert.strictEqual(oCache.iActiveElements, 0);
@@ -914,7 +915,7 @@ sap.ui.define([
 		this.mock(oCache).expects("adjustIndexes").never();
 
 		// code under test
-		iIndex = oCache.removeElement(aCacheData, bJustDropped ? 2 : undefined, "('1')", "");
+		iIndex = oCache.removeElement(bJustDropped ? 2 : undefined, "('1')", aCacheData, "");
 
 		assert.strictEqual(iIndex, bJustDropped ? -1 : undefined);
 		assert.strictEqual(aCacheData.$count, 42);
@@ -963,7 +964,7 @@ sap.ui.define([
 			.withExactArgs("", sinon.match.same(aElements), 1, -1);
 
 		// code under test
-		iIndex = oCache.removeElement(undefined, 2, "('1')", "");
+		iIndex = oCache.removeElement(2, "('1')");
 
 		assert.strictEqual(iIndex, 1);
 		assert.strictEqual(aElements.$created, 22);
@@ -978,6 +979,67 @@ sap.ui.define([
 		assert.deepEqual(aElements.$byPredicate, {"('2')" : aElements[0]});
 	});
 
+	//*********************************************************************************************
+	QUnit.test("_Cache#removeElement: index only", function (assert) {
+		const oCache = new _Cache(this.oRequestor, "EMPLOYEES");
+		const oElement = {"@$ui5._" : {predicate : "('1')"}};
+		const oTransientElement = {
+			"@$ui5._" : {predicate : "('2')", transientPredicate : "($uid=id-1-23)"}
+		};
+		const aCacheData = [oTransientElement, "0", undefined, "2", undefined, oElement, "5"];
+		oCache.iLimit = 6;
+		oCache.iActiveElements = 1;
+		aCacheData.$byPredicate = {
+			"('1')" : oElement,
+			"('2')" : oTransientElement,
+			"($uid=id-1-23)" : oTransientElement,
+			"('5')" : "5"
+		};
+		aCacheData.$created = 1;
+
+		this.mock(_Cache).expects("getElementIndex").never();
+		this.mock(_Helper).expects("addToCount").thrice()
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "",
+				sinon.match.same(aCacheData), -1);
+		const oCacheMock = this.mock(oCache);
+		oCacheMock.expects("adjustIndexes").withExactArgs("", sinon.match.same(aCacheData), 5, -1);
+
+		// code under test
+		oCache.removeElement(5, undefined, aCacheData);
+
+		assert.deepEqual(aCacheData, [oTransientElement, "0", undefined, "2", undefined, "5"]);
+		assert.deepEqual(aCacheData.$byPredicate, {
+			"('2')" : oTransientElement,
+			"($uid=id-1-23)" : oTransientElement,
+			"('5')" : "5"
+		});
+		assert.deepEqual(aCacheData.$created, 1);
+		assert.strictEqual(oCache.iLimit, 5);
+		assert.strictEqual(oCache.iActiveElements, 1);
+
+		oCacheMock.expects("adjustIndexes").withExactArgs("", sinon.match.same(aCacheData), 0, -1);
+
+		// code under test
+		oCache.removeElement(0, undefined, aCacheData);
+
+		assert.deepEqual(aCacheData, ["0", undefined, "2", undefined, "5"]);
+		assert.deepEqual(aCacheData.$byPredicate, {"('5')" : "5"});
+		assert.deepEqual(aCacheData.$created, 0);
+		assert.strictEqual(oCache.iLimit, 5);
+		assert.strictEqual(oCache.iActiveElements, 0);
+
+		oCacheMock.expects("adjustIndexes").withExactArgs("", sinon.match.same(aCacheData), 3, -1);
+
+		// code under test
+		oCache.removeElement(3, undefined, aCacheData);
+
+		assert.deepEqual(aCacheData, ["0", undefined, "2", "5"]);
+		assert.deepEqual(aCacheData.$byPredicate, {"('5')" : "5"});
+		assert.deepEqual(aCacheData.$created, 0);
+		assert.strictEqual(oCache.iLimit, 4);
+		assert.strictEqual(oCache.iActiveElements, 0);
+	});
+
 	//*********************************************************************************************
 ["", "~path~"].forEach(function (sPath) {
 	[false, true].forEach(function (bTransient) {
@@ -998,7 +1060,7 @@ sap.ui.define([
 		this.mock(oCache).expects("adjustIndexes")
 			.withExactArgs(sPath, sinon.match.same(aElements), 42, 1, "~iDeletedIndex~");
 		const oHelperMock = this.mock(_Helper);
-		oHelperMock.expects("getPrivateAnnotation")
+		oHelperMock.expects("getPrivateAnnotation").exactly(bDefault && bTransient ? 0 : 1)
 			.withExactArgs("~oElement~", "transientPredicate")
 			.returns(bTransient ? "($uid=id-1-23)" : undefined);
 		oHelperMock.expects("addToCount")
@@ -1010,7 +1072,7 @@ sap.ui.define([
 
 		// code under test
 		oCache.restoreElement(bDefault ? undefined : aElements, 42, "~oElement~", sPath,
-			"~iDeletedIndex~");
+			"~iDeletedIndex~", bDefault && bTransient ? "($uid=id-1-23)" : undefined);
 
 		assert.strictEqual(oCache.iLimit, bTransient || sPath ? 234 : 235);
 		assert.strictEqual(aElements.$created, bTransient ? 3 : 2);
@@ -4066,7 +4128,8 @@ sap.ui.define([
 	{index : 1, keepAlive : false, lateQueryOptions : false},
 	{index : 1, keepAlive : false, lateQueryOptions : true},
 	{index : 1, keepAlive : true, lateQueryOptions : false},
-	{index : 1, keepAlive : true, lateQueryOptions : true}
+	{index : 1, keepAlive : true, lateQueryOptions : true},
+	{index : -1, keepAlive : false, lateQueryOptions : false}
 ].forEach(function (oFixture) {
 	["", "EMPLOYEE_2_EQUIPMENTS"].forEach(function (sPath) {
 		// undefined => no $select at all ;-)
@@ -4178,7 +4241,9 @@ sap.ui.define([
 					sinon.match.same(oResponse), sinon.match.same(mTypeForMetaPath), sPath,
 					bMessagesAlreadySelected === false && bMessagesAnnotated);
 
-			return oPromise;
+			return oPromise.then(function (oResult) {
+				assert.strictEqual(oResult, oResponse);
+			});
 		});
 	});
 		});
@@ -4314,7 +4379,7 @@ sap.ui.define([
 				assert.strictEqual(oCache.bSentRequest, true);
 
 				oCacheMock.expects("removeElement").exactly(bRemoved ? 1 : 0)
-					.withExactArgs(sinon.match.same(aElements), 1, sKeyPredicate,
+					.withExactArgs(1, sKeyPredicate, sinon.match.same(aElements),
 						"EMPLOYEE_2_EQUIPMENTS");
 				that.oModelInterfaceMock.expects("reportStateMessages")
 					.exactly(bRemoved ? 1 : 0)
@@ -4441,7 +4506,7 @@ sap.ui.define([
 				sinon.match.same(mTypeForMetaPath), "~");
 		oRemoveExpectation = oCacheMock.expects("removeElement")
 			.exactly(oFixture.inCollection ? 0 : 1)
-			.withExactArgs(sinon.match.same(aElements), 0, "('13')", "~");
+			.withExactArgs(0, "('13')", sinon.match.same(aElements), "~");
 
 		// code under test
 		return oCache.refreshSingleWithRemove(oGroupLock, "~", 0, "('13')", true,
@@ -5691,8 +5756,8 @@ sap.ui.define([
 				.withExactArgs(sinon.match.same(oParent), "postBody")
 				.returns(oPostBody);
 			oHelperMock.expects("getPrivateAnnotation")
-				.withExactArgs(sinon.match.same(oRoot), "select")
-				.returns(undefined);
+				.withExactArgs(sinon.match.same(oRoot), "select", {})
+				.returns({});
 			oCacheMock.expects("checkSharedRequest").withExactArgs();
 			oHelperMock.expects("getMetaPath").withExactArgs("to/collection").returns("meta/path");
 			oHelperMock.expects("setPrivateAnnotation")
@@ -6060,8 +6125,9 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [false, true].forEach(function (bSideEffectsRefresh) {
-	var sTitle = "CollectionCache#read: persisted inline creation rows; side-effects refresh = "
-			+ bSideEffectsRefresh;
+	[false, true].forEach(function (bIndexIsSkip) {
+		var sTitle = "CollectionCache#read: persisted inline creation rows; side-effects refresh = "
+				+ bSideEffectsRefresh + "; 'index' is $skip = " + bIndexIsSkip;
 
 	QUnit.test(sTitle, function (assert) {
 		var oCache = this.createCache("Employees"),
@@ -6091,19 +6157,22 @@ sap.ui.define([
 			oCache.oBackup = {};
 		}
 		this.mock(ODataUtils).expects("_getReadIntervals")
-			.withExactArgs(sinon.match.same(aElements), 0, 100, iExpectedPrefetch, 5 + 0)
+			.withExactArgs(sinon.match.same(aElements), bIndexIsSkip ? 5 : 0, 100,
+				iExpectedPrefetch, 5 + 0)
 			.returns([]); // test is all about iExpectedPrefetch, skip the rest...
 		this.oRequestorMock.expects("waitForBatchResponseReceived").never();
 		this.mock(oCache).expects("requestElements").never();
 		this.mock(oGroupLock).expects("unlock").withExactArgs();
 
 		// code under test
-		return oCache.read(0, 100, 0, oGroupLock).then(function (oResult) {
-			assert.deepEqual(oResult, {
-				"@odata.context" : undefined,
-				value : aElements
+		return oCache.read(0, 100, 0, oGroupLock, null, bIndexIsSkip)
+			.then(function (oResult) {
+				assert.deepEqual(oResult, {
+					"@odata.context" : undefined,
+					value : bIndexIsSkip ? [] : aElements
+				});
 			});
-		});
+	});
 	});
 });
 
@@ -6200,13 +6269,13 @@ sap.ui.define([
 		this.mock(oCache).expects("requestElements").never();
 
 		// code under test
-		oPromise = oCache.read(10, 20, 30, oGroupLock, fnDataRequested);
+		oPromise = oCache.read(10, 20, 30, oGroupLock, fnDataRequested, "~bIndexIsSkip~");
 
 		assert.strictEqual(oPromise.isPending(), true);
 
 		this.mock(oCache).expects("read")
 			.withExactArgs(10, 20, 30, sinon.match.same(oGroupLock),
-				sinon.match.same(fnDataRequested))
+				sinon.match.same(fnDataRequested), "~bIndexIsSkip~")
 			.returns(42);
 		fnResolve();
 
@@ -6337,7 +6406,7 @@ sap.ui.define([
 
 			// code under test
 			oReadPromise = oCache.read(3, 3, 0, oReadGroupLock);
-			oCache.removeElement(oCache.aElements, 1, "('b')", "");
+			oCache.removeElement(1, "('b')");
 
 			return oReadPromise;
 		}).then(function () {
@@ -6387,11 +6456,11 @@ sap.ui.define([
 			// code under test
 			oReadPromise1 = oCache.read(6, 3, 0, oReadGroupLock);
 			oReadPromise2 = that.mockRequestAndRead(oCache, 0, "Employees", 1, 2);
-			oCache.removeElement(oCache.aElements, 4, "('e')", "");
+			oCache.removeElement(4, "('e')");
 
 			return oReadPromise2;
 		}).then(function () {
-			oCache.removeElement(oCache.aElements, 4, "('f')", "");
+			oCache.removeElement(4, "('f')");
 			fnResolve(createResult(6, 3));
 			return oReadPromise1;
 		}).then(function () {
@@ -7690,11 +7759,11 @@ sap.ui.define([
 		this.mock(oCache).expects("requestElements").never(); // not yet
 
 		// code under test
-		oPromise = oCache.read(0, 10, 42, "group", fnDataRequested);
+		oPromise = oCache.read(0, 10, 42, "group", fnDataRequested, "~bIndexIsSkip~");
 
 		// expect "back to start" in order to repeat check for $tail
 		this.mock(oCache).expects("read")
-			.withExactArgs(0, 10, 42, "group", sinon.match.same(fnDataRequested))
+			.withExactArgs(0, 10, 42, "group", sinon.match.same(fnDataRequested), "~bIndexIsSkip~")
 			.returns(oNewPromise);
 		fnResolve();
 
@@ -12563,7 +12632,8 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [undefined, "($uid=id-1-23)"].forEach((sTransientPredicate) => {
-	QUnit.test(`CollectionCache#drop, ${sTransientPredicate}`, function (assert) {
+	[undefined, true].forEach((bIndexIsSkip) => {
+	QUnit.test(`CollectionCache#drop, ${sTransientPredicate}, ${bIndexIsSkip}`, function (assert) {
 		const oCache = this.createCache("Employees");
 		oCache.aElements[23] = "~b~";
 		oCache.aElements.$byPredicate = {
@@ -12581,7 +12651,7 @@ sap.ui.define([
 			.withExactArgs("~b~", "transientPredicate").returns(sTransientPredicate);
 
 		// code under test
-		oCache.drop(23, "('b')");
+		oCache.drop(bIndexIsSkip ? 23 - 7 : 23, "('b')", bIndexIsSkip);
 
 		assert.strictEqual(23 in oCache.aElements, false);
 		assert.strictEqual("('b')" in oCache.aElements.$byPredicate, false);
@@ -12593,6 +12663,7 @@ sap.ui.define([
 		assert.strictEqual(oCache.iActiveElements, sTransientPredicate ? 4 : 5);
 		assert.strictEqual(oCache.iLimit, sTransientPredicate ? 43 : 42);
 	});
+	});
 });
 
 	//*********************************************************************************************
@@ -12894,7 +12965,7 @@ sap.ui.define([
 			}
 			if (oElement.bDeleted && "transientPredicate" in oElement["@$ui5._"]) {
 				oCacheMock.expects("removeElement")
-					.withExactArgs(sinon.match.same(oCache.aElements), -1, sPredicate, "")
+					.withExactArgs(-1, sPredicate)
 					.returns(42);
 			}
 		});

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

@@ -2266,13 +2266,21 @@ sap.ui.define([
 	QUnit.test("getPrivateAnnotation", function (assert) {
 		var oObject = {
 				"@$ui5._" : {
+					null : null,
 					transient : "foo"
 				}
 			};
 
 		assert.strictEqual(_Helper.getPrivateAnnotation({}, "foo"), undefined);
+		assert.strictEqual(_Helper.getPrivateAnnotation({}, "foo", "~default~"), "~default~");
 		assert.strictEqual(_Helper.getPrivateAnnotation(oObject, "foo"), undefined);
+		assert.strictEqual(_Helper.getPrivateAnnotation(oObject, "foo", "~default~"), "~default~");
+		assert.strictEqual(_Helper.getPrivateAnnotation(oObject, "null", "~default~"), null);
 		assert.strictEqual(_Helper.getPrivateAnnotation(oObject, "transient"), "foo");
+
+		assert.throws(function () {
+			_Helper.getPrivateAnnotation(null, "foo", "~default~");
+		}, TypeError);
 	});
 
 	//*********************************************************************************************

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

@@ -2,16 +2,16 @@
  * ${copyright}
  */
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/base/Log",
 	"sap/ui/model/odata/v4/lib/_Helper",
 	"sap/ui/model/odata/v4/lib/_MetadataConverter",
 	"sap/ui/model/odata/v4/lib/_MetadataRequestor",
 	"sap/ui/model/odata/v4/lib/_V2MetadataConverter",
 	"sap/ui/model/odata/v4/lib/_V4MetadataConverter",
-	"sap/ui/test/TestUtils"
-], function (jQuery, Log, _Helper, _MetadataConverter, _MetadataRequestor, _V2MetadataConverter,
-		_V4MetadataConverter, TestUtils) {
+	"sap/ui/test/TestUtils",
+	"sap/ui/thirdparty/jquery"
+], function (Log, _Helper, _MetadataConverter, _MetadataRequestor, _V2MetadataConverter,
+		_V4MetadataConverter, TestUtils, jQuery) {
 	"use strict";
 
 	var mFixture = {

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

@@ -2,18 +2,18 @@
  * ${copyright}
  */
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/model/odata/v4/lib/_Batch",
 	"sap/ui/model/odata/v4/lib/_GroupLock",
 	"sap/ui/model/odata/v4/lib/_Helper",
 	"sap/ui/model/odata/v4/lib/_Requestor",
-	"sap/ui/test/TestUtils"
-], function (jQuery, Log, SyncPromise, Configuration, CacheManager, _Batch, _GroupLock, _Helper,
-		_Requestor, TestUtils) {
+	"sap/ui/security/Security",
+	"sap/ui/test/TestUtils",
+	"sap/ui/thirdparty/jquery"
+], function (Log, SyncPromise, CacheManager, _Batch, _GroupLock, _Helper, _Requestor, Security,
+	TestUtils, jQuery) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Requestor",
@@ -1538,7 +1538,7 @@ sap.ui.define([
 			return Promise.resolve({"This should change" : "nothing!"});
 		}
 
-		this.mock(Configuration).expects("getSecurityTokenHandlers")
+		this.mock(Security).expects("getSecurityTokenHandlers")
 			.withExactArgs()
 			.returns([securityTokenHandler0, securityTokenHandler1, securityTokenHandler2]);
 		this.mock(_Requestor.prototype).expects("checkHeaderNames")
@@ -1565,7 +1565,7 @@ sap.ui.define([
 			return Promise.reject("foo");
 		}
 
-		this.mock(Configuration).expects("getSecurityTokenHandlers")
+		this.mock(Security).expects("getSecurityTokenHandlers")
 			.withExactArgs()
 			.returns([securityTokenHandler]);
 		this.oLogMock.expects("error")
@@ -1593,7 +1593,7 @@ sap.ui.define([
 			return Promise.resolve(mNotAllowedHeaders);
 		}
 
-		this.mock(Configuration).expects("getSecurityTokenHandlers")
+		this.mock(Security).expects("getSecurityTokenHandlers")
 			.withExactArgs()
 			.returns([securityTokenHandler]);
 
@@ -5467,7 +5467,7 @@ sap.ui.define([
 	//*****************************************************************************************
 [false, true, undefined].forEach((bEnabled) => { // undefined -> no enabler assigned
 	[false, true].forEach((bCacheManagerRejects) => {
-	const sTitle = `processOptimisticBatch: n+1 start, optimistic batch matches, 
+	const sTitle = `processOptimisticBatch: n+1 start, optimistic batch matches,
 		enabler=${bEnabled}, del rejects=${bCacheManagerRejects}`;
 	QUnit.test(sTitle, function (assert) {
 		var done = assert.async(),

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

@@ -2,13 +2,13 @@
  * ${copyright}
  */
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/base/Log",
 	"sap/ui/model/odata/v4/lib/_Helper",
 	"sap/ui/model/odata/v4/lib/_V2MetadataConverter",
 	"sap/ui/test/TestUtils",
-	"sap/ui/util/XMLHelper"
-], function (jQuery, Log, _Helper, _V2MetadataConverter, TestUtils, XMLHelper) {
+	"sap/ui/util/XMLHelper",
+	"sap/ui/thirdparty/jquery"
+], function (Log, _Helper, _V2MetadataConverter, TestUtils, XMLHelper, jQuery) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.lib._V2MetadataConverter",

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

@@ -2,12 +2,12 @@
  * ${copyright}
  */
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/base/Log",
 	"sap/ui/model/odata/v4/lib/_V4MetadataConverter",
 	"sap/ui/test/TestUtils",
-	"sap/ui/util/XMLHelper"
-], function (jQuery, Log, _V4MetadataConverter, TestUtils, XMLHelper) {
+	"sap/ui/util/XMLHelper",
+	"sap/ui/thirdparty/jquery"
+], function (Log, _V4MetadataConverter, TestUtils, XMLHelper, jQuery) {
 	"use strict";
 
 	var sEdmx = '<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"'

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

@@ -771,6 +771,22 @@ sap.ui.define([
 		this.oDialog.open();
 	});
 
+	QUnit.test("Should skip matching view when no viewId or viewName in options", function (assert) {
+		var fnStart = assert.async(),
+			fnMatchViewSpy = sinon.spy(this.oPlugin, "_getMatchingView");
+		this.oDialog.attachAfterOpen(function () {
+			this.oPlugin.getMatchingControls({
+				searchOpenDialogs: true,
+				id: "OKButton"
+			});
+
+			assert.ok(fnMatchViewSpy.notCalled, "No view matching");
+			fnStart();
+		}, this);
+
+		this.oDialog.open();
+	});
+
 	QUnit.module("OpaPlugin - controls in an open dialog with view parent", {
 		beforeEach: function (assert) {
 			var sViewContent = [

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

@@ -2,9 +2,8 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/test/_LogCollector",
-	"sap/ui/test/_OpaLogger",
-	"jquery.sap.global"
-], function (Log, _LogCollector, _OpaLogger, $) {
+	"sap/ui/test/_OpaLogger"
+], function (Log, _LogCollector, _OpaLogger) {
 	"use strict";
 
 	QUnit.module("_LogCollector - singleton");
@@ -83,12 +82,21 @@ sap.ui.define([
 		 * @deprecated since 1.58
 		 */
 		QUnit.test("Should only collect logs with the right component (legacy APIs)", function (assert) {
-			var oIgnoredLogger = _OpaLogger.getLogger("someComponent");
-			oIgnoredLogger.error(sLogMessage, sLogDetails);
-			oIgnoredLogger.debug(sLogMessage, sLogDetails);
-			$.sap.log.debug(sLogMessage, sLogDetails);
-			$.sap.log.error(sLogMessage, sLogDetails);
-			assert.strictEqual(oInstance.getAndClearLog(), "", "Log should be empty");
+			const done = assert.async();
+			sap.ui.require([
+				"jquery.sap.global"
+			], function($) {
+				var oIgnoredLogger = _OpaLogger.getLogger("someComponent");
+				oIgnoredLogger.error(sLogMessage, sLogDetails);
+				oIgnoredLogger.debug(sLogMessage, sLogDetails);
+				$.sap.log.debug(sLogMessage, sLogDetails);
+				$.sap.log.error(sLogMessage, sLogDetails);
+				assert.strictEqual(oInstance.getAndClearLog(), "", "Log should be empty");
+				done();
+			}, function(err) {
+				assert.notOk(err, "loading jquery.sap.global. failed");
+				done();
+			});
 		});
 
 		QUnit.test("Should guard against memory leaking", function (assert) {