@openui5/sap.ui.core 1.124.2 → 1.126.0

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/mvc/testsuite.mvc.qunit.js

@@ -7,16 +7,21 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 			loader: {
 				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
 
-					// @deprecated as of 1.110
+					/**
+					 * @deprecated as of 1.110
+					 */
 					"testdata/mvc_legacyAPIs": "test-resources/sap/ui/core/qunit/mvc_legacyAPIs/testdata",
 					"example/mvc": "test-resources/sap/ui/core/qunit/mvc/testdata", // used by sync tests
 
-					// @deprecated as of 1.110
+					/**
+					 * @deprecated as of 1.110
+					 */
 					"example/mvc_legacyAPIs": "test-resources/sap/ui/core/qunit/mvc_legacyAPIs/testdata",
 					"sap/ui/testlib": "test-resources/sap/ui/core/qunit/testdata/uilib/" // used by sync tests
 				}

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

@@ -686,45 +686,38 @@ sap.ui.define([
 [{
 	description : "range w/o prefetch, no elements",
 	range : [0, 10, 0],
-	readRange : {start : 0, length : 10},
 	aElements : [],
 	intervals : [{start : 0, end : 10}]
 }, {
 	description : "range w/o prefetch, 1 element",
 	range : [0, 10, 0],
-	readRange : {start : 0, length : 10},
 	aElements : [{}],
 	intervals : [{start : 1, end : 10}]
 }, {
 	description : "range w/o prefetch, 1 element, limit = 1",
 	range : [0, 10, 0],
-	readRange : {start : 0, length : 10},
 	aElements : [{}],
 	limit : 1,
 	intervals : []
 }, {
 	description : "range w/o prefetch, 3 elements, limit 9, 2 gaps",
 	range : [0, 10, 0],
-	readRange : {start : 0, length : 10},
 	aElements : [{}, undefined, undefined, {}, undefined, {}],
 	limit : 9,
 	intervals : [{start : 1, end : 3}, {start : 4, end : 5}, {start : 6, end : 9}]
 }, {
 	description : "range w/ prefetch, no elements, left gap < prefetch",
 	range : [51, 10, 100],
-	readRange : {start : 0, length : 161},
 	aElements : [],
 	intervals : [{start : 0, end : 161}]
 }, {
 	description : "range w/ prefetch, no elements, left gap > prefetch",
 	range : [151, 10, 100],
-	readRange : {start : 51, length : 210},
 	aElements : [],
 	intervals : [{start : 51, end : 261}]
 }, {
 	description : "range w/ prefetch outside of limit, 3 elements, limit 111, 2 gaps",
 	range : [6, 10, 100],
-	readRange : {start : 0, length : 116},
 	aElements : [{}, undefined, undefined, {}, undefined, {}],
 	limit : 111,
 	intervals : [{start : 1, end : 3}, {start : 4, end : 5}, {start : 6, end : 111}]
@@ -735,7 +728,7 @@ sap.ui.define([
 		this.mock(ODataUtils).expects("_getReadRange")
 			.withExactArgs(sinon.match.same(oFixture.aElements), oFixture.range[0],
 				oFixture.range[1], oFixture.range[2])
-			.returns(oFixture.readRange);
+			.callThrough();
 
 		// code under test
 		aIntervals = ODataUtils._getReadIntervals(oFixture.aElements, oFixture.range[0],
@@ -770,11 +763,11 @@ sap.ui.define([
 }, { // missing a row at the end
 	current : [[0, 110]],
 	range : [51, 10, 100],
-	expected : {start : 51, length : 110}
+	expected : {start : 51, length : 159}
 }, { // missing a row before the start
 	current : [[100, 260]],
 	range : [149, 10, 100],
-	expected : {start : 49, length : 110}
+	expected : {start : 0, length : 159}
 }, { // missing a row before the start, do not read beyond 0
 	current : [[40, 200]],
 	range : [89, 10, 100],
@@ -785,7 +778,7 @@ sap.ui.define([
 }, { // missing data on both sides, do not read beyond 0
 	current : [[40, 100]],
 	range : [89, 10, 100],
-	expected : {start : 0, length : 199}
+	expected : {start : 0, length : 200}
 }, { // fetch all data
 	range : [0, 0, Infinity],
 	expected : {start : 0, length : Infinity}
@@ -799,7 +792,7 @@ sap.ui.define([
 }, { // odd prefetch length, prefetch before
 	current : [[25, 50]],
 	range : [27, 3, 5],
-	expected : {start : 22, length : 8}
+	expected : {start : 20, length : 10}
 }].forEach(function (oFixture) {
 	QUnit.test("_getReadRange: " + oFixture.range, function (assert) {
 		var aElements = [],

package/test/sap/ui/core/qunit/odata/type/testsuite.odata.types.qunit.js

@@ -13,6 +13,7 @@ sap.ui.define(function () {
 				version : "edge"
 			},
 			ui5 : {
+				libs: ["sap.ui.core"],
 				language : "en-US",
 				rtl : false,
 				"xx-waitForTheme" : true