@openui5/sap.ui.core 1.124.2 → 1.126.0

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

@@ -10,6 +10,7 @@ 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";
@@ -528,7 +529,7 @@ sap.ui.define([
 	//*********************************************************************************************
 	QUnit.test("buildQuery: no query", function (assert) {
 		assert.strictEqual(_Helper.buildQuery(), "");
-		assert.strictEqual(_Helper.buildQuery({}), "");
+		assert.strictEqual(_Helper.buildQuery({}, true), "");
 	});
 
 	//*********************************************************************************************
@@ -544,6 +545,22 @@ sap.ui.define([
 		assert.strictEqual(sEncoded, "?a=b&c=d&c=e");
 	});
 
+	//*********************************************************************************************
+	QUnit.test("buildQuery: sort system query options", function (assert) {
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("encodePair").withExactArgs("c", "d").returns("c=d");
+		oHelperMock.expects("encodePair").withExactArgs("c", "e").returns("c=e");
+		oHelperMock.expects("encodePair").withExactArgs("a", "b").returns("a=b");
+		oHelperMock.expects("encodePair").withExactArgs("$x", "x").returns("$x=x");
+		oHelperMock.expects("encodePair").withExactArgs("$y", "y").returns("$y=y");
+		oHelperMock.expects("encodePair").withExactArgs("$z", "z").returns("$z=z");
+
+		assert.strictEqual(
+			// code under test
+			_Helper.buildQuery({$z : "z", c : ["d", "e"], $y : "y", a : "b", $x : "x"}, true),
+			"?c=d&c=e&a=b&$x=x&$y=y&$z=z");
+	});
+
 	//*********************************************************************************************
 	QUnit.test("buildQuery and decoding via URI.js", function (assert) {
 		var sComplexString = "",
@@ -739,6 +756,26 @@ sap.ui.define([
 		});
 	});
 
+	//*********************************************************************************************
+	QUnit.test("parseRawHeaders", function (assert) {
+		// code under test
+		assert.deepEqual(_Helper.parseRawHeaders(""), {});
+
+		// code under test
+		assert.deepEqual(_Helper.parseRawHeaders("a: b\r\nIGNORED"), {a : "b"}, "unsupported");
+
+		const sRawHeaders
+			= "a:b\r\nfoo: bar: baz: \r\nBAR: http://localhost:8080\r\nfoo:bar: baz\r\n";
+
+		// code under test
+		assert.deepEqual(_Helper.parseRawHeaders(sRawHeaders), {
+			"a:b" : "", // empty value
+			foo : "bar: baz: ",
+			bar : "http://localhost:8080", // key in all lower case
+			"foo:bar" : "baz"
+		});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("buildPath", function (assert) {
 		assert.strictEqual(_Helper.buildPath(), "");
@@ -1427,8 +1464,7 @@ sap.ui.define([
 		selected("toNull", "old", null, null, true);
 		selected("unchanged", "same", "same", "same");
 		selected("editing", "protected", "protected", "protected");
-		// TODO no change events as long as collection-valued properties are not supported
-		selected("collection", [], ["a", "b"], ["a", "b"]);
+		selected("collection", [], ["a", "b"], ["a", "b"], true);
 		property("unselected", "keep", "new", "keep");
 		property("unselectedCollection", ["a", "b"], [], ["a", "b"]);
 		property("@odata.etag", "old", "new3", "new3", true);
@@ -1443,6 +1479,7 @@ sap.ui.define([
 		property("unselected@old.annotation", "keep", undefined, "keep");
 		selected("abc", "old", "new6", "new6", true);
 		property("abcd", "keep", "new", "keep"); // "abcd".slice(0, "abcd".indexOf("@")) === "abc"
+		oHelperMock.expects("fireChange").withArgs("~mChangeListener~", "base/path/nested");
 
 		oNewValueJSON = JSON.stringify(oNewValue);
 		aSelectJSON = JSON.stringify(aSelect);
@@ -1474,6 +1511,8 @@ sap.ui.define([
 	QUnit.test("updateSelected: private annotations, undefined: " + bUndefined, function (assert) {
 		var oBinding = {},
 			oContext = {oBinding : oBinding},
+			oHelperMock = this.mock(_Helper),
+			oNewValue = {"@$ui5._" : {predicate : "(1)"}, bar : {}},
 			// oContext is recursive and must not be descended into
 			oOldValue = {"@$ui5._" : {context : oContext}};
 
@@ -1481,13 +1520,13 @@ sap.ui.define([
 			oOldValue.foo = undefined; // MUST NOT make a difference
 		}
 		oBinding.oContext = oContext;
-		this.mock(_Helper).expects("fireChange").withExactArgs("~mChangeListener~", "foo",
-			undefined, true);
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "foo", undefined, true);
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "bar", sinon.match.same(oNewValue.bar));
 
 		// code under test
-		_Helper.updateSelected("~mChangeListener~", "", oOldValue,
-			{"@$ui5._" : {predicate : "(1)"}, bar : {}},
-			["foo", "bar/*"]);
+		_Helper.updateSelected("~mChangeListener~", "", oOldValue, oNewValue, ["foo", "bar/*"]);
 
 		assert.deepEqual(oOldValue, bUndefined ? {
 			"@$ui5._" : {context : oContext, predicate : "(1)"},
@@ -1507,6 +1546,8 @@ sap.ui.define([
 	QUnit.test("updateSelected: create annotation, undefined: " + bUndefined, function (assert) {
 		var oBinding = {},
 			oHelperMock = this.mock(_Helper),
+			oNewValue0 = {baz : {bar : {}}},
+			oNewValue1 = {baz : {bar : {}}},
 			oOldValue0 = {},
 			oOldValue1 = {};
 
@@ -1518,6 +1559,10 @@ sap.ui.define([
 			true);
 		oHelperMock.expects("fireChange").withExactArgs("~mChangeListener~", "bar", undefined,
 			true);
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "baz/bar", sinon.match.same(oNewValue0.baz.bar));
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "baz", sinon.match.same(oNewValue0.baz));
 
 		oHelperMock.expects("buildPath").withExactArgs("", "foo").returns("foo");
 		oHelperMock.expects("buildPath").withExactArgs("", "bar").returns("bar");
@@ -1525,8 +1570,8 @@ sap.ui.define([
 		oHelperMock.expects("buildPath").twice().withExactArgs("baz", "bar").returns("baz/bar");
 
 		// code under test
-		_Helper.updateSelected("~mChangeListener~", "", oOldValue0,
-			{baz : {bar : {}}}, ["foo", "bar", "baz/bar"]);
+		_Helper.updateSelected("~mChangeListener~", "", oOldValue0, oNewValue0,
+			["foo", "bar", "baz/bar"]);
 
 		assert.deepEqual(oOldValue0, bUndefined ? {
 			"bar@$ui5.noData" : true,
@@ -1539,9 +1584,14 @@ sap.ui.define([
 			"foo@$ui5.noData" : true
 		});
 
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "baz/bar", sinon.match.same(oNewValue1.baz.bar));
+		oHelperMock.expects("fireChange")
+			.withExactArgs("~mChangeListener~", "baz", sinon.match.same(oNewValue1.baz));
+
 		// code under test (do not create annotation)
-		_Helper.updateSelected("~mChangeListener~", "", oOldValue1,
-			{baz : {bar : {}}}, ["foo", "bar", "baz/bar"], undefined, /*bOkIfMissing*/ true);
+		_Helper.updateSelected("~mChangeListener~", "", oOldValue1, oNewValue1,
+			["foo", "bar", "baz/bar"], undefined, /*bOkIfMissing*/ true);
 
 		assert.deepEqual(oOldValue1, {baz : {bar : {}}});
 	});
@@ -1559,7 +1609,8 @@ sap.ui.define([
 			};
 
 		oOldValue.transient.$postBodyCollection = true;
-		this.mock(_Helper).expects("fireChange").never();
+		this.mock(_Helper).expects("fireChange")
+			.withExactArgs("~mChangeListener~", "upcoming", sinon.match.same(oNewValue.upcoming));
 
 		// code under test
 		_Helper.updateSelected("~mChangeListener~", "", oOldValue, oNewValue);
@@ -1591,6 +1642,8 @@ sap.ui.define([
 		if (bNull) {
 			oCacheValue.complex = null;
 		}
+		oHelperMock.expects("fireChange").withExactArgs("~mChangeListener~", "base/path/complex",
+			sinon.match.same(oNewValue.complex));
 		oHelperMock.expects("fireChange")
 			.withExactArgs("~mChangeListener~", "base/path/complex/simple1", "new1");
 		oHelperMock.expects("fireChange")
@@ -1667,9 +1720,12 @@ sap.ui.define([
 				.withExactArgs("~mChangeListener~", "base/path/" + sPath, vValue);
 		}
 
+		expectChange("selected", oNewValue.selected);
 		expectChange("selected/changed", "new1");
 		expectChange("selected/new", "new2");
+		expectChange("selected/nested", oNewValue.selected.nested);
 		expectChange("selected/nested/changed", "new3");
+		expectChange("selected/nested/newComplex", oNewValue.selected.nested.newComplex);
 		expectChange("selected/nested/newComplex/new", "new4");
 		expectChange("selected/nested/newSimple", "new5");
 
@@ -1787,16 +1843,16 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("updateAll: array", function (assert) {
-		var mChangeListeners = {},
-			oSource = {
+		var oSource = {
 				array : []
 			},
 			oTarget = {};
 
-		this.mock(_Helper).expects("fireChange").never();
+		this.mock(_Helper).expects("fireChange")
+			.withExactArgs("~mChangeListeners~", "path/array", sinon.match.same(oSource.array));
 
 		// code under test
-		_Helper.updateAll(mChangeListeners, "path", oTarget, oSource);
+		_Helper.updateAll("~mChangeListeners~", "path", oTarget, oSource);
 
 		assert.strictEqual(oTarget.array, oSource.array);
 	});
@@ -1813,8 +1869,12 @@ sap.ui.define([
 				"#changed" : {value : "old"}
 			};
 
+		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
+			"path/#added", sinon.match.same(oSource["#added"]));
 		oHelperMock.expects("fireChange")
 			.withExactArgs(sinon.match.same(mChangeListeners), "path/#added/value", "new");
+		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
+			"path/#changed", sinon.match.same(oSource["#changed"]));
 		oHelperMock.expects("fireChange")
 			.withExactArgs(sinon.match.same(mChangeListeners), "path/#changed/value", "new");
 
@@ -3447,8 +3507,9 @@ sap.ui.define([
 				mWrappedQueryOptions,
 				oMetaModelMock = this.mock(oMetaModel);
 
-			aMetaPathSegments.forEach(function (sSegment, j, aMetaPathSegments) {
-				var sPropertyMetaPath = "/EMPLOYEES/" + aMetaPathSegments.slice(0, j + 1).join("/"),
+			aMetaPathSegments.forEach(function (sSegment, j, aMetaPathSegments0) {
+				var sPropertyMetaPath = "/EMPLOYEES/"
+						+ aMetaPathSegments0.slice(0, j + 1).join("/"),
 					sKind = sSegment.split("_")[0];
 
 				if (sSegment.endsWith("*")) {
@@ -4163,6 +4224,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"),
@@ -4527,18 +4613,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);
@@ -4559,18 +4659,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);
 	});
+});
 });
 
 	//*********************************************************************************************
@@ -4599,6 +4702,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");
 	});
 
 	//*********************************************************************************************
@@ -5441,7 +5549,7 @@ sap.ui.define([
 		let oTarget = {"@$ui5.context.isSelected" : false};
 
 		// code under test
-		_Helper.copySelected({foo : true, "@$ui5.context.isSelected" : true}, oTarget);
+		_Helper.copySelected({foo : true, "@$ui5.context.isSelected" : "~"}, oTarget);
 
 		assert.deepEqual(oTarget, {"@$ui5.context.isSelected" : true});
 

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

@@ -302,14 +302,14 @@ sap.ui.define([
 				.returns(oExpectedJson);
 
 			// code under test
-			return oMetadataRequestor.read(sUrl, false, false).then(function (oResult) {
+			return oMetadataRequestor.read(sUrl, false, false).then(function (oResult0) {
 				var oNewExpectedJson = {
 						$Version : "4.0",
 						$EntityContainer : "NEW!"
 					},
 					oNewExpectedXml = {};
 
-				assert.deepEqual(oResult, {
+				assert.deepEqual(oResult0, {
 					$Date : sDate,
 					$EntityContainer : "<5.1.1 Schema Namespace>.<13.1.1 EntityContainer Name>",
 					$ETag : sETag,