@openui5/sap.ui.core 1.117.0 → 1.118.0

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

@@ -9,12 +9,12 @@ sap.ui.define([
 	"sap/ui/model/odata/ODataMessageParser",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/type/String",
-	"sap/ui/core/message/MessageManager",
 	"sap/m/Input",
 	"sap/m/Button",
 	"sap/ui/layout/VerticalLayout",
 	"sap/ui/layout/HorizontalLayout",
-	"sap/ui/core/library"
+	"sap/ui/core/library",
+	"sap/ui/core/Messaging"
 ], function(
 	fakeService,
 	Log,
@@ -23,12 +23,12 @@ sap.ui.define([
 	ODataMessageParser,
 	BindingMode,
 	StringType,
-	MessageManager,
 	Input,
 	Button,
 	VerticalLayout,
 	HorizontalLayout,
-	library
+	library,
+	Messaging
 ) {
 	"use strict";
 
@@ -56,9 +56,6 @@ sap.ui.define([
 
 	var oModelJson, oModelXml;
 
-	// Create MessageManager instance and set Message Model in TimeOut...
-	sap.ui.getCore().getMessageManager();
-
 	var oJsonLayout = new VerticalLayout({
 		content: {
 			path: "json>/Products",
@@ -90,7 +87,7 @@ sap.ui.define([
 		oModelJson = new ODataModel(sServiceURI, mModelOptions);
 		sap.ui.getCore().setModel(oModelJson, "json");
 
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No message has been added");
 
@@ -119,7 +116,7 @@ sap.ui.define([
 		mModelOptions.json = false;
 		oModelXml = new ODataModel(sServiceURI, mModelOptions);
 		sap.ui.getCore().setModel(oModelXml, "xml");
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.ok(oInput2.getValueState() === "None", "ValueState has not been set");
 
@@ -148,7 +145,7 @@ sap.ui.define([
 			useBatch: false,
 			json: false
 		});
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -257,7 +254,7 @@ sap.ui.define([
 		var iExpectedMessages = 0;
 
 
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -357,7 +354,7 @@ sap.ui.define([
 		var iExpectedMessages = 0;
 
 
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
 		oModel.attachMetadataLoaded(function() {
@@ -422,7 +419,7 @@ sap.ui.define([
 
 		var sServiceURI = "fakeservice://testdata/odata/northwind";
 
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
 		var oMetadata = new ODataMetadata(sServiceURI + "/$metadata", {});
@@ -706,8 +703,8 @@ sap.ui.define([
 
 		var sServiceURI = "fakeservice://testdata/odata/northwind";
 
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 		assert.equal(oMessageModel.getProperty("/").length, 0,
 			"No messages are set at the beginning of the test");
 
@@ -822,8 +819,8 @@ sap.ui.define([
 			useBatch: false,
 			json: false
 		});
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -922,8 +919,8 @@ sap.ui.define([
 			useBatch: bUseBatch,
 			json: bJSON
 		});
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -931,7 +928,7 @@ sap.ui.define([
 
 			assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set after metadata loaded");
 
-			oModel.setDeferredBatchGroups(["deferredId"]);
+			oModel.setDeferredGroups(["deferredId"]);
 			oModel.read("/Products(1)", { batchGroupId : "deferredId" });
 			oModel.read("/Products(2)", { batchGroupId : "deferredId" });
 			oModel.read("/Products(3)", { batchGroupId : "deferredId" });
@@ -984,8 +981,8 @@ sap.ui.define([
 			useBatch: bUseBatch,
 			json: bJSON
 		});
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -993,7 +990,7 @@ sap.ui.define([
 
 			assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set after metadata loaded");
 
-			oModel.setDeferredBatchGroups(["deferredId"]);
+			oModel.setDeferredGroups(["deferredId"]);
 			oModel.update("/Products(1)", { ProductName: "Updated 1" }, { batchGroupId : "deferredId" });
 			oModel.update("/Products(2)", { ProductName: "Updated 2" }, { batchGroupId : "deferredId" });
 			oModel.update("/Products(3)", { ProductName: "Updated 3" }, { batchGroupId : "deferredId" });
@@ -1037,14 +1034,15 @@ sap.ui.define([
 	QUnit.test("Message with groups (write) - Batch: on,  JSON: false", fnTestWriteBatchGroups.bind(this, true,  false));
 
 
-
+/** @deprecated As of version 1.79.0, reason sap.ui.core.message.Message#getTarget */
+(function() {
 	var fnTestFunctionImport = function(assert) {
 		var done = assert.async();
 
 		assert.expect(10);
 		var oModel = new ODataModel("fakeservice://testdata/odata/northwind/", { tokenHandling: false, useBatch: false });
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1097,8 +1095,8 @@ sap.ui.define([
 
 		assert.expect(26);
 		var oModel = new ODataModel("fakeservice://testdata/odata/northwind/", { tokenHandling: false, useBatch: false });
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 		var oMessage;
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
@@ -1200,6 +1198,7 @@ sap.ui.define([
 	};
 
 	QUnit.test("Messages with 'invalid' targets",  fnTestFunctionImportWithInvalidTarget);
+}());
 
 	var fnTestRemoveMessagesWithBinding = function(assert) {
 		var done = assert.async();
@@ -1231,10 +1230,10 @@ sap.ui.define([
 		sap.ui.getCore().setModel(oModel);
 
 		oInput3.placeAt("content");
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		sap.ui.getCore().getMessageManager().registerObject(oInput3, true);
+		Messaging.removeAllMessages();
+		Messaging.registerObject(oInput3, true);
 
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1300,8 +1299,8 @@ sap.ui.define([
 				oModel.read(sPath, { success: resolve });
 			});
 		};
-		sap.ui.getCore().getMessageManager().removeAllMessages();
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1352,9 +1351,8 @@ sap.ui.define([
 			});
 		};
 
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		oMessageManager.removeAllMessages();
-		var oMessageModel = oMessageManager.getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1368,7 +1366,7 @@ sap.ui.define([
 			assert.equal(aMessages[2].persistent, true, "Third message should be persistent");
 			assert.equal(aMessages[2].getTargets()[0], "/TransientTest1/SupplierID", "Message has correct target");
 
-			oMessageManager.removeAllMessages();
+			Messaging.removeAllMessages();
 
 			assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set after removal of all messages");
 
@@ -1385,8 +1383,8 @@ sap.ui.define([
 			assert.equal(aMessages[2].persistent, true, "Third message should be persistent");
 			assert.equal(aMessages[2].getTargets()[0], "/TransientTest1/SupplierID", "Message has correct target");
 
-			oMessageManager.removeMessages(aMessages[0]);
-			oMessageManager.removeMessages(aMessages[2]);
+			Messaging.removeMessages(aMessages[0]);
+			Messaging.removeMessages(aMessages[2]);
 
 			aMessages = oMessageModel.getProperty("/");
 
@@ -1430,7 +1428,7 @@ sap.ui.define([
 		});
 	};
 
-	QUnit.test("Transient message removal from MessageManager", fnTestTransientMessageRemoval);
+	QUnit.test("Transient message removal from Messaging", fnTestTransientMessageRemoval);
 
 	var fnTestNormalization = function(assert) {
 		var done = assert.async();
@@ -1448,9 +1446,8 @@ sap.ui.define([
 			});
 		};
 
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		oMessageManager.removeAllMessages();
-		var oMessageModel = oMessageManager.getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1461,7 +1458,7 @@ sap.ui.define([
 			assert.ok(oBinding.getDataState().getChanges(), "Messages propagated to binding");
 			assert.equal(oBinding.getDataState().getMessages().length, 1, " 1 Message propagated to binding");
 			assert.equal(oBinding.getDataState().getMessages()[0], aMessages[0], "Message propagated to binding");
-			oMessageManager.removeAllMessages();
+			Messaging.removeAllMessages();
 			assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set after removal of all messages");
 			return read("/Products(ContextId='CLF%2812%29SEMANTIC_OBJ%287%29Product%2810%29OBJECT_KEY%2811%29ZTEST_GD_02%289%29DRAFT_KEY%2836%29005056ba-1dcb-1ee7-8ec6-ae98ab359923')");
 		}).then(function() {
@@ -1492,9 +1489,8 @@ sap.ui.define([
 			});
 		};
 
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		oMessageManager.removeAllMessages();
-		var oMessageModel = oMessageManager.getMessageModel();
+		Messaging.removeAllMessages();
+		var oMessageModel = Messaging.getMessageModel();
 
 		assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set at the beginning of the test");
 
@@ -1506,7 +1502,7 @@ sap.ui.define([
 			assert.equal(oBinding.getDataState().getMessages().length, 1, " 1 Message propagated to binding");
 			assert.equal(oBinding.getDataState().getMessages()[0], aMessages[0], "Message propagated to binding");
 			assert.equal(oBinding.getDataState().getMessages()[0].message, "This is a server test message", "Message has correct message text");
-			oMessageManager.removeAllMessages();
+			Messaging.removeAllMessages();
 			assert.equal(oMessageModel.getProperty("/").length, 0, "No messages are set after removal of all messages");
 			oModel.destroy();
 			done();

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

@@ -4,13 +4,13 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/message/MessageManager",
 	"sap/ui/model/odata/MessageScope",
 	"sap/ui/model/odata/ODataMessageParser",
 	"sap/ui/model/odata/ODataMetadata",
 	"sap/ui/model/odata/ODataUtils"
-], function (Log, coreLibrary, Message, MessageManager, MessageScope, ODataMessageParser, ODataMetadata, ODataUtils) {
+], function (Log, coreLibrary, Messaging, Message, MessageScope, ODataMessageParser, ODataMetadata, ODataUtils) {
 	/*global QUnit,sinon*/
 	/*eslint camelcase: 0, max-nested-callbacks: 0, no-warning-comments: 0*/
 	"use strict";
@@ -224,7 +224,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(aMessages), sinon.match.same(mRequestInfo),
 				mGetEntities, mChangeEntities)
 			.returns(oFixture.mAffectedTargets);
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match(aExpectedMessagesToBeRemoved), sinon.match.same(aMessages));
 
 		// code under test
@@ -479,7 +479,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(aMessages), sinon.match.same(mRequestInfo),
 				mGetEntities, mChangeEntities)
 			.returns(oFixture.mAffectedTargets);
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match(aExpectedMessagesToBeRemoved), sinon.match.same(aMessages));
 
 		// code under test
@@ -1147,7 +1147,7 @@ sap.ui.define([
 				+ "response, but requested only transition messages", undefined, sClassName);
 		}
 		this.mock(oODataMessageParser).expects("_getAffectedTargets").never();
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match([]), sinon.match.same(aMessages));
 
 		// code under test
@@ -1191,7 +1191,7 @@ sap.ui.define([
 			.withExactArgs(mRequestInfo.request.functionMetadata).returns(true);
 		this.mock(oODataMessageParser).expects("_getAffectedTargets")
 			.withExactArgs(aMessages, mRequestInfo, mGetEntities, "~mChangeEntities");
-			this.mock(MessageManager).expects("updateMessages")
+			this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match([oLastMessage1]), sinon.match.same(aMessages));
 
 		// code under test
@@ -1229,7 +1229,7 @@ sap.ui.define([
 		this.mock(oODataMessageParser).expects("_getAffectedTargets")
 			.withExactArgs(sinon.match.same(aMessages), sinon.match.same(mRequestInfo),
 				{}, "~mChangeEntities");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match([]), sinon.match.same(aMessages));
 
 		// code under test
@@ -1273,7 +1273,7 @@ sap.ui.define([
 		this.mock(oODataMessageParser).expects("_getAffectedTargets")
 			.withExactArgs(sinon.match.same(aMessage), sinon.match.same(mRequestInfo),
 				sinon.match.same(mGetEntities), "~mChangeEntities");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match([oLastMessage1]), sinon.match.same(aMessage));
 
 		// code under test

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

@@ -916,6 +916,7 @@ sap.ui.define([
 		TestUtils.notDeepContains([{}, {}], [{foo : "bar"}]);
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	QUnit.test("compatibility with synchronous ODataModel", function (assert) {
 		var oDataModel, oMetaModel;
@@ -949,6 +950,7 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	QUnit.test("compatibility with asynchronous old ODataModel", function (assert) {
 		var oDataModel, oMetaModel;
@@ -982,6 +984,7 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	QUnit.test("compatibility w/ asynchronous old ODataModel: use after load", function (assert) {
 		var iCount = 0,
@@ -1032,6 +1035,7 @@ sap.ui.define([
 		oDataModel.attachMetadataLoaded(loaded);
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	QUnit.test("compatibility with old ODataModel: separate value list load", function (assert) {
 		var oContext, oDataModel, oEntityType, oMetaModel, oProperty;
@@ -2287,44 +2291,76 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	// Note: http://www.html5rocks.com/en/tutorials/es6/promises/ says that
 	// "Any errors thrown in the constructor callback will be implicitly passed to reject()."
-	// We make sure the same happens even with our asynchronous constructor.
-	[false, true].forEach(function (bAsync) {
-		QUnit.test("Errors thrown inside load(), async = " + bAsync, function (assert) {
-			var oDataModel, oError;
+	QUnit.test("Errors thrown inside load(), async = false", function (assert) {
+		var oDataModel, oError;
 
-			this.oLogMock.expects("warning").exactly(bAsync ? 0 : 1)
-				.withExactArgs(sIgnoreThisWarning);
+		this.oLogMock.expects("warning").exactly(1)
+			.withExactArgs(sIgnoreThisWarning);
 
-			oError = new Error("This call failed intentionally");
-			oError.$uncaughtInPromise = true;
-			oDataModel = new (bAsync ? ODataModel : ODataModel1)("/fake/service", {
-				annotationURI : "",
-				json : true,
-				loadMetadataAsync : bAsync
+		oError = new Error("This call failed intentionally");
+		oError.$uncaughtInPromise = true;
+		oDataModel = new (ODataModel1)("/fake/service", {
+			annotationURI : "",
+			json : true,
+			loadMetadataAsync : false
+		});
+
+		// Note: this is just a placeholder for "anything which could go wrong inside load()"
+		this.mock(Model.prototype).expects("setDefaultBindingMode").throws(oError);
+
+		// code under test
+		return oDataModel.getMetaModel().loaded().then(function () {
+			throw new Error("Unexpected success");
+		}, function (ex) {
+			assert.strictEqual(ex, oError, ex.message);
+			// sync loaded promise also fails with the same error
+			return oDataModel.getMetaModel().oLoadedPromiseSync.then(function () {
+				throw new Error("Unexpected success");
+			}, function (ex0) {
+				assert.strictEqual(ex0, oError, ex0.message);
 			});
+		});
+	});
 
-			if (bAsync) {
-				this.oLogMock.expects("error").withExactArgs(
-					"error in ODataMetaModel.loaded(): " + oError.message, undefined,
-					"sap.ui.model.odata.v2.ODataModel");
-			}
-			// Note: this is just a placeholder for "anything which could go wrong inside load()"
-			this.mock(Model.prototype).expects("setDefaultBindingMode").throws(oError);
+	//*********************************************************************************************
+	// Note: http://www.html5rocks.com/en/tutorials/es6/promises/ says that
+	// "Any errors thrown in the constructor callback will be implicitly passed to reject()."
+	// We make sure the same happens even with our asynchronous constructor.
+	QUnit.test("Errors thrown inside load(), async = true", function (assert) {
+		var oDataModel, oError;
 
-			// code under test
-			return oDataModel.getMetaModel().loaded().then(function () {
+		this.oLogMock.expects("warning").exactly(0)
+			.withExactArgs(sIgnoreThisWarning);
+
+		oError = new Error("This call failed intentionally");
+		oError.$uncaughtInPromise = true;
+		oDataModel = new (ODataModel)("/fake/service", {
+			annotationURI : "",
+			json : true,
+			loadMetadataAsync : true
+		});
+
+		this.oLogMock.expects("error").withExactArgs(
+			"error in ODataMetaModel.loaded(): " + oError.message, undefined,
+			"sap.ui.model.odata.v2.ODataModel");
+
+		// Note: this is just a placeholder for "anything which could go wrong inside load()"
+		this.mock(Model.prototype).expects("setDefaultBindingMode").throws(oError);
+
+		// code under test
+		return oDataModel.getMetaModel().loaded().then(function () {
+			throw new Error("Unexpected success");
+		}, function (ex) {
+			assert.strictEqual(ex, oError, ex.message);
+			// sync loaded promise also fails with the same error
+			return oDataModel.getMetaModel().oLoadedPromiseSync.then(function () {
 				throw new Error("Unexpected success");
-			}, function (ex) {
-				assert.strictEqual(ex, oError, ex.message);
-				// sync loaded promise also fails with the same error
-				return oDataModel.getMetaModel().oLoadedPromiseSync.then(function () {
-					throw new Error("Unexpected success");
-				}, function (ex0) {
-					assert.strictEqual(ex0, oError, ex0.message);
-				});
+			}, function (ex0) {
+				assert.strictEqual(ex0, oError, ex0.message);
 			});
 		});
 	});
@@ -3289,6 +3325,7 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	//*********************************************************************************************
 	QUnit.test("load: Performance measurement points", function (assert) {
 		var oAverageSpy, oDataModel, oEndSpy, oMetaModel;

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"use strict";
 
 	var sServiceUri = "/MockSrv/";
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	var sServiceUri3 = "/DOESNOTEXIST/";
 
 	var sDataRootPath =  "test-resources/sap/ui/core/qunit/model/";
@@ -30,6 +31,7 @@ sap.ui.define([
 		return oMockServer;
 	}
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	function initModel(sUri) {
 		oModel = new V1ODataModel(sUri, true);
 		return oModel;
@@ -47,6 +49,8 @@ sap.ui.define([
 		assert.ok(oServer,"Server initialized");
 	});
 
+/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
+(function() {
 	QUnit.test("init Model", function(assert) {
 		var oModel = initModel(sServiceUri);
 		assert.ok(oModel,"Model initialized");
@@ -103,6 +107,7 @@ sap.ui.define([
 		oServer.stop();
 		oServer.destroy();
 	});
+}());
 
 	// Usually we should not test internal methods, but these might be candidates to be made publicly available
 	QUnit.module("ODataMetadata: Internal methods");
@@ -314,11 +319,12 @@ sap.ui.define([
 
 	oServer = initServer(sServiceUri, "model/metadata1.xml", sDataRootPath);
 
-	var oModelV1 = initModel(sServiceUri);
-	var pModelV1MetadataLoaded = new Promise(function(fnResolve, fnReject) {
-		oModelV1.attachMetadataLoaded(fnResolve);
-		oModelV1.attachMetadataFailed(fnReject);
-	});
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
+	var oModelV1 = initModel(sServiceUri),
+		pModelV1MetadataLoaded = new Promise(function(fnResolve, fnReject) {
+			oModelV1.attachMetadataLoaded(fnResolve);
+			oModelV1.attachMetadataFailed(fnReject);
+		});
 	var oModelV2 = initModelV2(sServiceUri);
 
 
@@ -328,7 +334,9 @@ sap.ui.define([
 			oModel.metadataLoaded().then(function () {
 				fnRealTest.apply(this, [assert, done].concat([].slice.call(arguments)));
 			});
-		} else {
+		}
+		/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
+		if (!(oModel instanceof V2ODataModel)) {
 			pModelV1MetadataLoaded.then(function () {
 				fnRealTest.apply(this, [assert, done].concat([].slice.call(arguments)));
 			});
@@ -341,6 +349,7 @@ sap.ui.define([
 			continue;
 		}
 
+		/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 		QUnit.test("V1: " + sTest, fnWrapMetadataReady.bind(this, mInternalTests[sTest].bind(mInternalTests, oModelV1)));
 		QUnit.test("V2: " + sTest, fnWrapMetadataReady.bind(this, mInternalTests[sTest].bind(mInternalTests, oModelV2)));
 	}
@@ -422,8 +431,9 @@ sap.ui.define([
 		done();
 	};
 
+	/** @deprecated As of version 1.48.0, reason sap.ui.model.odata.ODataModel */
 	QUnit.test("V1: _getAnnotation method", fnWrapMetadataReady.bind(this, fnTestAnnotations.bind(this, oModelV1)));
-	QUnit.test("V2: _getAnnotation method", fnWrapMetadataReady.bind(this, fnTestAnnotations.bind(this, oModelV1)));
+	QUnit.test("V2: _getAnnotation method", fnWrapMetadataReady.bind(this, fnTestAnnotations.bind(this, oModelV2)));
 
 
 	QUnit.module("ODataMetadata: sap-cancel-on-close header handling");