@openui5/sap.ui.core 1.124.0 → 1.125.0

package/test/sap/ui/core/qunit/component/Models.qunit.js

@@ -1351,6 +1351,103 @@ sap.ui.define([
 		}.bind(this));
 	});
 
+	QUnit.test("metadata v4 with sap-system URL parameter", async function(assert) {
+		this.stubGetUriParameters({ sapSystem: "URL_123" });
+
+		this.oComponent = await Component.create({
+			name: "sap.ui.test.v4models.sapSystem"
+		});
+
+		this.assertModelInstances({
+			"v4-ODataModel": this.modelSpy.odataV4,
+			"v4-ODataModel-ServiceOrigin": this.modelSpy.odataV4,
+			"v4-ODataModel-OtherOrigins": this.modelSpy.odataV4
+		});
+
+		// model: "v4-ODataModel"
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service;o=URL_123/'
+		});
+
+		// model: "v4-ODataModel-ServiceOrigin" with a trailing slash and URL Parameters
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/trailing/slash;o=URL_123/?sap-client=foo&sap-server=bar',
+			annotationURI: [
+				'/path/to/odata/service/with/trailing/slash;o=URL_123/annotations.xml?sap-language=EN&sap-client=foo',
+				'test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+			],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// model: "v4-ODataModel-OtherOrigins" with multi origin annotations
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=URL_123/?sap-client=foo&sap-server=bar',
+			annotationURI: ["/path/to/other/odata/service;o=URL_123/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
+							"test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/other/odata/service;o=URL_123/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+							"/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/?sap-language=EN&sap-client=foo",
+							"/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo"
+							],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// destroy the component
+		this.oComponent.destroy();
+
+		// check if all models got destroyed (uses the models from #assertModelInstances)
+		this.assertModelsDestroyed();
+	});
+
+	QUnit.test("metadata v4 with sap-system startup parameter", async function(assert) {
+		this.stubGetUriParameters();
+
+		this.oComponent = await Component.create({
+			name: "sap.ui.test.v4models.sapSystem",
+			componentData: {
+				startupParameters: {
+					"sap-system": "STARTUP123"
+				}
+			}
+		});
+
+		this.assertModelInstances({
+			"v4-ODataModel": this.modelSpy.odataV4,
+			"v4-ODataModel-ServiceOrigin": this.modelSpy.odataV4,
+			"v4-ODataModel-OtherOrigins": this.modelSpy.odataV4
+		});
+
+		// model: "v4-ODataModel"
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service;o=STARTUP123/'
+		});
+
+		// model: "v4-ODataModel-ServiceOrigin" with a trailing slash and URL Parameters
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/trailing/slash;o=STARTUP123/?sap-client=foo&sap-server=bar',
+			annotationURI: [
+				'/path/to/odata/service/with/trailing/slash;o=STARTUP123/annotations.xml?sap-language=EN&sap-client=foo',
+				'test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+			],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// model: "v4-ODataModel-OtherOrigins" with multi origin annotations
+		sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+			serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=STARTUP123/?sap-client=foo&sap-server=bar',
+			annotationURI: ["/path/to/other/odata/service;o=STARTUP123/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
+							"test-resources/sap/ui/core/qunit/component/testdata/v4models/sapSystem/path/to/other/odata/service;o=STARTUP123/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+							"/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/?sap-language=EN&sap-client=foo",
+							"/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo"
+							],
+			metadataUrlParams: { "sap-language": "EN" }
+		});
+
+		// destroy the component
+		this.oComponent.destroy();
+
+		// check if all models got destroyed (uses the models from #assertModelInstances)
+		this.assertModelsDestroyed();
+	});
+
 	QUnit.test("metadata v2 with dataSources (extension inheritance)", function(assert) {
 		this.stubGetUriParameters();
 
@@ -1538,76 +1635,6 @@ sap.ui.define([
 		}.bind(this));
 	});
 
-	// TODO Should we move all v1 tests to unavoidablySync or should we keep it, since the test do not trigger CSP violations?
-	QUnit.test("metadata v1 with models", function(assert) {
-		this.stubGetUriParameters();
-
-		return Component.create({
-			name: "sap.ui.test.v1",
-			manifest: false
-		}).then(function(oComponent) {
-			this.oComponent = oComponent;
-
-			// sap.ui.model.resource.ResourceModel
-			sinon.assert.callCount(this.modelSpy.resource, 1);
-
-			// model: "i18n"
-			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v1/i18n/i18n.properties"
-			});
-
-			// check if models are set on component (and save them internally)
-			this.assertModelInstances({
-				"i18n": this.modelSpy.resource,
-				"sfapi": this.modelSpy.odataV2
-			});
-
-			// destroy the component
-			this.oComponent.destroy();
-
-			// check if all models got destroyed (uses the models from #assertModelInstances)
-			this.assertModelsDestroyed();
-
-			// check if internal models references were removed
-			assert.ok(!this.oComponent._mManifestModels, "Component should not have internal model references anymore");
-
-		}.bind(this));
-	});
-
-	QUnit.test("metadata v1 without models", function(assert) {
-
-		return Component.create({
-			name: "sap.ui.test.v1empty",
-			manifest: false
-		}).then(function(oComponent) {
-			this.oComponent = oComponent;
-
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			// sap.ui.model.odata.ODataModel
-			sinon.assert.callCount(this.modelSpy.odata, 0);
-
-			// sap.ui.model.odata.v2.ODataModel
-			sinon.assert.callCount(this.modelSpy.odataV2, 0);
-			// sap.ui.model.json.JSONModel
-			sinon.assert.callCount(this.modelSpy.json, 0);
-			// sap.ui.model.xml.XMLModel
-			sinon.assert.callCount(this.modelSpy.xml, 0);
-			// sap.ui.model.resource.ResourceModel
-			sinon.assert.callCount(this.modelSpy.resource, 0);
-			// sap.ui.test.v2models.CustomModel
-			sinon.assert.callCount(this.modelSpy.custom, 0);
-
-			assert.ok(!this.oComponent.getModel(), "Component should not have a model");
-			assert.deepEqual(this.oComponent._mManifestModels, {}, "Component should not have internal model references");
-
-			// destroy the component
-			this.oComponent.destroy();
-
-		}.bind(this));
-	});
-
 	QUnit.test("dynamic enhance of models and datasources", function(assert) {
 		this.stubGetUriParameters();
 

package/test/sap/ui/core/qunit/component/Models_unavoidablySync.qunit.js

@@ -60,6 +60,23 @@ sap.ui.define([
 				this.oConfigurationStub.restore();
 				this.oConfigurationStub = null;
 			}
+		},
+		assertModelInstances: function(mClasses) {
+			this.mModels = {};
+			for (var sName in mClasses) {
+				var oClass = mClasses[sName];
+				var oModel = this.oComponent.getModel(sName || undefined);
+				this.mModels[sName] = oModel;
+				QUnit.assert.ok(oModel instanceof oClass,
+					'Expected model "' + sName + '" to be an instance of ' + oClass.getMetadata().getName());
+			}
+		},
+		assertModelsDestroyed: function() {
+			for (var sName in this.mModels) {
+				var oModel = this.mModels[sName];
+				QUnit.assert.ok(oModel && oModel.bDestroyed,
+					'Expected model "' + sName + '" to be destroyed');
+			}
 		}
 	};
 	// Binds all the helper functions to the test instance
@@ -193,4 +210,73 @@ sap.ui.define([
 
 		fnAssert.call(this, assert);
 	});
+
+	QUnit.test("metadata v1 with models", function(assert) {
+		this.stubGetUriParameters();
+
+		return Component.create({
+			name: "sap.ui.test.v1",
+			manifest: false
+		}).then(function(oComponent) {
+			this.oComponent = oComponent;
+
+			// sap.ui.model.resource.ResourceModel
+			sinon.assert.callCount(this.modelSpy.resource, 1);
+
+			// model: "i18n"
+			sinon.assert.calledWithExactly(this.modelSpy.resource, {
+				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v1/i18n/i18n.properties"
+			});
+
+			// check if models are set on component (and save them internally)
+			this.assertModelInstances({
+				"i18n": this.modelSpy.resource,
+				"sfapi": this.modelSpy.odataV2
+			});
+
+			// destroy the component
+			this.oComponent.destroy();
+
+			// check if all models got destroyed (uses the models from #assertModelInstances)
+			this.assertModelsDestroyed();
+
+			// check if internal models references were removed
+			assert.ok(!this.oComponent._mManifestModels, "Component should not have internal model references anymore");
+
+		}.bind(this));
+	});
+
+	QUnit.test("metadata v1 without models", function(assert) {
+
+		return Component.create({
+			name: "sap.ui.test.v1empty",
+			manifest: false
+		}).then(function(oComponent) {
+			this.oComponent = oComponent;
+
+			/**
+			 * @deprecated As of version 1.48
+			 */
+			// sap.ui.model.odata.ODataModel
+			sinon.assert.callCount(this.modelSpy.odata, 0);
+
+			// sap.ui.model.odata.v2.ODataModel
+			sinon.assert.callCount(this.modelSpy.odataV2, 0);
+			// sap.ui.model.json.JSONModel
+			sinon.assert.callCount(this.modelSpy.json, 0);
+			// sap.ui.model.xml.XMLModel
+			sinon.assert.callCount(this.modelSpy.xml, 0);
+			// sap.ui.model.resource.ResourceModel
+			sinon.assert.callCount(this.modelSpy.resource, 0);
+			// sap.ui.test.v2models.CustomModel
+			sinon.assert.callCount(this.modelSpy.custom, 0);
+
+			assert.ok(!this.oComponent.getModel(), "Component should not have a model");
+			assert.deepEqual(this.oComponent._mManifestModels, {}, "Component should not have internal model references");
+
+			// destroy the component
+			this.oComponent.destroy();
+
+		}.bind(this));
+	});
 });

package/test/sap/ui/core/qunit/component/UIComponent.qunit.js

@@ -394,6 +394,18 @@ sap.ui.define([
 				}
 			};
 
+			const oManifestTypedViewAsString = {
+				"sap.ui5" : {
+					"rootView" : "module:my/own/TypedView"
+				}
+			};
+
+			const oManifestViewAsString = {
+				"sap.ui5" : {
+					"rootView" : "my.own.View"
+				}
+			};
+
 			var oManifestMissingViewType = {
 				"sap.app" : {
 					"id" : "my.own.missingViewType"
@@ -439,6 +451,8 @@ sap.ui.define([
 						!/^\/anylocation\/missingViewType\/manifest\.json/.test(url) &&
 						!/^\/anylocation\/missingViewTypeForTypedView\/manifest\.json/.test(url) &&
 						!/^\/anylocation\/prefixid\/manifest\.json/.test(url) &&
+						!/^\/anylocation\/typedViewAsString\/manifest\.json/.test(url) &&
+						!/^\/anylocation\/viewAsString\/manifest\.json/.test(url) &&
 						!/^\/anylocation\/mf1st\/autoid\/manifest\.json/.test(url) &&
 						!/^\/anylocation\/mf1st\/prefixid\/manifest\.json/.test(url) &&
 						!/\/test-resources\/sap\/ui\/core\/qunit\/component\/testdata\/view\/manifest\.json/.test(url) &&
@@ -468,6 +482,20 @@ sap.ui.define([
 				},
 				JSON.stringify(oManifestMissingViewType)
 			]);
+			oServer.respondWith("GET", /^\/anylocation\/typedViewAsString\/manifest\.json/, [
+				200,
+				{
+					"Content-Type": "application/json"
+				},
+				JSON.stringify(oManifestTypedViewAsString)
+			]);
+			oServer.respondWith("GET", /^\/anylocation\/viewAsString\/manifest\.json/, [
+				200,
+				{
+					"Content-Type": "application/json"
+				},
+				JSON.stringify(oManifestViewAsString)
+			]);
 			oServer.respondWith("GET", /^\/anylocation\/missingViewTypeForTypedView\/manifest\.json/, [
 				200,
 				{
@@ -553,7 +581,30 @@ sap.ui.define([
 				});
 
 			});
+			sap.ui.define("my/own/typedViewAsString/Component", ["sap/ui/core/UIComponent"], function(UIComponent) {
+
+				return UIComponent.extend("my.own.typedViewAsString.Component", {
+					metadata: {
+						manifest: "json",
+						interfaces: [
+							"sap.ui.core.IAsyncContentCreation"
+						]
+					}
+				});
+
+			});
+			sap.ui.define("my/own/viewAsString/Component", ["sap/ui/core/UIComponent"], function(UIComponent) {
+
+				return UIComponent.extend("my.own.viewAsString.Component", {
+					metadata: {
+						manifest: "json",
+						interfaces: [
+							"sap.ui.core.IAsyncContentCreation"
+						]
+					}
+				});
 
+			});
 			sap.ui.define("error/test/Component", ["sap/ui/core/UIComponent"], function(UIComponent) {
 
 				return UIComponent.extend("error.test.Component", {
@@ -717,6 +768,40 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.test("UIComponent (IAsyncContentCreation) check when rootView is set with string and the defaulting of view type", function(assert) {
+		assert.expect(2);
+
+		const oCreateSpy = this.spy(View, "create");
+
+		return Component.create({
+			name: "my.own.viewAsString"
+		}).then(function(oComponent) {
+			// a missing type in the root-view definition should be defaulted to XML
+			assert.ok(oComponent.getRootControl().isA("sap.ui.core.mvc.XMLView"));
+			assert.equal(oCreateSpy.callCount, 1, "Modern view factory View.create is called");
+			oComponent.destroy();
+		}, function() {
+			assert.ok(false, "Error handler must not be called");
+		});
+	});
+
+	QUnit.test("UIComponent (IAsyncContentCreation) check when rootView is set with string and it's a typed view", function(assert) {
+		assert.expect(2);
+
+		const oCreateSpy = this.spy(View, "create");
+
+		return Component.create({
+			name: "my.own.typedViewAsString"
+		}).then(function(oComponent) {
+			// root control must be of the typed view class
+			assert.ok(oComponent.getRootControl().isA("my.own.TypedView"));
+			assert.equal(oCreateSpy.callCount, 1, "Modern view factory View.create is called");
+			oComponent.destroy();
+		}, function() {
+			assert.ok(false, "Error handler must not be called");
+		});
+	});
+
 	QUnit.test("UIComponent check NO-defaulting of root-view type if root-view is a typed view", function(assert) {
 		assert.expect(2);
 
@@ -1658,7 +1743,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Nested component - no duplicate ID issue expected", function(assert) {
-		assert.expect(3);
+		assert.expect(4);
 		var oManifest = {
 			"sap.app" : {
 				"id" : "app"

package/test/sap/ui/core/qunit/component/testdata/customizing/customer/ext/EP_In_Product_Table_Cell_Found.fragment.xml

@@ -0,0 +1,5 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core">
+	<Input id="Input_From_EP" value="Input from EP Fragment: EP_In_Product_Table_Cell_Found.fragment.xml" />
+</core:FragmentDefinition>

package/test/sap/ui/core/qunit/component/testdata/customizing/customer/ext/EP_In_Product_Table_Column.fragment.xml

@@ -0,0 +1,5 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core">
+	<Text text="Table Header Text from EP Fragment: EP_In_Product_Table_Column.fragment.xml" />
+</core:FragmentDefinition>

package/test/sap/ui/core/qunit/component/testdata/customizing/customer/ext/EPinNestedView.view.xml

@@ -0,0 +1,51 @@
+<mvc:View
+	xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc">
+	<Table id="product_table">
+		<columns>
+			<!--
+				The following two EPs are the same,
+				the Fragment behind it must be created twice -->
+			<Column id="column_0">
+				<header>
+					<core:ExtensionPoint name="EP_In_Product_Table_Column"/>
+				</header>
+			</Column>
+			<Column id="column_1">
+				<header>
+					<core:ExtensionPoint name="EP_In_Product_Table_Column"/>
+				</header>
+			</Column>
+		</columns>
+		<items>
+			<ColumnListItem id="list_item_0">
+				<cells>
+					<!--
+						Test-scenario with an active provider:
+						  * Default content must be created
+						Test-scenario _without_ an active provider:
+						  * Default content must be created
+					-->
+					<core:ExtensionPoint name="EP_In_Product_Table_Cell_Not_Found">
+						<Button id="TableRowButton" xmlns="sap.m" text="Table row Button from EP's default content must be created" />
+					</core:ExtensionPoint>
+				</cells>
+			</ColumnListItem>
+			<ColumnListItem id="list_item_1">
+				<cells>
+					<!--
+						Test-scenario with an active provider:
+						  * default content must _not_ be created
+						Test-scenario _without_ an active provider:
+						  * Default content must be created
+					-->
+					<core:ExtensionPoint name="EP_In_Product_Table_Cell_Found">
+						<Button id="TableRowButton2" xmlns="sap.m" text="Table row Button from EP's default content must not be created" />
+					</core:ExtensionPoint>
+				</cells>
+			</ColumnListItem>
+		</items>
+	</Table>
+	<core:ExtensionPoint name="EP_in_Panel">
+		<Button id="PanelButton" xmlns="sap.m" text="Panel Button from EP" />
+	</core:ExtensionPoint>
+</mvc:View>

package/test/sap/ui/core/qunit/component/testdata/customizing/customer/ext/ExtensionPointProvider.js

@@ -43,12 +43,23 @@ sap.ui.define(['sap/ui/core/Fragment'],
 				}
 			};
 			var fnInsert = function(aControls) {
-				aControls.forEach(function(oControl, i) {
-				   oExtensionPoint.targetControl.insertAggregation(oExtensionPoint.aggregationName, oControl, oExtensionPoint.index + i);
-				});
+				const oAggregationInfo = oExtensionPoint.targetControl.getMetadata().getAggregation(oExtensionPoint.aggregationName);
+
+				// 0..1 Aggregations ("multiple: false") must be set via setAggregation()
+				// 0..n Aggergations must be changed with insertAggregation
+				if (oAggregationInfo.multiple) {
+					aControls.forEach(function(oControl, i) {
+						oExtensionPoint.targetControl.insertAggregation(oExtensionPoint.aggregationName, oControl, oExtensionPoint.index + i);
+					});
+				} else {
+					if (aControls.length > 1) {
+						throw new Error("Your test tries to add multiple Controls to an aggregation marked as 'multiple: false'.");
+					}
+					oExtensionPoint.targetControl.setAggregation(oExtensionPoint.aggregationName, aControls[0]);
+				}
 			};
 
-			if (["EP1", "EP99"].indexOf(oExtensionPoint.name) >= 0) {
+			if (["EP1", "EP99", "EP_In_Product_Table_Column", "EP_In_Product_Table_Cell_Found"].indexOf(oExtensionPoint.name) >= 0) {
 
 				if (oExtensionPoint.name == "EP1") {
 					pLoaded =  Fragment.load({
@@ -60,6 +71,18 @@ sap.ui.define(['sap/ui/core/Fragment'],
 						id: oExtensionPoint.view.createId("ep99"),
 						name: "testdata.customizing.customer.ext.EP99"
 					});
+				} else if (oExtensionPoint.name === "EP_In_Product_Table_Column") {
+					// resolves to a sap.m.Text control for the sap.m.Column's header aggregation
+					pLoaded = Fragment.load({
+						id: oExtensionPoint.view.createId("column_header_fragment"),
+						name: "testdata.customizing.customer.ext.EP_In_Product_Table_Column"
+					});
+				} else if (oExtensionPoint.name === "EP_In_Product_Table_Cell_Found") {
+					pLoaded =
+						Fragment.load({
+							id: oExtensionPoint.view.createId("column_list_item_fragment"),
+							name: "testdata.customizing.customer.ext.EP_In_Product_Table_Cell_Found"
+						});
 				}
 
 				/**

package/test/sap/ui/core/qunit/component/testdata/customizing/customer/ext/Main.view.xml

@@ -79,6 +79,11 @@
 		</ColumnListItem>
 	</core:ExtensionPoint>
 
+	<!-- Nested View in the middle -->
+	<Panel id="Panel_With_Nested_View">
+		<mvc:XMLView id="EPs_In_Nested_View" async="true" viewName="testdata.customizing.customer.ext.EPinNestedView" />
+	</Panel>
+
 	<!-- EP contains EP -->
 	<core:ExtensionPoint name="EPinEPRoot">
 		<Button id="ButtonInRootEP"></Button>

package/test/sap/ui/core/qunit/component/testdata/customizing/sap/Main.view.xml

@@ -14,7 +14,6 @@
 		<core:Fragment fragmentName="testdata.customizing.sap.Frag1" type="XML" />
 		<core:Fragment id="frag1" fragmentName="testdata.customizing.sap.Frag1" type="XML" />
 
-		<html:h2>JSView Extension Tests start below:</html:h2>
 		<mvc:View viewName="module:testdata/customizing/sap/Sub4Typed" />
 
 		<mvc:XMLView id="sub6View" viewName="testdata.customizing.sap.Sub6" />

package/test/sap/ui/core/qunit/component/testdata/customizing/sap/Sub2.view.xml

@@ -11,9 +11,7 @@
 
 
 	<Panel id="panel">
-		<html:div id="htmlDiv">
-			<core:ExtensionPoint name="extension21" />
-		</html:div>
+		<core:ExtensionPoint name="extension21" />
 	</Panel>
 
 	<core:ExtensionPoint name="extension3" />

package/test/sap/ui/core/qunit/component/testdata/v4models/sapSystem/Component.js

@@ -0,0 +1,16 @@
+/*
+ * ${copyright}
+ */
+
+// Provides class sap.ui.test.v4models.sapSystem.Component
+sap.ui.define(["sap/ui/core/UIComponent"], function(UIComponent) {
+	"use strict";
+
+	return UIComponent.extend("sap.ui.test.v4models.sapSystem.Component", {
+		interfaces: ["sap.ui.core.IAsyncContentCreation"],
+		metadata: {
+			manifest: "json"
+		}
+	});
+
+});

package/test/sap/ui/core/qunit/component/testdata/v4models/sapSystem/manifest.json

@@ -0,0 +1,102 @@
+{
+
+	"_version": "1.0.0",
+
+	"sap.app": {
+		"_version": "1.0.0",
+		"id": "sap.ui.test.v4models.sapSystem",
+		"type": "application",
+		"applicationVersion": {
+			"version": "1.0.0"
+		},
+		"i18n": "i18n.properties",
+		"title": "{{title}}",
+		"description": "{{description}}",
+		"dataSources": {
+
+			"dataSourceODataV4": {
+				"uri": "/path/to/odata/service/with/trailing/slash/",
+				"type": "OData",
+				"settings": {
+					"annotations": ["originAnnotations", "annotations2"]
+				}
+			},
+
+			"originAnnotations" : {
+				"uri": "/path/to/odata/service/with/trailing/slash/annotations.xml",
+				"type": "ODataAnnotation"
+			},
+
+			"annotations2": {
+				"uri": "path/to/local/odata/annotations/2",
+				"type": "ODataAnnotation"
+			},
+
+
+
+			"ODataWithMultiOriginAnnotations": {
+				"uri": "/path/to/odata/service/with/multi/origin/annotations/",
+				"type": "OData",
+				"settings": {
+					"annotations": ["annotationWithOtherOrigin1", "annotationWithOtherOrigin2", "annotationWithOtherOrigin3", "annotationWithOtherOrigin4"]
+				}
+			},
+
+			"annotationWithOtherOrigin1": {
+				"uri": "/path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin2": {
+				"uri": "path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin3": {
+				"uri": "/path/to/other/odata/service/other2/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/",
+				"type":"ODataAnnotation"
+			},
+
+			"annotationWithOtherOrigin4": {
+				"uri": "/path/to/other3/odata/service/;o=sid(G1Y.400)/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value",
+				"type":"ODataAnnotation"
+			}
+		}
+	},
+
+	"sap.ui": {
+		"_version": "1.0.0",
+		"technology": "UI5"
+	},
+
+	"sap.ui5": {
+
+		"dependencies": {
+			"minUI5Version": "1.120.0",
+			"libs": {
+				"sap.ui.core": {
+					"minVersion": "1.120.0"
+				}
+			}
+		},
+
+		"models": {
+			"v4-ODataModel": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"settings": {
+					"serviceUrl": "/path/to/odata/service/"
+				}
+			},
+
+			"v4-ODataModel-ServiceOrigin": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"dataSource": "dataSourceODataV4"
+			},
+
+			"v4-ODataModel-OtherOrigins": {
+				"type": "sap.ui.model.odata.v4.ODataModel",
+				"dataSource": "ODataWithMultiOriginAnnotations"
+			}
+		}
+	}
+}