@openui5/sap.ui.core 1.117.0 → 1.118.0

package/test/sap/ui/core/qunit/messages/{MessageManager.qunit.js → Messaging.qunit.js}

@@ -4,8 +4,9 @@
 sap.ui.define([
 	"sap/ui/core/Configuration",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/message/MessageManager"
-], function(Configuration, Message, MessageManager) {
+	"sap/ui/core/Messaging",
+	"sap/ui/model/message/MessageModel"
+], function(Configuration, Message, Messaging, MessageModel) {
 	/*global QUnit */
 	"use strict";
 
@@ -13,12 +14,11 @@ sap.ui.define([
 		beforeEach : function () {
 			// avoid attaching to validation events on UI5 core
 			this.stub(Configuration, "getHandleValidation").returns(false);
-			this.oMessageManager = new MessageManager();
 		}
 	});
 
-	var oProcessor = {getId : function () { return "id"; }},
-		oProcessorOther = {getId : function () { return "otherId"; }},
+	var oProcessor = {getId : function () { return "id"; }, setMessages: function() {}},
+		oProcessorOther = {getId : function () { return "otherId"; }, setMessages: function() {}},
 		oMessage0 = new Message({
 			processor : oProcessor,
 			target : "target0"
@@ -47,89 +47,86 @@ sap.ui.define([
 	//*********************************************************************************************
 [{ // initial message manager having no messages
 	before : undefined,
-	after : {},
+	after :[],
 	remove : oMessage0
 }, { // message manager has just the to be deleted message for the target
-	before : {id : {target0 : [oMessage0], target1 : [oMessage1]}},
-	after : {id : {target1 : [oMessage1]}},
+	before : [oMessage0, oMessage1],
+	after : [oMessage1],
 	remove : oMessage0
 }, { // message manager has more than the to be deleted message for the target
-	before : {id : {target0 : [oMessage0, oMessage0a]}},
-	after : {id : {target0 : [oMessage0a]}},
+	before : [oMessage0, oMessage0a],
+	after : [oMessage0a],
 	remove : oMessage0
 }, { // delete multi-target message from more than one target entry in the message manager
-	before : {id : {target0 : [oMessage0, oMessageMulti], target1 : [oMessageMulti]}},
-	after : {id : {target0 : [oMessage0]}},
+	before : [oMessage0, oMessageMulti, oMessageMulti],
+	after : [oMessage0],
 	remove : oMessageMulti
 }, { // delete unbound message
-	before : {id : {undefined : [oMessageUnbound]}},
-	after : {id : {}},
+	before :[oMessageUnbound],
+	after : [],
 	remove : oMessageUnbound
 }].forEach(function (oFixture, i) {
 	QUnit.test("_removeMessage, " + i, function (assert) {
+		Messaging.removeAllMessages();
 		if (oFixture.before) {
-			this.oMessageManager.mMessages = oFixture.before;
+			Messaging.addMessages(oFixture.before);
 		} else {
-			assert.deepEqual(this.oMessageManager.mMessages, {});
+			assert.deepEqual(Messaging.getMessageModel().getData(), []);
 		}
 
 		// code under test
-		this.oMessageManager._removeMessage(oFixture.remove);
+		Messaging.removeMessages(oFixture.remove);
 
-		assert.deepEqual(this.oMessageManager.mMessages, oFixture.after);
+		assert.deepEqual(Messaging.getMessageModel().getData(), oFixture.after);
 	});
 });
 
 	//*********************************************************************************************
 [{ // initial message manager having no messages
 	add : oMessage0,
-	before : {},
-	after : {id : {target0 : [oMessage0]}}
+	before : [],
+	after : [oMessage0]
 }, { // message manager already has entry for processor
 	add : oMessage0a,
-	before : {id : {target0 : [oMessage0]}},
-	after : {id : {target0 : [oMessage0, oMessage0a]}}
+	before : [oMessage0],
+	after : [oMessage0, oMessage0a]
 }, { // initial message manager having no messages, import multi-target message
 	add : oMessageMulti,
-	before : {},
-	after : {id : {target0 : [oMessageMulti], target1 : [oMessageMulti]}}
+	before : [],
+	after : [oMessageMulti]
 }, { // initial message manager having no messages, import unbound message
 	add : oMessageUnbound,
-	before : {},
-	after : {id : {undefined : [oMessageUnbound]}}
+	before : [],
+	after : [oMessageUnbound]
 }].forEach(function (oFixture, i) {
 	QUnit.test("_importMessage, " + i, function (assert) {
-		this.oMessageManager.mMessages = oFixture.before;
+		Messaging.removeAllMessages();
+		Messaging.addMessages(oFixture.before);
 
 		// code under test
-		this.oMessageManager._importMessage(oFixture.add);
+		Messaging.addMessages(oFixture.add);
 
-		assert.deepEqual(this.oMessageManager.mMessages, oFixture.after);
+		assert.deepEqual(Messaging.getMessageModel().getData(), oFixture.after);
 	});
 });
 
 	//*********************************************************************************************
 	QUnit.test("_updateMessageModel", function (assert) {
-		var oMessageManagerMock = this.mock(this.oMessageManager),
-			oMessageModel = {setData : function () {}};
+		Messaging.removeAllMessages();
+		var oModelSpy = this.spy(MessageModel.prototype, "setData");
+		Messaging.addMessages([
+			oMessageUnbound,
+			oMessage0, oMessage0a, oMessageMulti,
+			oMessage1, oMessageMulti,
+			oMessageOtherProcessor
+		]);
 
-		oMessageManagerMock.expects("getMessageModel").returns(oMessageModel);
-		oMessageManagerMock.expects("_pushMessages").withExactArgs("mProcessors");
-		this.mock(oMessageModel).expects("setData")
-			.withExactArgs([oMessageUnbound, oMessage0, oMessage0a, oMessageMulti, oMessage1,
-				oMessageOtherProcessor]);
-		this.oMessageManager.mMessages = {
-			id : {
-				undefined : [oMessageUnbound],
-				target0 : [oMessage0, oMessage0a, oMessageMulti],
-				target1 : [oMessage1, oMessageMulti]
-			},
-			otherId : {
-				targetOther : [oMessageOtherProcessor]
-			}
-		};
-
-		// code under test
-		this.oMessageManager._updateMessageModel("mProcessors");
+		assert.deepEqual(oModelSpy.getCall(0).args[0], [
+			oMessageUnbound,
+			oMessage0, oMessage0a, oMessageMulti,
+			oMessage1,
+			oMessageOtherProcessor
+		]);
+		oModelSpy.restore();
 	});
 });

package/test/sap/ui/core/qunit/messages/messagesDataBinding.qunit.js

@@ -5,12 +5,14 @@
 // QUnit script for DataBinding Messages
 sap.ui.define([
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/core/message/Message",
 	"sap/m/Input",
 	"test-resources/sap/ui/core/qunit/odata/data/ODataModelFakeService" // used only indirectly
 ], function(
 	library,
+	Messaging,
 	ODataModel,
 	Message,
 	Input,
@@ -130,7 +132,7 @@ sap.ui.define([
 				message: "Some message text",
 				target: "/Products(1)/ProductName"
 			});
-			sap.ui.getCore().getMessageManager().addMessages(oMessage);
+			Messaging.addMessages(oMessage);
 			//timeout so the async datastate is already calculated
 			setTimeout(function() {
 				var oDataState = oInput2.getBinding("value").getDataState();

package/test/sap/ui/core/qunit/messages/messagesEnd2End.qunit.js

@@ -4,9 +4,9 @@ sap.ui.define([
 	'sap/ui/core/util/MockServer',
 	'sap/ui/model/odata/v2/ODataModel',
 	'sap/m/Input',
-	"sap/ui/core/message/Message",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/Item"
-], function (MockServer, ODataModel, Input, Message, Item) {
+], function (MockServer, ODataModel, Input, Messaging, Item) {
 	"use strict";
 
 	QUnit.module("Messaging End2End", {
@@ -154,7 +154,7 @@ sap.ui.define([
 			});
 			that.oMockServer.start();
 		}, afterEach : function(){
-			sap.ui.getCore().getMessageManager().removeAllMessages();
+			Messaging.removeAllMessages();
 		}
 
 	});
@@ -194,7 +194,7 @@ sap.ui.define([
 						that.oModelCanonical.read("ToProduct", {
 							context: oSalesOrderLineItemSetCtx,
 							success: function () {
-								var aMessages = sap.ui.getCore().getMessageManager().getMessageModel().oData;
+								var aMessages = Messaging.getMessageModel().getData();
 								assert.equal(aMessages.length, 4, "Correct message count.");
 								checkMessages(aMessages, assert);
 							}
@@ -217,7 +217,7 @@ sap.ui.define([
 		this.oModelCanonical.metadataLoaded().then(function () {
 			that.oModelCanonical.read("/SalesOrderSet");
 			var fnRequestCompleted = function () {
-				var aMessages = sap.ui.getCore().getMessageManager().getMessageModel().oData;
+				var aMessages = Messaging.getMessageModel().getData();
 				assert.equal(aMessages.length, 3, "Correct message count.");
 				assert.equal(aMessages[1].aTargets[0], "/SalesOrderLineItemSet(SalesOrderID='0500000001',ItemPosition='0000000010')/ToProduct/ID");
 				assert.equal(aMessages[1].aFullTargets[0], "/SalesOrderSet('0500000001')/ToLineItems(SalesOrderID='0500000001',ItemPosition='0000000010')/ToProduct/ID");
@@ -238,7 +238,7 @@ sap.ui.define([
 		this.oModelCanonical.metadataLoaded().then(function () {
 			that.oModelCanonical.read("/SalesOrderSet('0500000001')/ToLineItems(SalesOrderID='0500000001',ItemPosition='0000000010')/ToProduct");
 			var fnRequestCompleted = function () {
-				var aMessages = sap.ui.getCore().getMessageManager().getMessageModel().oData;
+				var aMessages = Messaging.getMessageModel().getData();
 				assert.equal(aMessages.length, 3, "Correct message count.");
 				assert.equal(aMessages[1].aTargets[0], "/ProductSet('HT-1030')/ID");
 				assert.equal(aMessages[1].aFullTargets[0], "/SalesOrderSet('0500000001')/ToLineItems(SalesOrderID='0500000001',ItemPosition='0000000010')/ToProduct/ID");
@@ -259,7 +259,7 @@ sap.ui.define([
 		oModel.createBindingContext("/SalesOrderLineItemSet(SalesOrderID='0500000001',ItemPosition='0000000010')", function(oContext) {
 			var oInput = new Input({ value: "{ToProduct/ID}" });
 			oInput.setBindingContext(oContext);
-			sap.ui.getCore().getMessageManager().registerObject(oInput);
+			Messaging.registerObject(oInput);
 			oInput.setModel(oModel);
 
 			oModel.read("/SalesOrderLineItemSet(SalesOrderID='0500000001',ItemPosition='0000000010')/ToProduct");
@@ -289,7 +289,7 @@ sap.ui.define([
 
 		oModel.metadataLoaded().then(function(){
 
-			var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+			var oMessageModel = Messaging.getMessageModel();
 
 			oModel.createEntry("/ContactSet", oCreateEntryProduct);
 			oModel.submitChanges({success: function(){
@@ -310,7 +310,7 @@ sap.ui.define([
 
 		oModel.metadataLoaded().then(function(){
 
-			var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+			var oMessageModel = Messaging.getMessageModel();
 
 			oModel.read("/ProductSet('HT-1000')/ToSupplier", {
 				success: function(){
@@ -427,7 +427,7 @@ sap.ui.define([
 				fnOriginalRefreshDataState = oInput.refreshDataState;
 
 			oInput.setModel(oModel);
-			sap.ui.getCore().getMessageManager().registerObject(oInput);
+			Messaging.registerObject(oInput);
 
 			oInput.refreshDataState = function (sName, oDataState) {
 				fnOriginalRefreshDataState.apply(this, arguments);

package/test/sap/ui/core/qunit/messages/messagesGeneral.qunit.js

@@ -3,7 +3,7 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/core/message/ControlMessageProcessor",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/message/MessageManager",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/Model",
 	"sap/ui/model/json/JSONModel",
@@ -15,7 +15,7 @@ sap.ui.define([
 	"sap/ui/model/odata/ODataMessageParser",
 	'sap/ui/qunit/utils/createAndAppendDiv',
 	"sap/ui/test/TestUtils"
-], function(coreLibrary, ControlMessageProcessor, Message, MessageManager, FormatException, Model, JSONModel, MessageModel, TypeInteger, TypeString, Input, Label, ODataMessageParser, createAndAppendDiv, TestUtils) {
+], function(coreLibrary, ControlMessageProcessor, Message, Messaging, FormatException, Model, JSONModel, MessageModel, TypeInteger, TypeString, Input, Label, ODataMessageParser, createAndAppendDiv, TestUtils) {
 	"use strict";
 
 	// create content div
@@ -142,7 +142,7 @@ sap.ui.define([
 		createControls();
 	};
 
-	QUnit.module("MessageManager", {
+	QUnit.module("Messaging", {
 		beforeEach : function() {
 			initModel("json");
 			oControlProcessor = new ControlMessageProcessor();
@@ -156,17 +156,14 @@ sap.ui.define([
 	});
 
 	QUnit.test("instanziation", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		assert.ok(oMessageManager, 'MessageManager instance created');
-		var oMessageModel = oMessageManager.getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		assert.ok(oMessageModel instanceof MessageModel, 'MessageModel created');
 		assert.equal(oMessageModel.getObject('/').length, 0, 'No Messages');
 	});
 
 	QUnit.test("addMessage", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oMessageModel = oMessageManager.getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		var oMessage = createMessage();
 		spyDataState(oInput1, function(sName, oDataState) {
 				assert.ok(oDataState.getMessages().length == 1, 'Message propagated to control');
@@ -176,7 +173,7 @@ sap.ui.define([
 			}
 		);
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 		assert.ok(Array.isArray(oMessageModel.getObject('/')), 'Message added to Model');
 		assert.ok(oMessageModel.getObject('/').length === 1, 'MessageModel holds one Message');
 		assert.ok(oMessageModel.getObject('/')[0] === oMessage, 'MessageModel: message instance ok');
@@ -184,10 +181,9 @@ sap.ui.define([
 
 	QUnit.test("removeMessage", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oMessageModel = oMessageManager.getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		var oMessage = createMessage();
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 		spyDataState(oInput1, function(sName, oDataState) {
 				assert.ok(!oDataState.getMessages() || oDataState.getMessages().length == 0, 'Message propagated to control - remove');
 				assert.ok(oInput1.getValueState() === ValueState.None, 'Input: ValueState set correctly');
@@ -195,14 +191,13 @@ sap.ui.define([
 			done();
 			}
 		);
-		oMessageManager.removeMessages(oMessage);
+		Messaging.removeMessages(oMessage);
 		assert.ok(oMessageModel.getObject('/').length == 0, 'No Messages in Model');
 	});
 
 	QUnit.test("removeAllMessages", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oMessageModel = oMessageManager.getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 		var oMessage = createMessage('mt1','/form/lastname');
 		var oMessage2 = createMessage('mt2');
 		var oMessage3 = createMessage('mt3');
@@ -222,7 +217,7 @@ sap.ui.define([
 			}
 		);
 
-		oMessageManager.addMessages([oMessage,oMessage2,oMessage3]);
+		Messaging.addMessages([oMessage,oMessage2,oMessage3]);
 		assert.ok(Array.isArray(oMessageModel.getObject('/')), 'Message added to Model');
 		assert.ok(oMessageModel.getObject('/').length === 3, 'MessageModel holds three Message');
 		assert.equal(oMessageModel.getObject('/')[0].message,'mt1', 'MessageModel: message1 instance ok');
@@ -241,7 +236,7 @@ sap.ui.define([
 				assert.ok(oInput2.getValueStateText() === '', 'Input: ValueStateText set correctly');
 				done();
 			});
-			oMessageManager.removeAllMessages();
+			Messaging.removeAllMessages();
 			assert.ok(oMessageModel.getObject('/').length == 0, 'No Messages in Model');
 		}, 0);
 	});
@@ -329,7 +324,6 @@ sap.ui.define([
 
 	QUnit.test("AdditionalText property on message for different labels", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
 		var oMessage = createMessage();
 
 		spyDataState(oInput1, function(sName, oDataState) {
@@ -340,12 +334,11 @@ sap.ui.define([
 			done();
 		});
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 	});
 
 	QUnit.test("AdditionalText property on message for more than one input field", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
 		var oMessage = createMessage();
 
 		// third input field for the same property "firstname", this label is taken
@@ -361,12 +354,11 @@ sap.ui.define([
 			done();
 		});
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 	});
 
 	QUnit.test("multiple addMessage with type 'Information' and 'Error'", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
 
 		var oMessageError = createMessage();
 		var oMessageInfo = createMessage(undefined, undefined, "Information");
@@ -385,8 +377,8 @@ sap.ui.define([
 		);
 
 		// adding an Information type message should not break anymore
-		oMessageManager.addMessages(oMessageInfo);
-		oMessageManager.addMessages(oMessageError);
+		Messaging.addMessages(oMessageInfo);
+		Messaging.addMessages(oMessageError);
 	});
 
 
@@ -396,7 +388,6 @@ sap.ui.define([
 		var sCheckedType = MessageType[key];
 		QUnit.test("single addMessage with type '" + sCheckedType + "'", function(assert) {
 			var done = assert.async();
-			var oMessageManager = sap.ui.getCore().getMessageManager();
 
 			var oMessage = createMessage(undefined, undefined, sCheckedType);
 
@@ -413,13 +404,12 @@ sap.ui.define([
 			);
 
 			// adding an Information type message should not break anymore
-			oMessageManager.addMessages(oMessage);
+			Messaging.addMessages(oMessage);
 		});
 	});
 
 	QUnit.test("Control Message target", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
 		var oTestInput = new Input({value:""});
 		oTestInput.placeAt("content");
 		var sControlId = oTestInput.getId();
@@ -433,20 +423,19 @@ sap.ui.define([
 			done();
 		});
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 	});
 
 	QUnit.test("Update when adding control id and removing control id", function(assert) {
 		var count = 0;
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		oMessageManager.removeAllMessages();
+		Messaging.removeAllMessages();
 		var oTestInput = new Input({value:""});
 		oTestInput.placeAt("content");
 		var sControlId = oTestInput.getId();
 		var oMessage = createControlMessage("TEST", "/" + sControlId + "/value");
 
-		var oBinding = oMessageManager.getMessageModel().bindProperty("/0/controlIds");
+		var oBinding = Messaging.getMessageModel().bindProperty("/0/controlIds");
 		var fnChange = function(oEvent) {
 			count++;
 			if (count === 1) {
@@ -458,7 +447,7 @@ sap.ui.define([
 				done();
 			}
 		};
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 		oBinding.attachChange(fnChange);
 		oBinding.checkUpdate();
 		oMessage.addControlId("/" + sControlId + "/value");
@@ -469,7 +458,6 @@ sap.ui.define([
 
 	QUnit.test("Control Id", function(assert) {
 		var done = assert.async();
-		var oMessageManager = sap.ui.getCore().getMessageManager();
 		var oTestInput = new Input({value:""});
 		oTestInput.placeAt("content");
 		var sControlId = oTestInput.getId();
@@ -483,7 +471,7 @@ sap.ui.define([
 			done();
 		});
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 	});
 
 
@@ -553,7 +541,7 @@ sap.ui.define([
 
 	QUnit.module("Bugfixes");
 
-	QUnit.test("MessageManager: Message sorting", function(assert) {
+	QUnit.test("Messaging: Message sorting", function(assert) {
 		assert.expect(3);
 		var done = assert.async();
 		var aCorrectOrder = [ MessageType.Error, MessageType.Error, MessageType.Warning, MessageType.Success, MessageType.Information ];
@@ -565,7 +553,7 @@ sap.ui.define([
 			value: "{/test}"
 		});
 		oInput.setModel(oModel);
-		sap.ui.getCore().getMessageManager().registerObject(oInput);
+		Messaging.registerObject(oInput);
 
 
 		var aMessages = [ new Message({
@@ -598,13 +586,15 @@ sap.ui.define([
 
 		// CHeck direct call to private method
 		var aMessageCopy = aMessages.slice(0);
-		MessageManager.prototype._sortMessages(aMessageCopy);
+		var oModelSpy = this.spy(oModel, "setMessages");
+		Messaging.addMessages(aMessageCopy);
+		aMessageCopy = oModelSpy.getCall(0).args[0]["/test"];
 		var aNewOrder = aMessageCopy.map(function(oM) { return oM.type; });
 		assert.deepEqual(aNewOrder, aCorrectOrder, "Sorted messages are in the correct order (Highest severity first)");
+		oModelSpy.restore();
 
 
-
-
+		Messaging.removeAllMessages();
 		var bCorrectOrder = false;
 		oInput.refreshDataState = function(sName, oDataState) {
 			var aPropagatedMessages = oDataState.getMessages();
@@ -613,13 +603,13 @@ sap.ui.define([
 			bCorrectOrder = JSON.stringify(aNewOrder) == JSON.stringify(aCorrectOrder);
 		};
 
-		sap.ui.getCore().getMessageManager().addMessages(aMessages);
+		Messaging.addMessages(aMessages);
 
 		assert.ok(!bCorrectOrder, "Messages have not been propagated synchronously");
 
 		setTimeout(function() {
 			assert.ok(bCorrectOrder, "Messages have been propagated asynchronously and are correctly sorted");
-			sap.ui.getCore().getMessageManager().removeMessages(aMessages);
+			Messaging.removeMessages(aMessages);
 			oInput.destroy();
 			done();
 		}, 0);
@@ -634,9 +624,9 @@ sap.ui.define([
 			value: "{/test}"
 		});
 		oInput.setModel(oModel);
-		sap.ui.getCore().getMessageManager().registerObject(oInput);
+		Messaging.registerObject(oInput);
 
-		sap.ui.getCore().getMessageManager().addMessages(new Message({
+		Messaging.addMessages(new Message({
 			type: MessageType.Information,
 			id: "test-info",
 			processor: oModel,
@@ -651,10 +641,10 @@ sap.ui.define([
 
 			var oMessage = aMessages[0];
 
-			sap.ui.getCore().getMessageManager().removeMessages(oMessage);
+			Messaging.removeMessages(oMessage);
 			oMessage.setMessageProcessor(new ControlMessageProcessor());
 			oMessage.setTargets(["inputField01/test"]);
-			sap.ui.getCore().getMessageManager().addMessages(oMessage);
+			Messaging.addMessages(oMessage);
 
 			setTimeout(function() {
 				aMessages = oInput.getBinding("value").getDataState().getMessages();
@@ -662,7 +652,7 @@ sap.ui.define([
 				assert.ok(oMessage.getMessageProcessor() instanceof ControlMessageProcessor, "The message is processed by the ControlMessageProcessor");
 
 				oInput.destroy();
-				sap.ui.getCore().getMessageManager().removeMessages(oMessage);
+				Messaging.removeMessages(oMessage);
 				done();
 			}, 0);
 		}, 0);