@openui5/sap.ui.core 1.120.1 → 1.120.3

package/test/sap/ui/core/qunit/mvc/XMLTemplateProcessor.qunit.js

@@ -96,7 +96,7 @@ sap.ui.define([
 
 	QUnit.test("Error Logging of invalid type values", function (assert) {
 		assert.ok(this.oLogSpy.calledOnce, "Log.error was only called once");
-		assert.ok(this.oLogSpy.alwaysCalledWithExactly("Value 'somethingInvalid' is not valid for type 'sap.m.ButtonType'."), "Log.error spy was called");
+		assert.ok(this.oLogSpy.calledWith(sinon.match(/Value 'somethingInvalid' is not valid for type 'sap.m.ButtonType'./)), "Log.error spy was called");
 	});
 
 	/**

package/test/sap/ui/core/qunit/mvc/XMLTemplateProcessorAsync.qunit.js

@@ -528,7 +528,7 @@ sap.ui.define([
 			assert.equal(oInputInvalidType.getValue(), "1234", "Input field has correct unformatted(!) value '1234'.");
 
 			// test error log for invalid/missing type
-			assert.ok(this.logErrorSpy.calledWith("Failed to resolve type 'sap.ui.non.existing.Type'. Maybe not loaded or a typo?"), "Error message for missing type is logged.");
+			assert.ok(this.logErrorSpy.calledWith(sinon.match(/Failed to resolve type 'sap.ui.non.existing.Type'. Maybe not loaded or a typo\?/)), "Error message for missing type is logged.");
 
 			// test CustomData binding values
 			var oPanel = oView.byId("panel");

package/test/sap/ui/core/qunit/mvc/XMLTemplateProcessorRequireXML.qunit.js

@@ -364,7 +364,7 @@ sap.ui.define([
 		},
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('This is a toast')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context with preprocessors enabled",
@@ -385,7 +385,7 @@ sap.ui.define([
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
 			sinon.assert.neverCalledWith(oWarningSpy, "Variable: Toast isn't defined in the require context of the current XMLView/Fragment");
-			sinon.assert.neverCalledWith(oWarningSpy, "Event handler name 'Toast.show('This is a toast')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.neverCalledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with fragment w/o require context",
@@ -400,7 +400,7 @@ sap.ui.define([
 		},
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('Problem occurred')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('Problem occurred'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with nested view and the require context isn't forwarded to nested view",
@@ -420,7 +420,7 @@ sap.ui.define([
 			assert.ok(oCreateSpy.calledOnce, "generic create is called for the nested view");
 
 			return oCreateSpy.getCall(0).returnValue.loaded().then(function() {
-				return sinon.assert.calledWith(oWarningSpy, "Event handler name 'Box.show('MessageBox')' could not be resolved to an event handler function");
+				return assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Box.show\('MessageBox'\)' could not be resolved to an event handler function/)));
 			});
 		}
 	}, {
@@ -460,7 +460,7 @@ sap.ui.define([
 			oMessageToastButton.fireEvent("press");
 			assert.equal(oToastShowSpy.callCount, 0, "Toast.show isn't called because the core:require is missing");
 
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('Do you really want to close?')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('Do you really want to close\?'\)' could not be resolved to an event handler function/)));
 
 			return new Promise(function(resolve, reject) {
 				InstanceManager.closeAllDialogs();

package/test/sap/ui/core/qunit/mvc/XMLView.qunit.js

@@ -1185,7 +1185,7 @@ sap.ui.define([
 			definition: sContent
 		}).then(function(oView) {
 			assert.equal(oLogErrorSpy.callCount, 1, "Error is logged");
-			assert.equal(oLogErrorSpy.getCall(0).args[0], "XMLView's root node must be 'View' or 'XMLView' and have the namespace 'sap.ui.core.mvc'", "Log message is correct");
+			assert.ok(oLogErrorSpy.calledWith(sinon.match(/XMLView's root node must be 'View' or 'XMLView' and have the namespace 'sap.ui.core.mvc'/)), "Log message is correct");
 
 			assert.ok(oView.byId("panel"), "The panel control is created");
 			assert.equal(oView.getContent()[0], oView.byId("panel"), "The panel is added to the view's content aggregation");

package/test/sap/ui/core/qunit/mvc/extensions/ControllerMetadata.qunit.js

@@ -17,6 +17,8 @@ sap.ui.define([
 		/*public by every Controller*/
 		"byId",
 		"getView",
+		"getMetadata",
+		"isA",
 		/*public by Controller impl*/
 		"myFinalMethod",
 		"onAfterRendering",
@@ -40,6 +42,8 @@ sap.ui.define([
 		/*public by every Controller*/
 		"byId",
 		"getView",
+		"getMetadata",
+		"isA",
 		/*public by Controller impl*/
 		"myFinalMethod",
 		"privateMethod1",
@@ -68,7 +72,7 @@ sap.ui.define([
 			var oControllerInterface = oView.getController().getInterface();
 			var aInterfaceKeys = Object.keys(oControllerInterface);
 			assert.ok(oControllerInterface, "Controller Interface created");
-			assert.equal(aInterfaceKeys.length, 6, "6 public methods are exposed");
+			assert.equal(aInterfaceKeys.length, 8, "8 public methods are exposed");
 			assert.deepEqual(aInterfaceKeys.sort(), aLegacyPublicControllerMethods.sort(), "All public methods exposed are correctly");
 			done();
 		});
@@ -94,7 +98,7 @@ sap.ui.define([
 			var oControllerInterface = oView.getController().getInterface();
 			var aInterfaceKeys = Object.keys(oControllerInterface);
 			assert.ok(oControllerInterface, "Controller Interface created");
-			assert.equal(aInterfaceKeys.length, 8, "8 public methods are exposed");
+			assert.equal(aInterfaceKeys.length, 10, "10 public methods are exposed");
 			assert.deepEqual(aInterfaceKeys.sort(), aPublicControllerMethods.sort(), "All public methods exposed are correctly");
 			done();
 		});

package/test/sap/ui/core/qunit/mvc/extensions/Controllerextensions.qunit.js

@@ -10,6 +10,8 @@ sap.ui.define([
 
 	var mAllPublicMethods = {
 		"byId":{"public":true, "final":true, "reloadNeeded": false},
+		"getMetadata":{"public":true, "final":true, "reloadNeeded": false},
+		"isA":{"public":true, "final":true, "reloadNeeded": false},
 		"callbackMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"getLifecycleCalls":{"public":true, "final":false, "reloadNeeded": false},
 		"getLifecycleCallsFromArray":{"public":true, "final":false, "reloadNeeded": false},
@@ -17,6 +19,8 @@ sap.ui.define([
 		"publicMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"publicWithCallbackMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"extension1.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension1.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension1.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension1.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -33,6 +37,8 @@ sap.ui.define([
 		"extension1.publicMethod":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.publicMethodToOverride":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension2.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension2.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension2.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -49,6 +55,8 @@ sap.ui.define([
 		"extension2.publicMethod":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.publicMethodToOverride":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension.example.ProviderExt1.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension.example.ProviderExt1.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension.example.ProviderExt1.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -65,6 +73,8 @@ sap.ui.define([
 		"extension.example.ProviderExt1.myAfter":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.myBefore":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension.example.ProviderExt2.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension.example.ProviderExt2.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension.example.ProviderExt2.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -94,6 +104,8 @@ sap.ui.define([
 		"callingPublicAndPrivateMethod",
 		"byId",
 		"getView",
+		"getMetadata",
+		"isA",
 		"getBase",
 		"myBefore",
 		"myAfter",

package/test/sap/ui/core/qunit/mvc/extensions/Controllerextensions_legacy.qunit.js

@@ -10,6 +10,8 @@ sap.ui.define([
 
 	var mAllPublicMethods = {
 		"byId":{"public":true, "final":true, "reloadNeeded": false},
+		"getMetadata":{"public":true, "final":true, "reloadNeeded": false},
+		"isA":{"public":true, "final":true, "reloadNeeded": false},
 		"callbackMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"getLifecycleCalls":{"public":true, "final":false, "reloadNeeded": false},
 		"getLifecycleCallsFromArray":{"public":true, "final":false, "reloadNeeded": false},
@@ -17,6 +19,8 @@ sap.ui.define([
 		"publicMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"publicWithCallbackMethod":{"public":true, "final":false, "reloadNeeded": false},
 		"extension1.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension1.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension1.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension1.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -33,6 +37,8 @@ sap.ui.define([
 		"extension1.publicMethod":{"public":true,"final":false,"reloadNeeded":true},
 		"extension1.publicMethodToOverride":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension2.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension2.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension2.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -49,6 +55,8 @@ sap.ui.define([
 		"extension2.publicMethod":{"public":true,"final":false,"reloadNeeded":true},
 		"extension2.publicMethodToOverride":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension.example.ProviderExt1.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension.example.ProviderExt1.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension.example.ProviderExt1.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -65,6 +73,8 @@ sap.ui.define([
 		"extension.example.ProviderExt1.myAfter":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt1.myBefore":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.byId":{"public":true,"final":true,"reloadNeeded":true},
+		"extension.example.ProviderExt2.getMetadata":{"public":true, "final":true, "reloadNeeded": true},
+		"extension.example.ProviderExt2.isA":{"public":true, "final":true, "reloadNeeded": true},
 		"extension.example.ProviderExt2.onInit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.onExit":{"public":true,"final":false,"reloadNeeded":true},
 		"extension.example.ProviderExt2.onBeforeRendering":{"public":true,"final":false,"reloadNeeded":true},
@@ -94,6 +104,8 @@ sap.ui.define([
 		"callingPublicAndPrivateMethod",
 		"byId",
 		"getView",
+		"getMetadata",
+		"isA",
 		"getBase",
 		"myBefore",
 		"myAfter",

package/test/sap/ui/core/qunit/mvc/extensions/testdata/AnotherMain.controller.js

@@ -7,7 +7,9 @@ sap.ui.define(["./Main.controller", "./ReuseExtension"], function(Controller, Re
 			methods: {
 				"publicMethod": {"public":false},
 				"getView": {"public":false},
-				"byId": {"public":false}
+				"byId": {"public":false},
+				"getMetadata": {"public": false},
+				"isA": {"public": false}
 			}
 		}
 	});

package/test/sap/ui/core/qunit/mvc/testdata/XMLViewEmbeddingTypedViews.view.xml

@@ -2,7 +2,7 @@
 	<Panel id="aPanel">
 		<content>
 			<mvc:View id="embedded-async-true" viewName="module:testdata/mvc/TypedView" async="true"></mvc:View>
-			<mvc:View id="embedded-async-true2" viewName="module:testdata/mvc/TypedView" async="true"></mvc:View>
+			<mvc:View id="embedded-async-true2" viewName="module:testdata/mvc/TypedView2" async="true"></mvc:View>
 			<test:TypedViewSyncCreateContent id="embedded-async-typed-declaration" async="true"/>
 			<test:TypedViewWithRenderer id="embedded-async-typed-declaration-with-renderer" async="true"/>
 		</content>

package/test/sap/ui/core/qunit/mvc/viewprocessing/ViewProcessing.qunit.js

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/UIComponent",
 	'sap/ui/core/Component',
@@ -11,7 +12,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/StashedControlSupport",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Controller, UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLView, StashedControlSupport, nextUIUpdate) {
+], function(Log, Controller, UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLView, StashedControlSupport, nextUIUpdate) {
 
 	"use strict";
 
@@ -298,18 +299,36 @@ sap.ui.define([
 
 	/**
 	 * Tests parsing of a control which is not properly defined (does not return its class)
+	 * In V1: We check if the control is retrieved via globals + an error log.
+	 * In V2: we only check for the error log.
 	 */
-	QUnit.test("Bad control processing", function(assert) {
+	QUnit.test("Bad control processing", async function(assert) {
+
+		const oLogSpy = this.spy(Log, "error");
 
 		// view
-		var pView = this.viewFactory("myViewBadControl", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingBadControl");
+		const oView = await this.viewFactory("myViewBadControl", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingBadControl");
 
-		return pView.then(async function(oView) {
-			await this.render(oView);
+		await this.render(oView);
+
+		// V1 and V2: Check for error concerning the missing module content
+		const sClassName = "sap.ui.core.qunit.mvc.viewprocessing.BadControl";
+		const sErrorLogMessage = `[FUTURE FATAL] Control '${sClassName}' did not return a class definition from sap.ui.define.`;
+		assert.ok(oLogSpy.calledWith(sinon.match(sErrorLogMessage)), "Error log for missing class definition is correct.");
 
-			var myBadControl = oView.byId("myBadControl");
+		/**
+		 * V1 only: Control is fetched from global namespace and instantiated.
+		 * @deprecated
+		 */
+		(() => {
+			// check error message again for an additional part complaining about the global access
+			assert.ok(oLogSpy.calledWith(sinon.match("This fallback behavior will be removed in the next major version (2.0).")), "Extended error log for global access is correct.");
+
+			const myBadControl = oView.byId("myBadControl");
 			assert.ok(myBadControl, "BadControl is present within view");
-		}.bind(this));
+		})();
+
+		oLogSpy.restore();
 	});
 
 

package/test/sap/ui/core/qunit/mvc_legacyAPIs/XMLTemplateProcessorRequireXML_legacyAPIs.qunit.js

@@ -325,7 +325,7 @@ sap.ui.define([
 		},
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('This is a toast')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context with preprocessors enabled",
@@ -346,7 +346,7 @@ sap.ui.define([
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
 			sinon.assert.neverCalledWith(oWarningSpy, "Variable: Toast isn't defined in the require context of the current XMLView/Fragment");
-			sinon.assert.neverCalledWith(oWarningSpy, "Event handler name 'Toast.show('This is a toast')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.neverCalledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with fragment w/o require context",
@@ -361,7 +361,7 @@ sap.ui.define([
 		},
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('Problem occurred')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('Problem occurred'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with nested view and the require context isn't forwarded to nested view",
@@ -381,7 +381,7 @@ sap.ui.define([
 			assert.ok(oCreateSpy.calledOnce, "generic create is called for the nested view");
 
 			return oCreateSpy.getCall(0).returnValue.loaded().then(function() {
-				return sinon.assert.calledWith(oWarningSpy, "Event handler name 'Box.show('MessageBox')' could not be resolved to an event handler function");
+				return assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Box.show\('MessageBox'\)' could not be resolved to an event handler function/)));
 			});
 		}
 	}, {
@@ -421,7 +421,7 @@ sap.ui.define([
 			oMessageToastButton.fireEvent("press");
 			assert.equal(oToastShowSpy.callCount, 0, "Toast.show isn't called because the core:require is missing");
 
-			sinon.assert.calledWith(oWarningSpy, "Event handler name 'Toast.show('Do you really want to close?')' could not be resolved to an event handler function");
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('Do you really want to close\?'\)' could not be resolved to an event handler function/)));
 
 			return new Promise(function(resolve, reject) {
 				InstanceManager.closeAllDialogs();

package/test/sap/ui/core/qunit/mvc_legacyAPIs/XMLView_legacyAPIs.qunit.js

@@ -228,7 +228,7 @@ sap.ui.define([
 
 		// check warning log
 		assert.ok(
-			this.logSpyWarning.calledWithExactly("Event handler name 'doSomething' could not be resolved to an event handler function"),
+			this.logSpyWarning.calledWith(sinon.match(/Event handler name 'doSomething' could not be resolved to an event handler function/)),
 			"Correct warning for missing event-handler was logged"
 		);
 
@@ -328,7 +328,7 @@ sap.ui.define([
 
 			// check warning log
 			assert.ok(
-				this.logSpyWarning.calledWithExactly("Event handler name 'doSomething' could not be resolved to an event handler function"),
+				this.logSpyWarning.calledWith(sinon.match(/Event handler name 'doSomething' could not be resolved to an event handler function/)),
 				"Correct warning for missing event-handler was logged"
 			);
 

package/test/sap/ui/core/qunit/odata/ODataMessageParserNoFakeService.qunit.js

@@ -567,15 +567,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~canonicalTarget")
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			sODataTarget, mRequestInfo, bIsTechnical, /*bODataTransition*/ false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 	});
@@ -637,15 +637,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~deepPath/~target")
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			sODataTarget, mRequestInfo, oFixture.isTechnical, /*bODataTransition*/ false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 	});
@@ -698,15 +698,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~canonicalTarget")
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			oFixture.sODataTarget, mRequestInfo, true, oFixture.bODataTransition);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 });
@@ -744,15 +744,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~deepPath/~target")
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			"~target", mRequestInfo, false, /*bODataTransition*/ false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 
@@ -814,15 +814,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~deepPath/" + oFixture.target)
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs(oFixture.targetToNormalize)
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs(oFixture.targetToNormalize).returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			oFixture.target, mRequestInfo, false, false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 });
@@ -864,14 +864,15 @@ sap.ui.define([
 			.withExactArgs("/~functionTarget/~target", undefined, true).returns("~canonicalTarget");
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs(sDeepPath ? "/~deepPath/~target" : "/~target").returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey").withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			"~target", mRequestInfo, false, false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 });
@@ -910,14 +911,15 @@ sap.ui.define([
 			.withExactArgs("/~parsedUrl/~target", undefined, true).returns("~canonicalTarget");
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("/~deepPath/~target").returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey").withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			"~target", mRequestInfo, false, false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 
@@ -960,15 +962,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~deepPath~target") // collection -> no / between path and target
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			"~target", mRequestInfo, false, false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 
@@ -1011,15 +1013,15 @@ sap.ui.define([
 		this.mock(oODataMessageParser._metadata).expects("_getReducedPath")
 			.withExactArgs("~deepPath") // collection -> no / between path and target
 			.returns("~reducedPath");
-		this.mock(ODataUtils).expects("_normalizeKey")
-			.withExactArgs("~canonicalTarget")
-			.returns("~normalizedTarget");
+		const oODataUtilsMock = this.mock(ODataUtils);
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~reducedPath").returns("~normalizedReducedPath");
+		oODataUtilsMock.expects("_normalizeKey").withExactArgs("~canonicalTarget").returns("~normalizedTarget");
 
 		// code under test
 		oTargetInfo = ODataMessageParser.prototype._createTarget.call(oODataMessageParser,
 			/*sTarget*/ undefined, mRequestInfo, true, false);
 
-		assert.strictEqual(oTargetInfo.deepPath, "~reducedPath");
+		assert.strictEqual(oTargetInfo.deepPath, "~normalizedReducedPath");
 		assert.strictEqual(oTargetInfo.target, "~normalizedTarget");
 	});
 

package/test/sap/ui/core/qunit/odata/ODataUtils.qunit.js

@@ -769,6 +769,14 @@ sap.ui.define([
 }, { // fetch all data with offset
 	range : [1, 0, Infinity],
 	expected : {start : 0, length : Infinity}
+}, { // odd prefetch length, nothing missing
+	current : [[25, 50]],
+	range : [29, 3, 5],
+	expected : {start : 29, length : 3}
+}, { // odd prefetch length, prefetch before
+	current : [[25, 50]],
+	range : [27, 3, 5],
+	expected : {start : 22, length : 8}
 }].forEach(function (oFixture) {
 	QUnit.test("_getReadRange: " + oFixture.range, function (assert) {
 		var aElements = [],
@@ -792,4 +800,17 @@ sap.ui.define([
 		assert.deepEqual(oResult, oFixture.expected);
 	});
 });
+
+	//*********************************************************************************************
+	QUnit.test("_getReadRange with placeholder", function (assert) {
+		const oPlaceholder = {placeholder : true};
+		const aElements = [oPlaceholder, oPlaceholder, {}, {}, {}, oPlaceholder, oPlaceholder,
+			oPlaceholder, oPlaceholder];
+
+		assert.deepEqual(
+			// code under test
+			ODataUtils._getReadRange(aElements, 2, 3, 4, (oElement) => oElement.placeholder),
+			{start : 0, length : 9}
+		);
+	});
 });