@openui5/sap.ui.core 1.124.0 → 1.125.0

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

@@ -1061,16 +1061,14 @@ sap.ui.define([
 [undefined, "~path~"].forEach(function (sPath) {
 	[false, true].forEach(function (bTransient) {
 		[false, true].forEach(function (bDefault) {
-			[42, 43].forEach((iLength) => {
-	const sTitle = `_Cache#restoreElement, path=${sPath}, transient=${bTransient},
- default=${bDefault}, length=${iLength}`;
+			const sTitle = `_Cache#restoreElement, path=${sPath}, transient=${bTransient}`
+				+ `, default=${bDefault}`;
 
 	QUnit.test(sTitle, function (assert) {
 		const oCache = new _Cache(this.oRequestor, "TEAMS");
 		oCache.iLimit = 234;
 		oCache.iActiveElements = 1;
 		const aElements = [];
-		aElements.length = iLength;
 		aElements.$byPredicate = {};
 		aElements.$created = 2;
 		if (bDefault) {
@@ -1086,8 +1084,8 @@ sap.ui.define([
 		oHelperMock.expects("addToCount")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), sPath0,
 				sinon.match.same(aElements), 1);
-		this.mock(aElements).expects("splice").exactly(iLength > 42 ? 1 : 0)
-			.withExactArgs(42, 0, "~oElement~");
+		oHelperMock.expects("insert")
+			.withExactArgs(sinon.match.same(aElements), 42, "~oElement~");
 		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oElement~", "predicate")
 			.returns("~predicate~");
 
@@ -1099,11 +1097,7 @@ sap.ui.define([
 		assert.strictEqual(aElements.$created, bTransient ? 3 : 2);
 		assert.strictEqual(oCache.iActiveElements, bTransient && !sPath ? 2 : 1);
 		assert.deepEqual(aElements.$byPredicate, {"~predicate~" : "~oElement~"});
-		if (iLength <= 42) {
-			assert.strictEqual(aElements[42], "~oElement~", "avoid #splice here");
-		}
 	});
-			});
 		});
 	});
 });
@@ -1112,8 +1106,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");
 	});
@@ -1122,47 +1116,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);
@@ -1782,6 +1757,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) {
@@ -8285,7 +8274,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 () {},
@@ -8511,7 +8503,8 @@ sap.ui.define([
 			oListener = {
 				onChange : function () {
 					assert.ok(false);
-				}
+				},
+				setDeregisterChangeListener : function () {}
 			},
 			that = this;
 
@@ -8553,7 +8546,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),
@@ -8685,7 +8681,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
@@ -9465,7 +9462,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

@@ -10,10 +10,13 @@ sap.ui.define([
 	"sap/ui/model/odata/v4/lib/_Helper",
 	"sap/ui/thirdparty/URI"
 ], function (Log, deepEqual, merge, uid, SyncPromise, _Helper, URI) {
+	/*eslint no-sparse-arrays: 0 */
 	"use strict";
 
 	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.
 	 *
@@ -4161,6 +4164,31 @@ sap.ui.define([
 		});
 	});
 
+	//*********************************************************************************************
+	QUnit.test("insert", function (assert) {
+		const aElements = [1, 2, 3];
+
+		// code under test
+		_Helper.insert(aElements, 1, 42);
+
+		assert.deepEqual(aElements, [1, 42, 2, 3]);
+
+		// code under test
+		_Helper.insert(aElements, 0, 0);
+
+		assert.deepEqual(aElements, [0, 1, 42, 2, 3]);
+
+		// code under test
+		_Helper.insert(aElements, 5, 4);
+
+		assert.deepEqual(aElements, [0, 1, 42, 2, 3, 4]);
+
+		// code under test
+		_Helper.insert(aElements, 10, 99);
+
+		assert.deepEqual(aElements, [0, 1, 42, 2, 3, 4,,,,, 99]);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("decomposeError: w/o ContentID, w/o details, w/o target", function (assert) {
 		var oError = new Error("Message"),
@@ -4525,18 +4553,32 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [true, false].forEach(function (bTargetIsValid) {
-	var sTitle = "adjustTargets: with additional targets, target is valid: " + bTargetIsValid;
+	[true, false].forEach(function (bAnnotation) {
+	var sTitle = "adjustTargets: with additional targets, annotation: " + bAnnotation
+			+ ", target is valid: " + bTargetIsValid;
 
 	QUnit.test(sTitle, function (assert) {
 		var oHelperMock = this.mock(_Helper),
+			oMessage;
+
+		if (bAnnotation) {
 			oMessage = {
 				target : "target",
 				"@foo.additionalTargets" : ["additional1", "foo", "additional2"]
 			};
 
-		oHelperMock.expects("getAnnotationKey")
-			.withExactArgs(sinon.match.same(oMessage), ".additionalTargets")
-			.returns("@foo.additionalTargets");
+			oHelperMock.expects("getAnnotationKey")
+				.withExactArgs(sinon.match.same(oMessage), ".additionalTargets")
+				.returns("@foo.additionalTargets");
+		} else {
+			oMessage = {
+				target : "target",
+				additionalTargets : ["additional1", "foo", "additional2"],
+				"@foo.additionalTargets" : "n/a" // additionalTargets must win!
+			};
+
+			oHelperMock.expects("getAnnotationKey").never();
+		}
 		oHelperMock.expects("getAdjustedTarget")
 			.withExactArgs("target", "oOperationMetadata", "sParameterContextPath", "sContextPath")
 			.returns(bTargetIsValid ? "~adjusted~" : undefined);
@@ -4557,18 +4599,21 @@ sap.ui.define([
 		_Helper.adjustTargets(oMessage, "oOperationMetadata", "sParameterContextPath",
 			"sContextPath");
 
-		if (bTargetIsValid) {
-			assert.deepEqual(oMessage, {
-				target : "~adjusted~",
-				"@foo.additionalTargets" : ["~adjusted1~", "~adjusted2~"]
-			});
+		const oExpectedMessage = {
+			target : bTargetIsValid ? "~adjusted~" : "~adjusted1~",
+			"@foo.additionalTargets" : "n/a"
+		};
+		const aAdditionalTargets
+			= bTargetIsValid ? ["~adjusted1~", "~adjusted2~"] : ["~adjusted2~"];
+
+		if (bAnnotation) {
+			oExpectedMessage["@foo.additionalTargets"] = aAdditionalTargets;
 		} else {
-			assert.deepEqual(oMessage, {
-				target : "~adjusted1~",
-				"@foo.additionalTargets" : ["~adjusted2~"]
-			});
+			oExpectedMessage.additionalTargets = aAdditionalTargets;
 		}
+		assert.deepEqual(oMessage, oExpectedMessage);
 	});
+});
 });
 
 	//*********************************************************************************************
@@ -4597,6 +4642,11 @@ sap.ui.define([
 			_Helper.getAdjustedTarget("$Parameter/foo/bar", oOperationMetadata,
 				"~parameterContextPath~"),
 			"~parameterContextPath~/foo/bar");
+
+		assert.strictEqual(
+			// code under test
+			_Helper.getAdjustedTarget("foo/bar", oOperationMetadata),
+			"foo/bar");
 	});
 
 	//*********************************************************************************************
@@ -5468,4 +5518,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~");
+	});
 });

package/test/sap/ui/core/qunit/resource/ResourceBinding.qunit.js

@@ -18,11 +18,6 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("warning").never();
 			this.oLogMock.expects("error").never();
-
-			// create ResourceModel
-			this.oModel = new ResourceModel({bundleName : "testdata.messages"});
-		},
-		afterEach : function () {
 		},
 		after : function () {
 			Localization.setLanguage(sDefaultLanguage);
@@ -30,24 +25,28 @@ sap.ui.define([
 	});
 
 	QUnit.test("Binding getPath", function(assert) {
-		var oBinding = this.oModel.bindProperty("TEST_TEXT");
+		const oModel = new ResourceModel({async : true, bundleName : "testdata.messages"});
+		const oBinding = oModel.bindProperty("TEST_TEXT");
+
 		// model stores the binding first when attach change was called
 		assert.ok(oBinding, "binding instantiated");
 		assert.equal(oBinding.getPath(), "TEST_TEXT", "Binding Path set properly");
 	});
 
 	QUnit.test("Binding getModel", function(assert) {
-		var oBinding = this.oModel.bindProperty("TEST_TEXT");
+		const oModel = new ResourceModel({async : true, bundleName : "testdata.messages"});
+		const oBinding = oModel.bindProperty("TEST_TEXT");
+
 		// check model of each binding...should be the same
-		assert.equal(oBinding.getModel(), this.oModel, "Binding model");
+		assert.equal(oBinding.getModel(), oModel, "Binding model");
 	});
 
 	QUnit.test("Binding changeEvent", function(assert) {
+		const oModel = new ResourceModel({async : true, bundleName : "testdata.messages"});
+		const oBinding = oModel.bindProperty("TEST_TEXT");
 		var attach = false,
-			oBinding = this.oModel.bindProperty("TEST_TEXT"),
 			detach = true,
-			done = assert.async(),
-			that = this;
+			done = assert.async();
 
 		function callBackOnChange(){
 			attach = true;
@@ -58,7 +57,7 @@ sap.ui.define([
 		oBinding.attachChange(callBackOnChange);
 
 		// model stores the binding first when attach change was called
-		assert.equal(this.oModel.getBindings().length, 1, "model bindings");
+		assert.equal(oModel.getBindings().length, 1, "model bindings");
 
 		// fire change event
 		oBinding._fireChange();
@@ -76,13 +75,17 @@ sap.ui.define([
 		detach = true;
 
 		setTimeout(function() {
-			assert.equal(that.oModel.getBindings().length, 0, "model bindings");
+			assert.equal(oModel.getBindings().length, 0, "model bindings");
 			done();
 		}, 0);
 	});
 
 	QUnit.test("PropertyBinding getValue", function(assert) {
-		var oBinding = this.oModel.bindProperty("TEST_TEXT");
+		this.oLogMock.expects("warning")
+			.withExactArgs("Usage of synchronous loading is deprecated. For performance reasons, asynchronous loading"
+				+ " is strongly recommended.", undefined, "sap.ui.model.resource.ResourceModel");
+		const oModel = new ResourceModel({bundleName : "testdata.messages"});
+		const oBinding = oModel.bindProperty("TEST_TEXT");
 
 		assert.equal(oBinding.getValue(), "A text en", "Property binding value");
 	});

package/test/sap/ui/core/qunit/routing/async/Views.qunit.js

@@ -60,6 +60,9 @@ sap.ui.define([
 		}.bind(this));
 	});
 
+	/**
+	 * @deprecated because it tests the legacy API
+	 */
 	QUnit.test("Should create a view synchronously", function (assert) {
 		// Configure view as synchronous
 		this.oViewOptions.async = false;

package/test/sap/ui/core/qunit/test/starter/find/main.js

@@ -265,7 +265,9 @@ sap.ui.define([
 							rows: {
 								path: "/tests"
 							},
-							footer: ""
+							footer: new Label({
+								text: ""
+							})
 						})
 					]
 				})
@@ -277,7 +279,7 @@ sap.ui.define([
 
 	function progress(state) {
 		if ( oTable ) {
-			oTable.setFooter("Refresh: checking " + state + "...");
+			oTable.getFooter().setText("Refresh: checking " + state + "...");
 		}
 	}
 
@@ -331,7 +333,7 @@ sap.ui.define([
 
 		discovery.findTests( entryPage, progress ).then( (aTests) => {
 			Element.getElementById("app").setBusy(false);
-			oTable.setFooter("Refresh: done.");
+			oTable.getFooter().setText("Refresh: done.");
 			const aTestPageUrls = [];
 			// filter duplicate tests and sort them
 			aTests = aTests.filter((e,i,a) => {
@@ -347,7 +349,7 @@ sap.ui.define([
 			});
 			saveData();
 			setTimeout(function() {
-				oTable.setFooter("");
+				oTable.getFooter().setText("");
 			}, 5000);
 		});
 

package/test/sap/ui/core/qunit/testdata/routing/HistoryIFrame.html

@@ -11,9 +11,10 @@
 		<script src="../../../../../../../resources/sap-ui-core.js"
 			id="sap-ui-bootstrap"
 			data-sap-ui-async="true"
+			data-sap-ui-resource-roots='{"local": "."}'
+			data-sap-ui-on-init="module:local/HistoryIFrame"
 			data-sap-ui-theme="sap_belize"></script>
 		<!-- end of minimal bootstrap code -->
-		<script src="HistoryIFrame.js"></script>
 	</head>
 	<body>
 	</body>

package/test/sap/ui/core/qunit/testsuites/testsuite.databinding.qunit.js

@@ -291,6 +291,9 @@ sap.ui.define(function() {
 			"model/ContextBinding": {
 				title: "sap.ui.model.ContextBinding"
 			},
+			"model/FieldHelp": {
+				title: "sap.ui.model.FieldHelp"
+			},
 			"model/Filter": {
 				title: "sap.ui.model.Filter"
 			},