@openui5/sap.ui.core 1.123.1 → 1.124.1

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

@@ -1,5 +1,6 @@
 sap.ui.define([
 	"sap/base/config",
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/base/i18n/Localization",
 	"sap/base/i18n/ResourceBundle",
@@ -11,6 +12,7 @@ sap.ui.define([
 	"sap/ui/core/UIComponentMetadata"
 ], function(
 	BaseConfig,
+	future,
 	Log,
 	Localization,
 	ResourceBundle,
@@ -272,7 +274,11 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("metadata v2 with dataSources", function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("metadata v2 with dataSources (future=false)", function(assert) {
+		future.active = false;
 		this.stubGetUriParameters();
 
 		return Component.create({
@@ -495,30 +501,557 @@ sap.ui.define([
 			// check if internal models references were removed
 			assert.ok(!this.oComponent._mManifestModels, "Component should not have internal model references anymore");
 
+			future.active = undefined;
 		}.bind(this));
 	});
 
+	QUnit.test("metadata v2 with dataSources (future=true)", function (assert) {
+		future.active = true;
+		this.stubGetUriParameters();
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parentValid",
+			manifest: false
+		}).then(function (oComponent) {
+
+			this.oComponent = oComponent;
+
+			// sap.ui.model.odata.v2.ODataModel
+			sinon.assert.callCount(this.modelSpy.odataV2, 7);
+
+			// model: "default-with-annotations"
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/default/datasource?sap-client=foo&sap-server=bar',
+				annotationURI: [
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo',
+					'/path/to/odata/annotations/1?sap-language=EN&sap-client=foo'
+				],
+				headers: { "Cache-Control": "max-age=500" },
+				metadataUrlParams: { "sap-language": "EN" }
+			});
+
+			// model: "old-uri-syntax"
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/odata/service'
+			});
+
+			// model: ""
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/default/datasource?sap-client=foo&sap-server=bar',
+				metadataUrlParams: { "sap-language": "EN" }
+			});
+
+			// model: "v2-ODataModel"
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/odata/service',
+				useBatch: true,
+				refreshAfterChange: true
+			});
+
+			// model: "v2-ODataModel" with multi origin annotations
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/odata/service/with/multi/origin/annotations/?sap-client=foo&sap-server=bar',
+				annotationURI: ["/path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
+					"test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/other/odata/service/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" }
+			});
+
+			// model: "v2-ODataModel-SAPClient" with SAP client
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
+				serviceUrl: '/path/to/odata/service/with/sapclient/?sap-client=100&sap-server=bar',
+				annotationURI: ['/path/to/odata/annotations/with/sapclient/?sap-client=200&sap-language=EN'],
+				metadataUrlParams: { "sap-language": "EN" }
+			});
+
+			// sap.ui.model.odata.v4.ODataModel
+			sinon.assert.callCount(this.modelSpy.odataV4, 1);
+
+			// model: "default-with-annotations"
+			sinon.assert.calledWithExactly(this.modelSpy.odataV4, {
+				odataVersion: "4.0",
+				serviceUrl: '/path/to/odata/service/?sap-client=foo&sap-server=bar',
+				metadataUrlParams: { "sap-language": "EN" }
+			});
+
+
+			// sap.ui.model.json.JSONModel
+			sinon.assert.callCount(this.modelSpy.json, 3);
+
+			// model: "json"
+			sinon.assert.calledWithExactly(this.modelSpy.json, '/path/to/data.json?sap-client=foo&sap-server=bar');
+
+			// model: "json-relative"
+			sinon.assert.calledWithExactly(this.modelSpy.json, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/data.json?sap-client=foo&sap-server=bar');
+
+			// model: "json-relative-2"
+			sinon.assert.calledWithExactly(this.modelSpy.json, 'test-resources/sap/ui/core/qunit/component/testdata/path/to/other/data.json?sap-client=foo&sap-server=bar');
+
+
+			// sap.ui.model.xml.XMLModel
+			sinon.assert.callCount(this.modelSpy.xml, 2);
+
+			// model: "xml"
+			sinon.assert.calledWithExactly(this.modelSpy.xml, '/path/to/data.xml?sap-client=foo&sap-server=bar');
+
+			// model: "xml-relative"
+			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/data.xml?sap-client=foo&sap-server=bar');
+
+
+			// sap.ui.model.resource.ResourceModel
+			sinon.assert.callCount(this.modelSpy.resource, 2);
+
+			// model: "resourceBundle-name"
+			sinon.assert.calledWithExactly(this.modelSpy.resource, {
+				bundleName: "sap.ui.test.v2models.parent.i18n"
+			});
+
+			// model: "resourceBundle-legacy-uri"
+			sinon.assert.calledWithExactly(this.modelSpy.resource, {
+				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/i18n.properties"
+			});
+
+
+			// sap.ui.test.v2models.parent.CustomModel
+			sinon.assert.callCount(this.modelSpy.custom, 7);
+
+			// model: "custom-uri-string"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar');
+
+			// model: "custom-uri-relative-string"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/custom.datatype?sap-client=foo&sap-server=bar');
+
+			// model: "custom-uri-string-with-settings"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar', {
+				foo: 'bar'
+			});
+
+			// model: "custom-without-args"
+			sinon.assert.calledWithExactly(this.modelSpy.custom);
+
+			// model: "custom-uri-setting-name"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, {
+				myUri: '/path/to/custom.datatype?sap-client=foo&sap-server=bar'
+			});
+
+			// model: "custom-uri-setting-merge"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, {
+				uri: '/path/to/custom.datatype?sap-client=foo&sap-server=bar',
+				foo: 'bar'
+			});
+
+			// model: "custom-uri-setting-already-defined"
+			sinon.assert.calledWithExactly(this.modelSpy.custom, {
+				uri: 'foo'
+			});
+
+			// check if models are set on component (and save them internally)
+			this.assertModelInstances({
+				"": this.modelSpy.odataV2,
+				"default-with-annotations": this.modelSpy.odataV2,
+				"old-uri-syntax": this.modelSpy.odataV2,
+				"v2-ODataModel": this.modelSpy.odataV2,
+				"v2-ODataModel-OtherOrigins": this.modelSpy.odataV2,
+				"ODataV4Model": this.modelSpy.odataV4,
+				"json": this.modelSpy.json,
+				"json-relative": this.modelSpy.json,
+				"json-relative-2": this.modelSpy.json,
+				"xml": this.modelSpy.xml,
+				"xml-relative": this.modelSpy.xml,
+				"resourceBundle-name": this.modelSpy.resource,
+				"resourceBundle-legacy-uri": this.modelSpy.resource,
+				"custom-uri-string": this.modelSpy.custom,
+				"custom-relative-uri-string": this.modelSpy.custom,
+				"custom-uri-string-with-settings": this.modelSpy.custom,
+				"custom-without-args": this.modelSpy.custom,
+				"custom-uri-setting-name": this.modelSpy.custom,
+				"custom-uri-setting-merge": this.modelSpy.custom,
+				"custom-uri-setting-already-defined": this.modelSpy.custom
+			});
+
+			// 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");
+
+			future.active = undefined;
+		}.bind(this));
+	});
+
+	QUnit.test("metadata v2 with dataSources - Invalid ODataAnnotation (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					},
+					"odata-invalid-annotations": {
+						"type": "OData",
+						"uri": "/path/to/odata/service",
+						"settings": {
+							"annotations": [ "undefined", "annotations1", "annotation-without-uri", "json" ]
+						}
+					}
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"invalid-annotations": {
+						"dataSource": "odata-invalid-annotations"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Component Manifest: ODataAnnotation "undefined" for dataSource "odata-invalid-annotations" could not be found in manifest`),
+				"Error thrown because of invalid odata annotations.");
+
+			future.active = undefined;
+		});
+	});
+
+	QUnit.test("metadata v2 with dataSources - Invalid dataSource (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					},
+					"invalid": true
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"dataSource-invalid": {
+						"type": "sap.ui.model.odata.v2.ODataModel",
+						"dataSource": "invalid"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Component Manifest: dataSource "invalid" for model "dataSource-invalid" not found or invalid`),
+				"Error thrown because invalid dataSource defined.");
+
+			future.active = undefined;
+		});
+	});
+
+	QUnit.test("metadata v2 with dataSources - dataSource not found (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					}
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"dataSource-not-found": {
+						"type": "sap.ui.model.odata.v2.ODataModel",
+						"dataSource": "does-not-exist"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Component Manifest: dataSource "does-not-exist" for model "dataSource-not-found" not found or invalid`),
+				"Error thrown because dataSource not found.");
+
+			future.active = undefined;
+		});
+	});
+
+	QUnit.test("metadata v2 with dataSources - Model not found (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					}
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"model-not-found": {
+						"type": "sap.ui.test.v2models.parent.ModelNotDefined"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Component Manifest: Class "sap.ui.test.v2models.parent.ModelNotDefined" for model "model-not-found" could not be found`),
+				"Error thrown because model is not found.");
+
+			future.active = undefined;
+		});
+
+	});
+	QUnit.test("metadata v2 with dataSources - Missing model class (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					}
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"missing-model-class": {
+						"type": "sap.ui.not.defined.Model"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Cannot load module 'sap/ui/not/defined/Model'.`),
+				"Error thrown because defined model class is not found.");
+
+			future.active = undefined;
+		});
+
+	});
+
+	QUnit.test("metadata v2 with dataSources - unknown-odataVersion (future=true)", function(assert) {
+		future.active = true;
+
+		const oManifestJson = {
+			"_version": "1.0.0",
+
+			"sap.app": {
+				"_version": "1.0.0",
+				"id": "sap.ui.test.v2models.parent1",
+				"type": "application",
+				"applicationVersion": {
+					"version": "1.0.0"
+				},
+				"i18n": "i18n.properties",
+				"title": "{{title}}",
+				"description": "{{description}}",
+				"dataSources": {
+					"default": {
+						"uri": "/path/to/default/datasource"
+					},
+
+					"unknown-odataVersion": {
+						"uri": "/path/to/unknown/odataVersion",
+						"settings": {
+							"odataVersion": "3.0"
+						}
+					},
+					"invalid": true
+				}
+			},
+			"sap.ui": {
+				"_version": "1.0.0",
+				"technology": "UI5"
+			},
+			"sap.ui5": {
+				"_version": "1.0.0",
+				"dependencies": {
+					"minUI5Version": "1.28.0",
+					"libs": {
+						"sap.ui.core": {
+							"minVersion": "1.28.0"
+						}
+					}
+				},
+				"models": {
+					"": "default",
+					"v2-ODataModel-unknown-odataVersion": {
+						"dataSource": "unknown-odataVersion"
+					},
+					"dataSource-invalid": {
+						"type": "sap.ui.model.odata.v2.ODataModel",
+						"dataSource": "invalid"
+					}
+				}
+			}
+		};
+
+		return Component.create({
+			name: "sap.ui.test.v2models.parent",
+			manifest: oManifestJson
+		}).catch((error) => {
+			assert.ok(error.message.includes(`Component Manifest: Provided OData version "3.0" in dataSource "unknown-odataVersion" for model "v2-ODataModel-unknown-odataVersion" is unknown.`),
+				"Error thrown because unknown dataSource defined in Component Manifest.");
+
+			future.active = undefined;
+		});
+	});
+
 	QUnit.test("metadata v2 with sap-system URL parameter", function(assert) {
 		this.stubGetUriParameters({ sapSystem: "BLA_123" });
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "sap.ui.test.v2models.parentValid",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service;o=BLA_123?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2'],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
 			// model: "v2-ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service;o=BLA_123',
@@ -531,7 +1064,7 @@ sap.ui.define([
 				serviceUrl: '/path/to/odata/service/with/trailing/slash;o=BLA_123/?sap-client=foo&sap-server=bar',
 				annotationURI: [
 					'/path/to/odata/service/with/trailing/slash;o=BLA_123/annotations.xml?sap-language=EN&sap-client=foo',
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
 				],
 				useBatch: true,
 				refreshAfterChange: true,
@@ -542,7 +1075,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=BLA_123/?sap-client=foo&sap-server=bar',
 				annotationURI: ["/path/to/other/odata/service;o=BLA_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/v2models/parent/path/to/other/odata/service;o=BLA_123/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/other/odata/service;o=BLA_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"
 												],
@@ -575,7 +1108,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "sap.ui.test.v2models.parentValid",
 			manifest: false,
 			componentData: {
 				startupParameters: {
@@ -585,18 +1118,6 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service;o=STARTUP456?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2'],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
 			// model: "v2-ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service;o=STARTUP456',
@@ -609,7 +1130,7 @@ sap.ui.define([
 				serviceUrl: '/path/to/odata/service/with/trailing/slash;o=STARTUP456/?sap-client=foo&sap-server=bar',
 				annotationURI: [
 					'/path/to/odata/service/with/trailing/slash;o=STARTUP456/annotations.xml?sap-language=EN&sap-client=foo',
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo'
 				],
 				useBatch: true,
 				refreshAfterChange: true,
@@ -620,7 +1141,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service/with/multi/origin/annotations;o=STARTUP456/?sap-client=foo&sap-server=bar',
 				annotationURI: ["/path/to/other/odata/service;o=STARTUP456/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
-												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/other/odata/service;o=STARTUP456/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/other/odata/service;o=STARTUP456/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"
 												],
@@ -652,7 +1173,7 @@ sap.ui.define([
 	QUnit.test("metadata v2 with cacheTokens", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "sap.ui.test.v2models.parentValid",
 			manifest: false,
 			asyncHints: {
 				cacheTokens: {
@@ -668,19 +1189,6 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			// V1 ODataModel should not be affected by cache tokens
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2'],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
 			// Model without "dataSource" reference should not be affected by cache tokens
 			// model: "v2-ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
@@ -697,14 +1205,14 @@ sap.ui.define([
 				},
 				annotationURI: [
 					'/path/to/odata/service/with/trailing/slash/annotations.xml?sap-language=EN',
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN'
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN'
 				],
 				useBatch: true,
 				refreshAfterChange: true
 			});
 
 			// model: "v2-ODataModel-SAPClient" with SAP client
-			sinon.assert.calledWithExactly(this.modelSpy.odataV2.getCall(7), {
+			sinon.assert.calledWithExactly(this.modelSpy.odataV2.getCall(6), {
 				serviceUrl: '/path/to/odata/service/with/sapclient/?sap-client=100',
 				annotationURI: [ '/path/to/odata/annotations/with/sapclient/?sap-client=200&sap-language=EN' ],
 				metadataUrlParams: { 'sap-language': 'EN' }
@@ -736,7 +1244,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "sap.ui.test.v2models.parentValid",
 			manifest: false,
 			asyncHints: {
 				cacheTokens: {
@@ -751,22 +1259,6 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			// V1 ODataModel should not be affected by cache tokens
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [
-					'/path/to/odata/annotations/1',
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2'
-				],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
 			// Model without "dataSource" reference should not be affected by cache tokens
 			// model: "v2-ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
@@ -784,7 +1276,7 @@ sap.ui.define([
 				},
 				annotationURI: [
 					'/path/to/odata/service/with/trailing/slash/annotations.xml?sap-language=EN&sap-client=foo&sap-context-token=1476971136',
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo&sap-context-token=1476971160'
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo&sap-context-token=1476971160'
 				],
 				useBatch: true,
 				refreshAfterChange: true
@@ -859,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();
 
@@ -868,33 +1457,14 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			if ( this.modelSpy.odata ) {
-				// sap.ui.model.odata.ODataModel
-				sinon.assert.callCount(this.modelSpy.odata, 1);
-
-				// model: "ODataModel"
-				sinon.assert.calledWithExactly(this.modelSpy.odata, {
-					serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-					annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
-					useBatch: true,
-					skipMetadataAnnotationParsing: true,
-					refreshAfterChange: false,
-					json: true
-				});
-			}
-
-
 			// sap.ui.model.odata.v2.ODataModel
-			sinon.assert.callCount(this.modelSpy.odataV2, 9);
+			sinon.assert.callCount(this.modelSpy.odataV2, 7);
 
 			// model: "default-with-annotations"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/default/datasource?sap-client=foo&sap-server=bar',
 				annotationURI: [
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo',
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo',
 					'/path/to/odata/annotations/1?sap-language=EN&sap-client=foo',
 					'test-resources/sap/ui/core/qunit/component/testdata/v2models/extension/path/to/local/extension/annotation?sap-language=EN&sap-client=foo'
 				],
@@ -917,33 +1487,21 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service',
 				useBatch: true,
-				refreshAfterChange: true
-			});
-
-			// model: "invalid-annotations"
-			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1?sap-language=EN&sap-client=foo' ],
-				metadataUrlParams: { "sap-language": "EN" }
+				refreshAfterChange: true,
+				skipMetadataAnnotationParsing: true
 			});
 
 			// model: "v2-ODataModel" with multi origin annotations
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service/with/multi/origin/annotations/?sap-client=foo&sap-server=bar',
 				annotationURI: ["/path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
-												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/other/odata/service/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/other/odata/service/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" }
 			});
 
-			// model: "v2-ODataModel-unknown-odataVersion"
-			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
-				serviceUrl: '/path/to/unknown/odataVersion?sap-client=foo&sap-server=bar',
-				metadataUrlParams: { "sap-language": "EN" }
-			});
-
 			// sap.ui.model.json.JSONModel
 			sinon.assert.callCount(this.modelSpy.json, 3);
 
@@ -964,7 +1522,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.xml, '/path/to/data.xml?sap-client=foo&sap-server=bar');
 
 			// model: "xml-relative"
-			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/data.xml?sap-client=foo&sap-server=bar');
+			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/data.xml?sap-client=foo&sap-server=bar');
 
 			// model: "xml-extension"
 			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/extension/path/to/local/data.xml?sap-client=foo&sap-server=bar');
@@ -980,10 +1538,9 @@ sap.ui.define([
 
 			// model: "resourceBundle-legacy-uri"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/i18n.properties"
+				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/i18n.properties"
 			});
 
-
 			// sap.ui.test.v2models.parent.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 7);
 
@@ -991,7 +1548,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar');
 
 			// model: "custom-uri-relative-string"
-			sinon.assert.calledWithExactly(this.modelSpy.custom, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/custom.datatype?sap-client=foo&sap-server=bar');
+			sinon.assert.calledWithExactly(this.modelSpy.custom, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/custom.datatype?sap-client=foo&sap-server=bar');
 
 			// model: "custom-uri-string-with-settings"
 			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar', {
@@ -1017,29 +1574,12 @@ sap.ui.define([
 				uri: 'foo'
 			});
 
-			// Log.error
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\"./), "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
-
-
 			// check if models are set on component (and save them internally)
 			this.assertModelInstances({
 				"": this.modelSpy.odataV2,
 				"default-with-annotations": this.modelSpy.odataV2,
 				"old-uri-syntax": this.modelSpy.odataV2,
-				/**
-				 * @deprecated As of version 1.48
-				 */
-				"ODataModel": this.modelSpy.odata,
 				"v2-ODataModel": this.modelSpy.odataV2,
-				"invalid-annotations": this.modelSpy.odataV2,
 				"json": this.modelSpy.json,
 				"json-relative": this.modelSpy.json,
 				"json-relative-2": this.modelSpy.json,
@@ -1075,12 +1615,6 @@ sap.ui.define([
 		}).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
@@ -1111,21 +1645,6 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			if ( this.modelSpy.odata ) {
-				// sap.ui.model.odata.ODataModel
-				sinon.assert.callCount(this.modelSpy.odata, 1);
-
-				// model: "sfapi"
-				sinon.assert.calledWithExactly(this.modelSpy.odata, {
-					serviceUrl: 'test-resources/sap/ui/core/qunit/component/testdata/v1/some/odata/service',
-					json: true
-				});
-			}
-
-
 			// sap.ui.model.resource.ResourceModel
 			sinon.assert.callCount(this.modelSpy.resource, 1);
 
@@ -1137,10 +1656,7 @@ sap.ui.define([
 			// check if models are set on component (and save them internally)
 			this.assertModelInstances({
 				"i18n": this.modelSpy.resource,
-				/**
-				 * @deprecated As of version 1.48
-				 */
-				"sfapi": this.modelSpy.odata
+				"sfapi": this.modelSpy.odataV2
 			});
 
 			// destroy the component
@@ -1391,31 +1907,14 @@ sap.ui.define([
 			noSyncTest_afterEach.call(this, assert);
 		},
 		assertAll: function(assert) {
-			/**
-			 * @deprecated As of version 1.48
-			 */
-			if ( this.modelSpy.odata ) {
-				// sap.ui.model.odata.ODataModel
-				sinon.assert.callCount(this.modelSpy.odata, 1);
-
-				// model: "ODataModel"
-				sinon.assert.calledWithExactly(this.modelSpy.odata, {
-					serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-					annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
-					useBatch: false,
-					refreshAfterChange: false,
-					json: true
-				});
-			}
-
 			// sap.ui.model.odata.v2.ODataModel
-			sinon.assert.callCount(this.modelSpy.odataV2, 9);
+			sinon.assert.callCount(this.modelSpy.odataV2, 7);
 
 			// model: "default-with-annotations"
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/default/datasource?sap-client=foo&sap-server=bar',
 				annotationURI: [
-					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo',
+					'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/odata/annotations/2?sap-language=EN&sap-client=foo',
 					'/path/to/odata/annotations/1?sap-language=EN&sap-client=foo'
 				],
 				headers: { "Cache-Control": "max-age=500" },
@@ -1440,31 +1939,17 @@ sap.ui.define([
 				refreshAfterChange: true
 			});
 
-			// model: "invalid-annotations"
-			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1?sap-language=EN&sap-client=foo' ],
-				metadataUrlParams: { "sap-language": "EN" }
-			});
-
 			// model: "v2-ODataModel" with multi origin annotations
 			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
 				serviceUrl: '/path/to/odata/service/with/multi/origin/annotations/?sap-client=foo&sap-server=bar',
 				annotationURI: ["/path/to/other/odata/service/Annotations(TechnicalName='%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE',Version='0001')/$value?sap-language=EN&sap-client=foo",
-												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/other/odata/service/Annotations%28TechnicalName=%27%2FIWBEP%2FTEA_TEST_ANNOTATION_FILE%27,Version=%270001%27%29/$value?sap-language=EN&sap-client=foo",
+												"test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/other/odata/service/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" }
 			});
 
-			// model: "v2-ODataModel-unknown-odataVersion"
-			sinon.assert.calledWithExactly(this.modelSpy.odataV2, {
-				serviceUrl: '/path/to/unknown/odataVersion?sap-client=foo&sap-server=bar',
-				metadataUrlParams: { "sap-language": "EN" }
-			});
-
-
 			// sap.ui.model.json.JSONModel
 			sinon.assert.callCount(this.modelSpy.json, 3);
 
@@ -1472,7 +1957,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.json, '/path/to/data.json?sap-client=foo&sap-server=bar');
 
 			// model: "json-relative"
-			sinon.assert.calledWithExactly(this.modelSpy.json, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/data.json?sap-client=foo&sap-server=bar');
+			sinon.assert.calledWithExactly(this.modelSpy.json, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/data.json?sap-client=foo&sap-server=bar');
 
 			// model: "json-relative-2"
 			sinon.assert.calledWithExactly(this.modelSpy.json, 'test-resources/sap/ui/core/qunit/component/testdata/path/to/other/data.json?sap-client=foo&sap-server=bar');
@@ -1485,7 +1970,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.xml, '/path/to/data.xml?sap-client=foo&sap-server=bar');
 
 			// model: "xml-relative"
-			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/data.xml?sap-client=foo&sap-server=bar');
+			sinon.assert.calledWithExactly(this.modelSpy.xml, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/data.xml?sap-client=foo&sap-server=bar');
 
 
 			// sap.ui.model.resource.ResourceModel
@@ -1498,7 +1983,7 @@ sap.ui.define([
 
 			// model: "resourceBundle-legacy-uri"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/i18n.properties"
+				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/i18n.properties"
 			});
 
 
@@ -1509,7 +1994,7 @@ sap.ui.define([
 			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar');
 
 			// model: "custom-uri-relative-string"
-			sinon.assert.calledWithExactly(this.modelSpy.custom, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/custom.datatype?sap-client=foo&sap-server=bar');
+			sinon.assert.calledWithExactly(this.modelSpy.custom, 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/path/to/local/custom.datatype?sap-client=foo&sap-server=bar');
 
 			// model: "custom-uri-string-with-settings"
 			sinon.assert.calledWithExactly(this.modelSpy.custom, '/path/to/custom.datatype?sap-client=foo&sap-server=bar', {
@@ -1535,30 +2020,12 @@ sap.ui.define([
 				uri: 'foo'
 			});
 
-
-			// Log.error
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\"./), "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
-
-
 			// check if models are set on component (and save them internally)
 			this.assertModelInstances({
 				"": this.modelSpy.odataV2,
 				"default-with-annotations": this.modelSpy.odataV2,
 				"old-uri-syntax": this.modelSpy.odataV2,
-				/**
-				 * @deprecated As of version 1.48
-				 */
-				"ODataModel": this.modelSpy.odata,
 				"v2-ODataModel": this.modelSpy.odataV2,
-				"invalid-annotations": this.modelSpy.odataV2,
 				"json": this.modelSpy.json,
 				"json-relative": this.modelSpy.json,
 				"json-relative-2": this.modelSpy.json,
@@ -1710,16 +2177,7 @@ sap.ui.define([
 						"i18n2": {
 							"type": "sap.ui.model.resource.ResourceModel",
 							"uri": "./i18n.properties"
-						},
-
-						// This model should not get preloaded as the class is not declared and a warning should get logged
-						// When creating the model on component init an error should get logged
-						// but all other models should still be created
-						"class-not-loaded": {
-							"type": "sap.ui.sample.model.MyModel",
-							"preload": true
 						}
-
 					}
 				}
 			};
@@ -1813,12 +2271,6 @@ sap.ui.define([
 			assert.ok(this.modelSpy.resource.getCall(1).returnValue.getResourceBundle() instanceof ResourceBundle,
 				"ResourceBundle should be available");
 
-			// check error log for "class-not-loaded" model
-			sinon.assert.calledWithExactly(this.oLogErrorSpy,
-				sinon.match(/Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded./),
-				"[\"sap.ui5\"][\"models\"][\"class-not-loaded\"]",
-				this.oComponent.getMetadata().getComponentName());
-
 			assert.ok(this.oComponent.getMetadata() instanceof UIComponentMetadata, "The metadata is instance of UIComponentMetadata");
 			assert.ok(this.oComponent.getManifest(), "Manifest is available");
 			assert.deepEqual(this.oComponent.getManifest(), this.oManifest, "Manifest matches the manifest behind manifestUrl");
@@ -1933,11 +2385,6 @@ sap.ui.define([
 			// sap.ui.model.resource.ResourceModel
 			sinon.assert.callCount(this.modelSpy.resource, 2);
 
-			// check error log for "class-not-loaded" model
-			sinon.assert.calledWithExactly(this.oLogErrorSpy,
-				sinon.match(/Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded./),
-				"[\"sap.ui5\"][\"models\"][\"class-not-loaded\"]",
-				this.oComponent.getMetadata().getComponentName());
 
 			assert.ok(this.oComponent.getMetadata() instanceof UIComponentMetadata, "The metadata is instance of UIComponentMetadata");
 			assert.ok(this.oComponent.getManifest(), "Manifest is available");
@@ -2112,13 +2559,6 @@ sap.ui.define([
 
 			var oResourceModel2 = this.modelSpy.resource.getCall(1).returnValue;
 			assert.ok(oResourceModel2.bDestroyed, "ResourceModel should have been destroyed.");
-
-			// check warning log for "class-not-loaded" model
-			sinon.assert.calledWithExactly(this.oLogWarningSpy,
-				"Can not preload model \"class-not-loaded\" as required class has not been loaded: \"sap.ui.sample.model.MyModel\"",
-				this.oManifest["sap.app"]["id"],
-				"sap.ui.core.Component");
-
 		}.bind(this));
 	});
 
@@ -2172,13 +2612,6 @@ sap.ui.define([
 
 			var oResourceModel2 = this.modelSpy.resource.getCall(1).returnValue;
 			assert.ok(oResourceModel2.bDestroyed, "ResourceModel should have been destroyed.");
-
-			// check warning log for "class-not-loaded" model
-			sinon.assert.calledWithExactly(this.oLogWarningSpy,
-				"Can not preload model \"class-not-loaded\" as required class has not been loaded: \"sap.ui.sample.model.MyModel\"",
-				this.oManifest["sap.app"]["id"],
-				"sap.ui.core.Component");
-
 		}.bind(this));
 	});