@openui5/sap.ui.core 1.124.1 → 1.125.0

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

@@ -602,10 +602,10 @@ sap.ui.define([
 		let oOnAfterRenderingPromise;
 		sap.ui.define("my/Controller13.controller", ["sap/ui/core/mvc/Controller"], function(Controller) {
 			return Controller.extend("my.Controller13", {
-				onAfterRendering: async function() {
+				onAfterRendering: function() {
 					const oPromise = Promise.reject(new Error("async onAfterRendering returns rejected Promise."));
 					oOnAfterRenderingPromise =  oPromise;
-					await oPromise;
+					return oPromise;
 				}
 			});
 		});

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

@@ -249,7 +249,9 @@ sap.ui.define([
 	});
 
 
-
+	/**
+	 * @deprecated because the mode 'Sequential' will be the only mode that is supported in the next major release
+	 */
 	QUnit.module("Propagation of processingMode: 'Sequential'", {
 		beforeEach: function() {
 			this.loadTemplatePromiseSpy = sinon.spy(XMLTemplateProcessor, "loadTemplatePromise");
@@ -293,7 +295,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Async rootView & sync childView", function(assert) {
+	QUnit.test("Async rootView & (auto) async childView", function(assert) {
 		var done = assert.async();
 
 		sap.ui.define("test/XMLTemplateProcessor2/Component", function() {
@@ -321,7 +323,7 @@ sap.ui.define([
 
 				oView.getContent()[0].loaded().then(function(oChildView1) {
 					assert.ok(oChildView1, "View is loaded.");
-					assert.notOk(oChildView1.oAsyncState, "View is a sync view.");
+					assert.ok(oChildView1.oAsyncState, "View is an async view.");
 					assert.equal(oChildView1._sProcessingMode, XMLProcessingMode.Sequential, "ProcessingMode 'Sequential' is set on " + "View:" + oChildView1.getViewName());
 
 					oChildView1.getContent()[0].loaded().then(function(oChildView2) {
@@ -366,11 +368,11 @@ sap.ui.define([
 				assert.ok(oView, "View is loaded.");
 				assert.ok(oView.oAsyncState, "View is an async view.");
 				assert.equal(oView._sProcessingMode, XMLProcessingMode.Sequential, "ProcessingMode 'Sequential' is set on " + "View:" + oView.getViewName());
-				assert.equal(this.loadTemplatePromiseSpy.callCount, 1, "loadTemplatePromiseSpy should be called once");
+				assert.equal(this.loadTemplatePromiseSpy.callCount, 3, "loadTemplatePromiseSpy should be called once");
 
 				var oXMLView = oView.byId("xmlViewInsideFragment");
 				assert.ok(oXMLView, "View is loaded.");
-				assert.notOk(oXMLView.oAsyncState, "View is a sync view.");
+				assert.ok(oXMLView.oAsyncState, "View is an async view.");
 				assert.equal(oXMLView._sProcessingMode, XMLProcessingMode.Sequential, "ProcessingMode 'Sequential' is set on " + "View:" + oXMLView.getViewName());
 
 				assert.deepEqual(Component.getOwnerComponentFor(oXMLView), oComponent, "Should be the same owner component.");
@@ -552,7 +554,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("[Simple Binding] Async loading of data types (future=false)", async function(assert) {
+	QUnit.test("[Simple Binding] Async loading of data types (future=true)", async function(assert) {
 		future.active = true;
 		var oModel = new JSONModel({
 			value: 1234,

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

@@ -461,20 +461,20 @@ sap.ui.define([
 			async: {
 				create: createView,
 				spies: {
-					_create: [View, "_create"],
+					create: [View, "create"],
 					warning: [Log, "warning"]
 				}
 			}
 		},
 		future: false,
-		runAssertions: function (oView, mSpies, assert, bAsync) {
-			var oCreateSpy = mSpies._create;
+		runAssertions: async function (oView, mSpies, assert, bAsync) {
+			var oCreateSpy = mSpies.create;
 			var oWarningSpy = mSpies.warning;
-			assert.ok(oCreateSpy.calledOnce, "generic create is called for the nested view");
+			assert.ok(oCreateSpy.calledTwice, "public create is called for the nested view");
 
-			return oCreateSpy.getCall(0).returnValue.loaded().then(function() {
-				return assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Box.show\('MessageBox'\)' could not be resolved to an event handler function/)));
-			});
+			await oCreateSpy.getCall(0).returnValue;
+
+			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Box.show\('MessageBox'\)' 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 (future=true)",

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	var oConfig = {
 		viewClass : XMLView,
 		viewClassName : XMLView.getMetadata().getName(),
-		idsToBeChecked : ["myPanel", "Button1", "localTableId"]
+		idsToBeChecked : ["myPanel", "Button1", "Button2", "Button3"]
 	};
 
 	var fnWaitForNestedViews = function(oView) {
@@ -110,6 +110,69 @@ sap.ui.define([
 		}).then(fnWaitForNestedViews);
 	}, /* bCheckViewData = */ true);
 
+	/**
+	 * @deprecated since version 1.120 because the view contains HTML and SVG nodes
+	 */
+	(() => {
+		const sViewName = "example.mvc.legacy.test";
+
+		const oConfig = {
+			viewClass : XMLView,
+			viewClassName : XMLView.getMetadata().getName(),
+			idsToBeChecked : ["myPanel", "Button1", "localTableId"]
+		};
+		let sViewXML;
+		pViewXMLLoaded = pViewXMLLoaded.then(() => {
+			return Promise.resolve(
+				jQuery.ajax({
+					url: sap.ui.require.toUrl(sViewName.replace(/\./g, "/") + ".view.xml"),
+					dataType: "text"
+				})
+			);
+		}).then(function(sResult) {
+			sViewXML = sResult;
+		});
+
+		// run the full testset for a view loaded from a file
+		testsuite(oConfig, "XMLView (contains HTML or SVG nodes) creation loading from file", function() {
+			return XMLView.create({
+				viewName: sViewName
+			}).then(fnWaitForNestedViews);
+		});
+
+		// run the full testset for a view created from a string
+		testsuite(oConfig, "XMLView (contains HTML or SVG nodes) creation via XML string", function() {
+			// let the XMLView parse the XML string
+			return XMLView.create({
+				definition: sViewXML
+			}).then(fnWaitForNestedViews);
+		});
+
+		// run the full testset for a view created from an XML document
+		testsuite(oConfig, "XMLView (contains HTML or SVG nodes) creation via XML document", function() {
+			// parse the XML string and pass the XML document
+			return XMLView.create({
+				definition: XMLHelper.parse(sViewXML)
+			}).then(fnWaitForNestedViews);
+		});
+
+		// run the full testset for a view created from the root element of an XML document
+		testsuite(oConfig, "XMLView (contains HTML or SVG nodes) creation via XML node", function() {
+			// parse the XML string and pass the XML root element
+			return XMLView.create({
+				xmlNode: XMLHelper.parse(sViewXML).documentElement
+			}).then(fnWaitForNestedViews);
+		});
+
+		// run the full testset for a view created via the generic factory method
+		testsuite(oConfig, "XMLView (contains HTML or SVG nodes) creation using generic view factory", function() {
+			return View.create({
+				type: ViewType.XML,
+				viewName: sViewName,
+				viewData: {test:"testdata"}
+			}).then(fnWaitForNestedViews);
+		}, /* bCheckViewData = */ true);
+	})();
 
 	var sDefaultLanguage = Localization.getLanguage();
 
@@ -133,6 +196,9 @@ sap.ui.define([
 		});
 	});
 
+	/**
+	 * @deprecated
+	 */
 	QUnit.test("Using native HTML in XMLViews (future=false)", async function (assert) {
 		future.active = false;
 		const oView = await XMLView.create({
@@ -156,7 +222,7 @@ sap.ui.define([
 		var oViewPromise = XMLView.create({definition: "" +
 				"<mvc:View resourceBundleName=\"testdata.mvc.text\"\n" +
 				"\t\t   resourceBundleAlias=\"i18n\"\n" +
-				"\t\t   xmlns:mvc=\"sap.ui.core.mvc\" xmlns=\"sap.m\" xmlns:html=\"http://www.w3.org/1999/xhtml\">\n" +
+				"\t\t   xmlns:mvc=\"sap.ui.core.mvc\" xmlns=\"sap.m\">\n" +
 				"\t<Panel id=\"aPanel\">\n" +
 				"\t\t<Button id=\"Button1\" text=\"{i18n>TEXT_CLOSE}\"></Button>\n" +
 				"\t</Panel>\n" +
@@ -278,7 +344,7 @@ sap.ui.define([
 
 		// load and place view, force rendering
 		var oView = View._create({
-			viewName: 'example.mvc.test',
+			viewName: 'example.mvc.legacy.test',
 			type: ViewType.XML,
 			async: true
 		}).placeAt('content');
@@ -342,7 +408,7 @@ sap.ui.define([
 
 		// load view, embed it in a Panel and force rendering
 		return XMLView.create({
-			viewName: 'example.mvc.test'
+			viewName: 'example.mvc.legacy.test'
 		}).then(async function(oView) {
 			var oPanel = new Panel({
 				text: "My View",
@@ -417,7 +483,7 @@ sap.ui.define([
 
 		return XMLView.create({
 			id: "xmlview",
-			viewName: 'example.mvc.test'
+			viewName: 'example.mvc.legacy.test'
 		}).then(async function(oView) {
 			xmlview = oView;
 
@@ -459,7 +525,7 @@ sap.ui.define([
 
 		// load and place view, force rendering
 		return XMLView.create({
-			viewName: "example.mvc.test"
+			viewName: 'example.mvc.legacy.test'
 		}).then(async function(oView) {
 			oView.placeAt("content");
 			var oPanel = oView.byId("myPanel");
@@ -527,7 +593,7 @@ sap.ui.define([
 
 		// load and place view, force rendering
 		return XMLView.create({
-			viewName: 'example.mvc.test'
+			viewName: 'example.mvc.legacy.test'
 		}).then(async function(oView) {
 			oView.placeAt("content");
 			await nextUIUpdate();
@@ -547,7 +613,7 @@ sap.ui.define([
 
 		// load and place view, force rendering
 		return XMLView.create({
-			viewName: 'example.mvc.test'
+			viewName: 'example.mvc.legacy.test'
 		}).then(async function(oView) {
 			oView.placeAt("content");
 			await nextUIUpdate();
@@ -565,6 +631,8 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.module("Nested XMLViews");
+
 	/**
 	 * @deprecated
 	 */
@@ -766,7 +834,7 @@ sap.ui.define([
 	// error
 	QUnit.test("Error in template - no default aggregation defined", function(assert) {
 		var sXml = [
-				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns="http://www.w3.org/1999/xhtml">',
+				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib">',
 				'	<test:TestButton>',
 				'		<test:Error/>',
 				'	</test:TestButton>',
@@ -787,7 +855,7 @@ sap.ui.define([
 
 	QUnit.test("Error in template - text in aggregation", function(assert) {
 		var sXml = [
-				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns="http://www.w3.org/1999/xhtml">',
+				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib">',
 				'	<test:TestButton>',
 				'		Error',
 				'	</test:TestButton>',
@@ -827,7 +895,11 @@ sap.ui.define([
 		});
 	});
 
-	// encoding
+
+	/**
+	 * encoding
+	 * @deprecated since 1.120 because the view has HTML or SVG nodes
+	 */
 	QUnit.test("Encoding", function(assert) {
 
 		var xmlWithHTMLFragment = [
@@ -1007,15 +1079,12 @@ sap.ui.define([
 
 	QUnit.test("Named Aggregation", function(assert) {
 		var sXmlWithNamedAggregations = [
-			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns:html="http://www.w3.org/1999/xhtml" controllerName="example.mvc.test">',
+			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" controllerName="example.mvc.test">',
 			'  <mvc:content>',
 			'    <test:TestButton id="contentButton" />',
-			'    <html:div id="div1">test1</html:div>',
 			'  </mvc:content>',
 			'  <mvc:dependents>',
 			'    <test:TestButton id="dependentButton" />',
-			'    <html:div id="div2">test2</html:div>',
-			'    plain text node',
 			'    <core:Fragment id="innerFragment" fragmentName="testdata.fragments.XMLFragmentDialog" type="XML"/>',
 			'  </mvc:dependents>',
 			'</mvc:View>'
@@ -1054,13 +1123,6 @@ sap.ui.define([
 			assert.strictEqual(oView.getDependents()[0].getId(),"viewWithNamedAggregations--dependentButton", "viewWithNamedAggregations: The dependent button was added correctly to dependents aggregation");
 			assert.strictEqual(oView.getDependents()[1].getId(),"viewWithNamedAggregations--innerFragment--xmlDialog", "viewWithNamedAggregations: The dialog control from the dependent fragment was added correctly to dependents aggregation");
 
-			var oDiv1 = document.getElementById(oView.createId("div1"));
-			assert.ok(oDiv1, "XHTML element in 'content' aggregation is rendered");
-			assert.equal(oDiv1.childNodes.length, 1, "The div has one child");
-			assert.equal(oDiv1.childNodes[0].textContent, "test1", "The text content is correct");
-			assert.notOk(document.getElementById(oView.createId("div2")), "XHTML element in 'dependents' aggregation is NOT rendered");
-			assert.notOk(oDiv1.nextSibling.textContent.trim(), "HTML nodes or text nodes outside the content aggregation shouldn't be rendered");
-
 			oView.destroy();
 		}).then(function() {
 			return XMLView.create({
@@ -1086,6 +1148,53 @@ sap.ui.define([
 		});
 	});
 
+	/**
+	 * @deprecated since version 1.120 because the views contain HTML or SVG nodes
+	 */
+	QUnit.test("Named Aggregation (Views contain HTML nodes)", function(assert) {
+		var sXmlWithNamedAggregations = [
+			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns:html="http://www.w3.org/1999/xhtml" controllerName="example.mvc.test">',
+			'  <mvc:content>',
+			'    <test:TestButton id="contentButton" />',
+			'    <html:div id="div1">test1</html:div>',
+			'  </mvc:content>',
+			'  <mvc:dependents>',
+			'    <test:TestButton id="dependentButton" />',
+			'    <html:div id="div2">test2</html:div>',
+			'    plain text node',
+			'    <core:Fragment id="innerFragment" fragmentName="testdata.fragments.XMLFragmentDialog" type="XML"/>',
+			'  </mvc:dependents>',
+			'</mvc:View>'
+		].join('');
+
+		return XMLView.create({
+			id: "viewWithNamedAggregations",
+			definition: sXmlWithNamedAggregations
+		}).then(async function(oView) {
+			oView.placeAt("content");
+			await nextUIUpdate();
+
+			assert.strictEqual(oView.getContent()[0].getId(),"viewWithNamedAggregations--contentButton", "viewWithNamedAggregations: The button was added correctly to content aggregation");
+
+			var oDependentButton = oView.byId("dependentButton");
+			assert.notOk(oDependentButton.getDomRef(), "controls that aren't in the content aggregation of the view shouldn't be rendered");
+			assert.strictEqual(oView.getDependents()[0].getId(),"viewWithNamedAggregations--dependentButton", "viewWithNamedAggregations: The dependent button was added correctly to dependents aggregation");
+			assert.strictEqual(oView.getDependents()[1].getId(),"viewWithNamedAggregations--innerFragment--xmlDialog", "viewWithNamedAggregations: The dialog control from the dependent fragment was added correctly to dependents aggregation");
+
+			var oDiv1 = document.getElementById(oView.createId("div1"));
+			assert.ok(oDiv1, "XHTML element in 'content' aggregation is rendered");
+			assert.equal(oDiv1.childNodes.length, 1, "The div has one child");
+			assert.equal(oDiv1.childNodes[0].textContent, "test1", "The text content is correct");
+			assert.notOk(document.getElementById(oView.createId("div2")), "XHTML element in 'dependents' aggregation is NOT rendered");
+			assert.notOk(oDiv1.nextSibling.textContent.trim(), "HTML nodes or text nodes outside the content aggregation shouldn't be rendered");
+
+			oView.destroy();
+		});
+	});
+
+	/**
+	 * @deprecated since version 1.120 because the view has HTML nodes
+	 */
 	QUnit.test("Error should be thrown when 'content' aggregation of View is bound and binding template contains HTML node", function(assert) {
 		var sXmlWithBoundContent = [
 			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns:html="http://www.w3.org/1999/xhtml" ',

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

@@ -1,7 +1,6 @@
 <mvc:View controllerName="testdata.mvc.Async"
 	xmlns="sap.m" xmlns:form="sap.ui.layout.form"
-	xmlns:mvc="sap.ui.core.mvc" xmlns:html="http://www.w3.org/1999/xhtml">
-
+	xmlns:mvc="sap.ui.core.mvc">
 	<Image width="150px" height="110px" src="./testdata/images/screw.jpg"></Image>
 
 	<form:SimpleForm id="Layout" width="250px" class="myMatrixLayout" layout="ColumnLayout">

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

@@ -1,6 +1,4 @@
-<mvc:View xmlns:m="sap.m"
-	xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml"
-	displayBlock="true">
+<mvc:View xmlns:m="sap.m" xmlns:mvc="sap.ui.core.mvc" displayBlock="true">
 	<m:Panel id="myPanel">
 		<m:Button id="myButton" text="Press me"></m:Button>
 	</m:Panel>

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

@@ -1,4 +1,4 @@
-<mvc:XMLView xmlns:m="sap.m" xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml">
+<mvc:XMLView xmlns:m="sap.m" xmlns:mvc="sap.ui.core.mvc">
 	<m:Panel>
 		<m:Label id="Label1" text="Label" labelFor="Button1" />
 		<m:Button id="Button1"></m:Button>

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

@@ -0,0 +1,32 @@
+<mvc:View controllerName="example.mvc.test" xmlns:m="sap.m"
+	xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:svg="http://www.w3.org/2000/svg"
+	displayBlock="true">
+	<table id="localTableId" title="encoding is the A&amp;O of XML parsing &lt;and&gt; &quot;writing" border="5">
+		<tr><td>Hello</td><td>Hello</td><td>Hello</td></tr>
+		<tr><td>Hello</td><td>Hello A&amp;O, what about a &lt;div&gt; in here?</td><td><m:Button id="Button1" text="HEY!" press="doIt"></m:Button></td></tr>
+	</table>
+	plain text node as direct child of view
+	<m:Panel id="myPanel">
+		<!-- this comment should be ignored -->
+		<m:Button id="Button3" text="HEY default aggregation!" tooltip="hello tooltip" press="doIt"></m:Button>
+		<m:Button id="ButtonX" text="Another Hello" press=".sap.doIt"></m:Button>
+		<div style="border:1px solid red;background-color:yellow;width:200px;height:10px;">text node in nested HTML in default aggregation</div>
+		<m:content>
+			<!-- this comment should be ignored -->
+			<div style="border:1px solid red;background-color:blue;width:200px;height:10px;">text node in HTML in named aggregation &amp; </div>
+			<div>
+				<svg:svg width="4cm" height="8cm" version="1.1">
+					<svg:ellipse cx="2cm" cy="4cm" rx="2cm" ry="1cm" />
+				</svg:svg>
+			</div>
+			<m:Button id="Button2" text="HEY named aggregation!" press="doIt">
+				<!-- this comment should be ignored -->
+			</m:Button>
+			<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>
+		</m:content>
+	</m:Panel>
+</mvc:View>

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

@@ -1,25 +1,12 @@
 <mvc:View controllerName="example.mvc.test" xmlns:m="sap.m"
-	xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:svg="http://www.w3.org/2000/svg"
-	displayBlock="true">
-	<table id="localTableId" title="encoding is the A&amp;O of XML parsing &lt;and&gt; &quot;writing" border="5">
-		<tr><td>Hello</td><td>Hello</td><td>Hello</td></tr>
-		<tr><td>Hello</td><td>Hello A&amp;O, what about a &lt;div&gt; in here?</td><td><m:Button id="Button1" text="HEY!" press="doIt"></m:Button></td></tr>
-	</table>
-	plain text node as direct child of view
+	xmlns:mvc="sap.ui.core.mvc" displayBlock="true">
+	<m:Button id="Button1" text="HEY!" press="doIt"></m:Button>
 	<m:Panel id="myPanel">
 		<!-- this comment should be ignored -->
 		<m:Button id="Button3" text="HEY default aggregation!" tooltip="hello tooltip" press="doIt"></m:Button>
 		<m:Button id="ButtonX" text="Another Hello" press=".sap.doIt"></m:Button>
-		<div style="border:1px solid red;background-color:yellow;width:200px;height:10px;">text node in nested HTML in default aggregation</div>
 		<m:content>
 			<!-- this comment should be ignored -->
-			<div style="border:1px solid red;background-color:blue;width:200px;height:10px;">text node in HTML in named aggregation &amp; </div>
-			<div>
-				<svg:svg width="4cm" height="8cm" version="1.1">
-					<svg:ellipse cx="2cm" cy="4cm" rx="2cm" ry="1cm" />
-				</svg:svg>
-			</div>
 			<m:Button id="Button2" text="HEY named aggregation!" press="doIt">
 				<!-- this comment should be ignored -->
 			</m:Button>

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

@@ -19,6 +19,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/Rendering",
 	"sap/ui/model/BindingMode",
+	"sap/ui/model/FieldHelp",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
 	"sap/ui/model/FilterType",
@@ -38,7 +39,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, Messaging, UI5Date, Message, MessageType, Controller, View, Rendering, BindingMode, Filter,
+		Library, Messaging, UI5Date, Message, MessageType, Controller, View, Rendering, BindingMode, FieldHelp, Filter,
 		FilterOperator, FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Decimal,
 		Context, ODataModel, XMLModel, TestUtils, datajs, XMLHelper) {
 	/*global QUnit, sinon*/
@@ -23035,4 +23036,150 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			assert.deepEqual(getTableContent(oTable), [["16.00\u00a0EUR"], ["29\u00a0JPY"]]);
 		});
 	});
+
+	//*********************************************************************************************
+	// Scenario: Activate field help and get the expected hotspots. Simulate filter bar fields which will set
+	// "sap-ui-DocumentationRef" custom data at the filter field. For ODataPropertyBindings, either standalone or
+	// embedded in a CompositeBinding, the field help is determined automatically by evaluating the
+	// "com.sap.vocabularies.Common.v1.DocumentationRef" annotation. ODataPropertyBindings embedded in a
+	// CompositeBinding for which no messages are displayed (see getPartsIgnoringMessages), are ignored.
+	// Controls which have been destroyed do neither produce a field help nor log messages.
+	// JIRA: CPOUI5MODELS-1696
+	QUnit.test("Field Help", function (assert) {
+		const oModel = createSalesOrdersModel({defaultBindingMode: BindingMode.TwoWay});
+		const oFilterModel = new JSONModel({filter: "42"});
+		const sView = `
+<Label labelFor="FilterSingleFieldHelp" text="Label for filter with single field help" />
+<Input id="FilterSingleFieldHelp" value="{filter>/filter}" />
+<Label labelFor="FilterMultipleFieldHelps" text="Label for filter with multiple field helps" />
+<Input id="FilterMultipleFieldHelps" value="Foo Bar" />
+<Label labelFor="FilterWithoutFieldHelp" text="Label for filter without any field help" />
+<Input id="FilterWithoutFieldHelp" value="Baz" />
+<Label labelFor="FilterDynamicallyDestroyed" text="Label for filter which is dynamically destroyed" />
+<Input id="FilterDynamicallyDestroyed" value="{filter>/filter}" />
+<FlexBox id="form" binding="{/SalesOrderSet('1')}">
+	<Label labelFor="Note" text="Label for Note" />
+	<Input id="Note" value="{Note}" />
+	<Label labelFor="DeliveryStatus" text="Label for DeliveryStatus without any field help" />
+	<Input id="DeliveryStatus" value="{DeliveryStatus}" />
+	<Label labelFor="Amount0" text="Label for both amount and currency" />
+	<Input id="Amount0" value="{
+		mode : 'TwoWay',
+		parts : [{
+			constraints : {precision : 16, scale : 3},
+			path : 'GrossAmount',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			constraints : {maxLength : 5},
+			path : 'CurrencyCode',
+			type : 'sap.ui.model.odata.type.String'
+		}],
+		type : 'sap.ui.model.type.Currency'
+	}" />
+	<Label labelFor="Amount1" text="Label for amount only" />
+	<Input id="Amount1" value="{
+		formatOptions : {showMeasure : false},
+		mode : 'TwoWay',
+		parts : [{
+			constraints : {precision : 16, scale : 3},
+			path : 'GrossAmount',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			constraints : {maxLength : 5},
+			path : 'CurrencyCode',
+			type : 'sap.ui.model.odata.type.String'
+		}],
+		type : 'sap.ui.model.type.Currency'
+	}" />
+</FlexBox>`;
+		function compare(a, b) {
+			if (a === b) {
+				return 0;
+			}
+			return a < b ? -1 : 1;
+		}
+		function sortHotspots(a, b) {
+			return compare(a.hotspotId, b.hotspotId) || compare(a.backendHelpKey.id, b.backendHelpKey.id);
+		}
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet('1')", {
+				__metadata: {uri: "SalesOrderSet('1')"},
+				CurrencyCode: "EUR",
+				DeliveryStatus: "N",
+				GrossAmount: "1.23",
+				Note: "Sales Order Note",
+				SalesOrderID: "1"
+			})
+			.expectValue("Amount0", "1.23")
+			.expectValue("Amount0", "1.23\xa0EUR")
+			.expectValue("Amount1", "1.23")
+			.expectValue("DeliveryStatus", "N")
+			.expectValue("Note", "Sales Order Note");
+
+		return this.createView(assert, sView, {undefined: oModel, filter: oFilterModel}).then(() => {
+			const oView = this.oView;
+			// manually add documentation refs - simulate filter fields
+			const oFilterSingleFieldHelp = oView.byId("FilterSingleFieldHelp");
+			oFilterSingleFieldHelp.data("sap-ui-DocumentationRef",
+				"urn:sap-com:documentation:key?=type=DTEL&id=SALESORDERID");
+			const oFilterMultipleFieldHelps = oView.byId("FilterMultipleFieldHelps");
+			oFilterMultipleFieldHelps.data("sap-ui-DocumentationRef", [
+				"urn:sap-com:documentation:key?=type=DTEL&id=FOO",
+				"urn:sap-com:documentation:key?=type=DTEL&id=Bar&origin=Origin"
+			]);
+			const oFilterDynamicallyDestroyed = oView.byId("FilterDynamicallyDestroyed");
+			oFilterDynamicallyDestroyed.data("sap-ui-DocumentationRef",
+				"urn:sap-com:documentation:key?=type=DTEL&id=SALESORDERID");
+			let fnResolve;
+			const oPromise = new Promise((resolve) => {
+				fnResolve = resolve;
+			});
+			const oUtil = {fnUpdateCallback() {}};
+			this.mock(oUtil).expects("fnUpdateCallback").withExactArgs(sinon.match.array).callsFake((aHotspots) => {
+				const aExpectedHotspots = [{
+					"backendHelpKey": {id: "SALESORDERID", origin: null, type: "DTEL"},
+					"hotspotId": oFilterSingleFieldHelp.getId(),
+					"labelText": "Label for filter with single field help"
+				}, {
+					"backendHelpKey": {id: "FOO", origin: null, type: "DTEL"},
+					"hotspotId": oFilterMultipleFieldHelps.getId(),
+					"labelText": "Label for filter with multiple field helps"
+				}, {
+					"backendHelpKey": {id: "Bar", origin: "Origin", type: "DTEL"},
+					"hotspotId": oFilterMultipleFieldHelps.getId(),
+					"labelText": "Label for filter with multiple field helps"
+				}, { // documentation ref from OData annotation
+					"backendHelpKey": {id: "NOTE", origin: "MyOrigin", type: "DTEL"},
+					"hotspotId": oView.byId("Note").getId(),
+					"labelText": "Label for Note"
+				}, { // documentation ref from OData annotation - composite binding part 0
+					"backendHelpKey": {id: "GROSSAMOUNT", origin: null, type: "DTEL"},
+					"hotspotId": oView.byId("Amount0").getId(),
+					"labelText": "Label for both amount and currency"
+				}, { // documentation ref from OData annotation - composite binding part 1
+					"backendHelpKey": {id: "/FOO/CURRENCY", origin: null, type: "DTEL"},
+					"hotspotId": oView.byId("Amount0").getId(),
+					"labelText": "Label for both amount and currency"
+				}, { // documentation ref from OData annotation - composite binding showning only one part
+					"backendHelpKey": {id: "GROSSAMOUNT", origin: null, type: "DTEL"},
+					"hotspotId": oView.byId("Amount1").getId(),
+					"labelText": "Label for amount only"
+				}].sort(sortHotspots);
+
+				assert.deepEqual(aHotspots.sort(sortHotspots), aExpectedHotspots);
+				fnResolve();
+			});
+
+			// code under test
+			FieldHelp.getInstance().activate(oUtil.fnUpdateCallback);
+
+			// code under test - destroy a field with field help - async callback does not consider that control
+			oFilterDynamicallyDestroyed.destroy();
+
+			return Promise.all([oPromise, this.waitForChanges(assert, "Initial activation")]);
+		}).finally(() => {
+			FieldHelp.getInstance().deactivate();
+		});
+	});
 });