@openui5/sap.ui.core 1.123.0 → 1.124.0

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

@@ -228,9 +228,6 @@ sap.ui.define([
 		extHookLegacy: null,
 		extension1: ControllerExt1,
 		extension2: ControllerExt1.override({
-			finalMethod: function() {
-				return "overridden by myExtension2";
-			},
 			myBefore: function() {
 				this.base.overrideCalledBefore = true;
 			},
@@ -382,9 +379,6 @@ sap.ui.define([
 						publicMethodToOverride: function() {
 							QUnit.config.current.assert.strictEqual(this.getMetadata().getName(), "example.ProviderExt2", "Context of override function set to ProviderExt2 extension");
 							return "overridden by ProviderExt2";
-						},
-						finalMethod: function() {
-							QUnit.config.current.assert.ok(false, "Original method flagged final. Never should happen");
 						}
 					}
 				},

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

@@ -228,9 +228,6 @@ sap.ui.define([
 		extHookLegacy: null,
 		extension1: ControllerExt1,
 		extension2: ControllerExt1.override({
-			finalMethod: function() {
-				return "overridden by myExtension2";
-			},
 			myBefore: function() {
 				this.base.overrideCalledBefore = true;
 			},
@@ -382,9 +379,6 @@ sap.ui.define([
 						publicMethodToOverride: function() {
 							QUnit.config.current.assert.strictEqual(this.getMetadata().getName(), "example.ProviderExt2", "Context of override function set to ProviderExt2 extension");
 							return "overridden by ProviderExt2";
-						},
-						finalMethod: function() {
-							QUnit.config.current.assert.ok(false, "Original method flagged final. Never should happen");
 						}
 					}
 				},

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

@@ -0,0 +1,15 @@
+sap.ui.define(["./Main.controller"], function(Controller) {
+	"use strict";
+
+	return Controller.extend("my.test.ExtendMainLegacy", {
+		metadata: {
+			/*defining methods in controller metadata enables new metadata definition*/
+			methods: {
+				"myFinalMethod": {"final":false}
+			}
+		},
+		myFinalMethod: function() {
+			return "Should not happen: overridden by extend";
+		}
+	});
+});

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

@@ -44,9 +44,6 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "./ReuseExtensionContext", "sap/ui/
 			return "privateMethod2OnBase";
 		},
 		reuse: ReuseExtension.override({
-			myFinalMethod: function() {
-				"Final Methods could not be overidden by an extension";
-			},
 			publicMethod: function() {
 				QUnit.config.current.assert.ok(this instanceof ControllerExtension, "Context is controller extension");
 				QUnit.config.current.assert.equal(this.getMetadata().getNamespace(), "my.test.reuse", "Context is correct controller extension");

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

@@ -0,0 +1,38 @@
+sap.ui.define(["sap/ui/core/mvc/Controller", "./ReuseExtensionFinal"], function(Controller, ReuseExtensionFinal) {
+	"use strict";
+
+	return Controller.extend("my.test.Main", {
+		metadata: {
+			/*no methods defined: should lead to legacy private/public behavior*/
+		},
+		mLifeCycle: {onInit:[], onExit:[], onBeforeRendering:[], onAfterRendering:[]},
+		onInit: function() {
+			this.mLifeCycle.onInit.push('base');
+		},
+		onExit: function() {
+			this.mLifeCycle.onExit.push('base');
+		},
+		onBeforeRendering: function() {
+			this.mLifeCycle.onBeforeRendering.push('base');
+		},
+		onAfterRendering: function() {
+			this.mLifeCycle.onAfterRendering.push('base');
+		},
+		publicMethod: function() {
+			return "publicMethodOnBase";
+		},
+		getLifeCycleCalls: function() {
+			return this.mLifeCycle;
+		},
+		myFinalMethod: function() {
+			return "I am final";
+		},
+		privateMethod1: function() {
+			return "privateMethod1OnBase";
+		},
+		_privateMethod2: function() {
+			return "privateMethod2OnBase";
+		},
+		reuse: ReuseExtensionFinal
+	});
+});

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

@@ -38,9 +38,6 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension"], function(ControllerExtens
 			},
 			onAfterRendering: function() {
 				this.base.getLifeCycleCalls().onAfterRendering.push('reuseExtension');
-			},
-			myFinalMethod: function() {
-				return "Final Methods could not be overidden by an extension";
 			}
 		}
 	});

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

@@ -40,9 +40,6 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension"], function(ControllerExtens
 			onAfterRendering: function() {
 				QUnit.config.current.assert.ok(this instanceof ControllerExtension, "onAfterRendering: Context is ControllerExtension 'Extension'");
 				QUnit.config.current.assert.equal(this.getMetadata().getNamespace(), "my.test.reuse", "onAfterRendering: Context is correct ControllerExtension 'Extension'");
-			},
-			myFinalMethod: function() {
-				return "Final Methods could not be overidden by an extension";
 			}
 		}
 	});

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

@@ -0,0 +1,47 @@
+sap.ui.define(["sap/ui/core/mvc/ControllerExtension"], function(ControllerExtension) {
+	"use strict";
+
+	return ControllerExtension.extend("my.test.reuse.Extension", {
+		metadata: {
+			methods: {
+				"myFinalMethod": {"public": true, "final": true},
+				"myPrivateMethod1": {"public": false, "final": true}
+			}
+		},
+		myFinalMethod: function() {
+			return "I am final";
+		},
+		myPublicMethod: function() {
+			return "myPublicMethodReuseExtension";
+		},
+		myPrivateMethod1: function() {
+
+		},
+		_myPrivateMethod2: function() {
+
+		},
+		onBeforeSomething: function() {
+
+		},
+		onInit: function() {
+			this.base.getLifeCycleCalls().onInit.push('reuseExtension');
+		},
+		overrides: {
+			onInit: function() {
+				this.base.getLifeCycleCalls().onInit.push('reuseExtension');
+			},
+			onExit: function() {
+				this.base.getLifeCycleCalls().onExit.push('reuseExtension');
+			},
+			onBeforeRendering:function() {
+				this.base.getLifeCycleCalls().onBeforeRendering.push('reuseExtension');
+			},
+			onAfterRendering: function() {
+				this.base.getLifeCycleCalls().onAfterRendering.push('reuseExtension');
+			},
+			myFinalMethod: function() {
+				return "Final Methods could not be overidden by an extension";
+			}
+		}
+	});
+});

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

@@ -0,0 +1,8 @@
+<mvc:View
+	xmlns:l="sap.ui.layout"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns:mvc="sap.ui.core.mvc">
+	<l:VerticalLayout>
+		<html:h2>This is some Header</html:h2>
+	</l:VerticalLayout>
+</mvc:View>

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

@@ -11,7 +11,7 @@
 		}" />
 
 		<!-- unknown type -->
-		<m:Input id="inputField_invalidType" value="{path:'/value', type:'sap.ui.non.existing.Type'}" />
+		<m:Input id="inputField_invalidType" value="{path:'/value'}" />
 
 		<!-- custom data-->
 		<m:customData>

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

@@ -0,0 +1,41 @@
+<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:core="sap.ui.core" xmlns:m="sap.m">
+	<m:Panel id="panel">
+		<!-- valid type with options -->
+		<m:Input id="inputField" value="{
+			path:'/value', type:'sap.ui.model.type.Integer',
+			formatOptions: {
+				groupingEnabled: true,
+				groupingSeparator: '.',
+				groupingSize: 3
+			}
+		}" />
+
+		<!-- unknown type -->
+		<m:Input id="inputField_invalidType" value="{path:'/value', type:'sap.ui.non.existing.Type'}" />
+
+		<!-- custom data-->
+		<m:customData>
+			<core:CustomData key="myColor" value="{path:'/customDataValue', type:'sap.ui.model.type.String'}" />
+		</m:customData>
+
+		<!-- composite binding-->
+		<m:Label id="label" text="{
+				path:'/amount',
+				type:'sap.ui.model.type.Float',
+				formatOptions: {
+					groupingSeparator: ',',
+					decimalSeparator:'.',
+					preserveDecimals: false,
+					decimals: 1
+				}
+			} EUR on {
+				path:'/date',
+				type:'sap.ui.model.type.Date',
+				formatOptions: {
+					source: { pattern: 'timestamp'},
+					pattern: 'yyyy-MM-dd',
+					UTC: true
+				}
+			}" />
+	</m:Panel>
+</mvc:View>

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

@@ -1,4 +1,4 @@
-<mvc:View controllerName="my.Controller09" xmlns:m="sap.m"
+<mvc:View xmlns:m="sap.m"
 	xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml"
 	displayBlock="true">
 	<m:Panel id="myPanel">

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

@@ -50,6 +50,10 @@ sap.ui.define([
 			return "formatted-" + oValue;
 		},
 
+		closeDialog: function() {
+			Element.getElementById("xmlDialog").close();
+		},
+
 		sap: {
 			doIt: function (oEvent) {
 				QUnit.config.current.assert.ok(true, "Event of " + oEvent.getSource().getId() + " executed in controller");

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

@@ -26,7 +26,7 @@
 			<m:CheckBox text="HEY named aggregation!" />
 			<mvc:View async="true" id="MyJSView" viewName="module:example/mvc/TypedView2"></mvc:View>
 			<mvc:XMLView async="true" id="MyXMLView" viewName="example.mvc.test2"></mvc:XMLView>
-			<mvc:XMLView async="true" id="MyHTMLView" viewName="example.mvc.test2" controllerName="example.mvc.test"></mvc:XMLView>
+			<mvc:XMLView async="true" id="MyHTMLView" viewName="example.mvc.test2"></mvc:XMLView>
 		</m:content>
 	</m:Panel>
 </mvc:View>

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

@@ -8,7 +8,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				paths: {
 					"testdata/fragments": "test-resources/sap/ui/core/qunit/testdata/fragments/", // fragments used in views
 
-					// @deprecated as of 1.110
+// @deprecated as of 1.110
 					"testdata/fragments_legacyAPIs": "test-resources/sap/ui/core/qunit/testdata/fragments_legacyAPIs/", // fragments used in views
 					"testdata/mvc": "test-resources/sap/ui/core/qunit/mvc/testdata", // used by async tests
 
@@ -25,6 +25,16 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				libs: ["sap.ui.core", "sap.ui.layout", "sap.m"],
 				theme: "sap_fiori_3",
 				language: "en"
+			},
+			qunit: {
+				versions : {
+					"2.18" : {
+						module : "test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18",
+						css : "test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.css"
+					}
+				},
+				version : "2.18",
+				reorder : false
 			}
 		},
 		tests: {
@@ -69,7 +79,7 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				}
 			},
 			XMLTemplateProcessor: {
-				title: "QUnit Page for XMLTemplateProcessor (sync)",
+				title: "QUnit Page for XMLTemplateProcessor",
 				loader: {
 					paths: {
 						"my": "test-resources/sap/ui/core/qunit/fragment/"

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

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/UIComponent",
@@ -12,7 +13,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/StashedControlSupport",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, Controller, UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLView, StashedControlSupport, nextUIUpdate) {
+], function(future, Log, Controller, UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLView, StashedControlSupport, nextUIUpdate) {
 
 	"use strict";
 
@@ -300,10 +301,10 @@ 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.
+	 * @deprecated
 	 */
-	QUnit.test("Bad control processing", async function(assert) {
-
+	QUnit.test("Bad control processing (future=false)", async function(assert) {
+		future.active = false;
 		const oLogSpy = this.spy(Log, "error");
 
 		// view
@@ -329,6 +330,24 @@ sap.ui.define([
 		})();
 
 		oLogSpy.restore();
+		future.active = undefined;
+	});
+
+	/**
+	 * Tests parsing of a control which is not properly defined (does not return its class)
+	 * In V2: we only check for the error log.
+	 */
+	QUnit.test("Bad control processing (future=true)", async function(assert) {
+		future.active = true;
+
+		// Check for error concerning the missing module content
+		const oView = this.viewFactory("myViewBadControl", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingBadControl");
+		await assert.rejects(oView);
+		oView.catch((err) => {
+			assert.ok(err.message.includes("Control 'sap.ui.core.qunit.mvc.viewprocessing.BadControl' did not return a class definition from sap.ui.define."), "Error must be thrown");
+		});
+
+		future.active = undefined;
 	});
 
 

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

@@ -426,7 +426,7 @@ sap.ui.define([
 		}
 	}, {
 		testDescription: "Parsing core:require in ExpressionBinding",
-		viewName: ".view.XMLTemplateProcessorAsync_require_expression",
+		viewName: ".view.XMLTemplateProcessorAsync_require_expressionFaulty",
 		settings: {
 			sync: {
 				create: createView,

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

@@ -3,8 +3,8 @@
 
 sap.ui.define([
 	"test-resources/sap/ui/core/qunit/odata/data/ODataMessagesFakeService",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/odata/ODataMetadata",
 	"sap/ui/model/odata/ODataMessageParser",
@@ -13,12 +13,10 @@ sap.ui.define([
 	"sap/m/Input",
 	"sap/m/Button",
 	"sap/ui/layout/VerticalLayout"
-], function(fakeService, library, Messaging, ODataModel, ODataMetadata, ODataMessageParser, BindingMode, StringType,
-			Input, Button, VerticalLayout) {
+], function(fakeService, Messaging, MessageType, ODataModel, ODataMetadata, ODataMessageParser,
+			BindingMode, StringType, Input, Button, VerticalLayout) {
 	"use strict";
 
-	// shortcut for sap.ui.core.MessageType
-	var MessageType = library.MessageType;
 	var oInput = new Input({value:"{json>/Products(1)/ProductName}"});
 	var oInput2 = new Input({value:"{xml>/Products(1)/ProductName}"});
 

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

@@ -4,21 +4,19 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Lib",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/model/odata/MessageScope",
 	"sap/ui/model/odata/ODataMessageParser",
 	"sap/ui/model/odata/ODataMetadata",
 	"sap/ui/model/odata/ODataUtils"
-], function (Log, Library, coreLibrary, Messaging, Message, MessageScope, ODataMessageParser, ODataMetadata, ODataUtils) {
+], function (Log, Library, Messaging, Message, MessageType, MessageScope, ODataMessageParser, ODataMetadata, ODataUtils) {
 	/*global QUnit,sinon*/
 	/*eslint camelcase: 0, max-nested-callbacks: 0, no-warning-comments: 0*/
 	"use strict";
 
-	var sClassName = "sap.ui.model.odata.ODataMessageParser",
-		// shortcuts for enums
-		MessageType = coreLibrary.MessageType;
+	var sClassName = "sap.ui.model.odata.ODataMessageParser";
 
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.ODataMessageParser (ODataMessageParserNoFakeService)", {

package/test/sap/ui/core/qunit/odata/v2/ODataModel.integration.qunit.js

@@ -11,10 +11,10 @@ sap.ui.define([
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Lib",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/Rendering",
@@ -38,7 +38,7 @@ sap.ui.define([
 	// load Table resources upfront to avoid loading times > 1 second for the first test using Table
 	// "sap/ui/table/Table"
 ], function (Log, Localization, merge, uid, Input, Device, ManagedObjectObserver, SyncPromise,
-		Library, coreLibrary, Messaging, UI5Date, Message, Controller, View, Rendering, BindingMode, Filter,
+		Library, Messaging, UI5Date, Message, MessageType, Controller, View, Rendering, BindingMode, Filter,
 		FilterOperator, FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Decimal,
 		Context, ODataModel, XMLModel, TestUtils, datajs, XMLHelper) {
 	/*global QUnit, sinon*/
@@ -47,7 +47,6 @@ sap.ui.define([
 
 	var sDefaultLanguage = Localization.getLanguage(),
 		sDefaultTimezone = Localization.getTimezone(),
-		MessageType = coreLibrary.MessageType, // shortcut for sap.ui.core.MessageType
 		NO_CONTENT = {/*204 no content*/},
 		sODataListBindingClassName = "sap.ui.model.odata.v2.ODataListBinding",
 		sODataMessageParserClassName = "sap.ui.model.odata.ODataMessageParser",
@@ -56,7 +55,7 @@ sap.ui.define([
 		rRowIndex = /~(\d+)~/,
 		/**
 		 * Maps back-end response severity values to the values defined in the enumeration
-		 * <code>sap.ui.core.MessageType</code>.
+		 * <code>sap/ui/core/message/MessageType</code>.
 		 */
 		mSeverityMap = {
 			error : MessageType.Error,
@@ -308,7 +307,7 @@ sap.ui.define([
 	function getTableContent(oTable) {
 		return oTable.getRows().map(function(oRow) {
 			return oRow.getCells().map(function (oCell) {
-				return oCell.getText();
+				return oCell.getText ? oCell.getText() : oCell.getValue();
 			});
 		});
 	}
@@ -4729,6 +4728,8 @@ usePreliminaryContext : false}}">\
 			oObjectPage = that.oView.byId("objectPage");
 
 			assert.deepEqual(oMessage.getControlIds(), []);
+			that.expectValueState("note1", "Error", oSalesOrder1NoteError.message)
+				.expectValueState("note2", "Error", oSalesOrder1NoteError.message);
 
 			oObjectPage.setBindingContext(
 				that.oView.byId("table").getItems()[0].getBindingContext());
@@ -22865,4 +22866,169 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 		return this.createView(assert, sView, oModel);
 	});
+
+	//*********************************************************************************************
+	// Scenario: If a context of a property binding is changed during an asynchronous validation, the validated value is
+	// saved for the correct entity in the model.
+	// JIRA: CPOUI5MODELS-1618
+	QUnit.test("ODataPropertyBinding with asynchronous type validation", function (assert) {
+		const oModel = createSalesOrdersModel({defaultBindingMode: BindingMode.TwoWay});
+		const sView = `
+<t:Table id="table" rows="{path: '/SalesOrderSet'}" visibleRowCount="2">
+	<Input id="Note" value="{path: 'Note', type: 'sap.ui.model.type.String'}"/>
+</t:Table>`;
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$skip=0&$top=102", {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					Note: "Note1"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('2')"},
+					SalesOrderID: "2",
+					Note: "Note2"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('3')"},
+					SalesOrderID: "3",
+					Note: "Note3"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('4')"},
+					SalesOrderID: "4",
+					Note: "Note4"
+				}]
+			})
+			.expectValue("Note", ["Note1", "Note2"]);
+		let fnResolveValidateValue1, fnResolveValidateValue2, oTable, pSetExternalValue1, pSetExternalValue2, oTypeMock;
+
+		return this.createView(assert, sView, oModel).then(() => {
+			this.expectValue("Note", "Note2", 1);
+			this.expectValue("Note", "Note3", 2);
+
+			oTable = this.oView.byId("table");
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock = this.mock(oBinding.getType());
+			oTypeMock.expects("validateValue").withExactArgs("NewNote1").returns(new Promise((fnResolve) => {
+				fnResolveValidateValue1 = fnResolve;
+			}));
+			pSetExternalValue1 = oBinding.setExternalValue("NewNote1");
+			oTable.setFirstVisibleRow(1);
+
+			return this.waitForChanges(assert, "Change first entry and scroll");
+		}).then(() => {
+			this.expectValue("Note", "Note3", 2);
+			this.expectValue("Note", "Note4", 3);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock.expects("validateValue").withExactArgs("NewNote2").returns(new Promise((fnResolve) => {
+				fnResolveValidateValue2 = fnResolve;
+			}));
+			pSetExternalValue2 = oBinding.setExternalValue("NewNote2");
+			oTable.setFirstVisibleRow(2);
+
+			return this.waitForChanges(assert, "Change second entry and scroll again");
+		}).then(() => {
+			fnResolveValidateValue1();
+			fnResolveValidateValue2();
+
+			return Promise.all([pSetExternalValue1, pSetExternalValue2,
+				this.waitForChanges(assert, "Validation of the changes finished")]);
+		}).then(() => {
+			this.expectValue("Note", "NewNote1", 0);
+			this.expectValue("Note", "NewNote2", 1);
+
+			oTable.setFirstVisibleRow(0);
+
+			return this.waitForChanges(assert, "Scroll back up and see correct values");
+		});
+	});
+
+	//*********************************************************************************************
+	// Scenario: If a context of a composite binding is changed during an asynchronous validation, the validated value
+	// is saved for the correct entity in the model.
+	// JIRA: CPOUI5MODELS-1618
+	QUnit.test("CompositeBinding with asynchronous type validation", function (assert) {
+		const oModel = createSalesOrdersModel({defaultBindingMode: BindingMode.TwoWay});
+		const sView = `
+<t:Table id="table" rows="{path: '/SalesOrderSet'}" visibleRowCount="2">
+<Input id="GrossAmount" value="{
+	parts: [{path: 'GrossAmount'}, {path: 'CurrencyCode'}],
+	type: 'sap.ui.model.type.Currency'}"/>
+</t:Table>`;
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$skip=0&$top=102", {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					GrossAmount: "10",
+					CurrencyCode: "EUR"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('2')"},
+					SalesOrderID: "2",
+					GrossAmount: "5",
+					CurrencyCode: "JPY"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('3')"},
+					SalesOrderID: "3",
+					GrossAmount: "15",
+					CurrencyCode: "USD"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('4')"},
+					SalesOrderID: "4",
+					GrossAmount: "20",
+					CurrencyCode: "USDN"
+				}]
+			});
+
+		let fnResolveValidateValue1;
+		let fnResolveValidateValue2;
+		let oTable;
+		let pSetExternalValue1;
+		let pSetExternalValue2;
+		let oTypeMock;
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+			assert.deepEqual(getTableContent(oTable), [["10.00\u00a0EUR"], ["5\u00a0JPY"]]);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock = this.mock(oBinding.getType());
+			oTypeMock.expects("validateValue").withExactArgs([16, "EUR"]).returns(new Promise((fnResolve) => {
+				fnResolveValidateValue1 = fnResolve;
+			}));
+			pSetExternalValue1 = oBinding.setExternalValue("16 EUR");
+			oTable.setFirstVisibleRow(1);
+
+			return this.waitForChanges(assert, "Change first entry and scroll");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["5\u00a0JPY"], ["15.00\u00a0USD"]]);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock.expects("validateValue").withExactArgs([29, "JPY"]).returns(new Promise((fnResolve) => {
+				fnResolveValidateValue2 = fnResolve;
+			}));
+			pSetExternalValue2 = oBinding.setExternalValue("29 JPY");
+			oTable.setFirstVisibleRow(2);
+
+			return this.waitForChanges(assert, "Change second entry and scroll again");
+		}).then(() => {
+			fnResolveValidateValue1();
+			fnResolveValidateValue2();
+
+			return Promise.all([pSetExternalValue1, pSetExternalValue2,
+				this.waitForChanges(assert, "Validation of the changes finished")]);
+		}).then(() => {
+			oTable.setFirstVisibleRow(0);
+
+			return this.waitForChanges(assert, "Scroll back up and see correct values");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["16.00\u00a0EUR"], ["29\u00a0JPY"]]);
+		});
+	});
 });