@openui5/sap.ui.core 1.117.1 → 1.119.0

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,13 +236,14 @@ 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);
 	});
 
 	QUnit.test("parseError", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oZip, true);
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oZip, function(sName, oDataState) {
 				assert.ok(oDataState.getMessages().length == 1, 'ParseError Message propagated to control');
@@ -261,6 +257,7 @@ sap.ui.define([
 				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
 				assert.ok(oZip.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 				assert.ok(oZip.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				Messaging.unregisterObject(oZip);
 				done();
 			});
 			oZip.setValue('123');
@@ -269,6 +266,7 @@ sap.ui.define([
 
 	QUnit.test("validationError", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oStreet, true);
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oStreet, function(sName, oDataState) {
 				assert.ok(oDataState.getMessages().length == 1, 'Validation Message propagated to control');
@@ -282,6 +280,7 @@ sap.ui.define([
 				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
 				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				Messaging.unregisterObject(oStreet);
 				done();
 			});
 			oStreet.setValue('Busch');
@@ -290,6 +289,7 @@ sap.ui.define([
 
 	QUnit.test("validationError - multiple input", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oStreet, true);
 
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oStreet, function(sName, oDataState) {
@@ -319,6 +319,7 @@ sap.ui.define([
 					spyDataState(oStreet, function(sName, oDataState) {
 						assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 						assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+						Messaging.unregisterObject(oStreet);
 						done();
 					});
 					oStreet.setValue('Busch');
@@ -329,7 +330,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 +340,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 +360,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 +383,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 +394,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 +410,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 +429,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 +453,7 @@ sap.ui.define([
 				done();
 			}
 		};
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 		oBinding.attachChange(fnChange);
 		oBinding.checkUpdate();
 		oMessage.addControlId("/" + sControlId + "/value");
@@ -469,7 +464,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 +477,7 @@ sap.ui.define([
 			done();
 		});
 
-		oMessageManager.addMessages(oMessage);
+		Messaging.addMessages(oMessage);
 	});
 
 
@@ -553,7 +547,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 +559,7 @@ sap.ui.define([
 			value: "{/test}"
 		});
 		oInput.setModel(oModel);
-		sap.ui.getCore().getMessageManager().registerObject(oInput);
+		Messaging.registerObject(oInput);
 
 
 		var aMessages = [ new Message({
@@ -598,13 +592,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 +609,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 +630,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 +647,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 +658,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);

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

@@ -0,0 +1,158 @@
+/*global QUnit */
+sap.ui.define([
+	"sap/ui/core/library",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/model/type/Integer",
+	"sap/ui/model/type/String",
+	"sap/m/Input",
+	'sap/ui/qunit/utils/createAndAppendDiv',
+	"sap/ui/test/TestUtils"
+], function(coreLibrary, JSONModel, TypeInteger, TypeString, Input, createAndAppendDiv, TestUtils) {
+	"use strict";
+
+	// create content div
+	createAndAppendDiv("content");
+
+	// shortcuts for enums from the sap.ui.core namespace
+	var ValueState = coreLibrary.ValueState;
+
+	var oModel;
+	var oString, oInteger, oStreet, oZip;
+
+	function createControls() {
+		oString = new TypeString(null,{maxLength: 5});
+		oInteger = new TypeInteger();
+
+		oZip = new Input({value:{path:'/form/zip', type: oInteger}});
+		oStreet = new Input({value:{path:'/form/street', type: oString}});
+
+		oZip.placeAt("content");
+		oStreet.placeAt("content");
+	}
+
+	function destroyControls() {
+		oZip.destroy();
+		oStreet.destroy();
+	}
+
+	function spyDataState(oControl, fnTest) {
+		if (oControl.refreshDataState) {
+			var fnRefresh = oControl.refreshDataState;
+			oControl.refreshDataState = function(sName, oDataState) {
+				Input.prototype.refreshDataState.apply(oControl, arguments);
+				fnTest(sName, oDataState);
+				oControl.refreshDataState = fnRefresh;
+			};
+		}
+	}
+
+	function initModel() {
+		oModel = new JSONModel();
+		var oData = {
+			form: {
+				firstname: "Fritz",
+				lastname: "Heiner",
+				street: "im",
+				nr: 1,
+				zip: "12345"
+			}
+		};
+		oModel.setData(oData);
+		sap.ui.getCore().setModel(oModel);
+		createControls();
+	}
+
+	QUnit.module("Messaging  (global handleValidation)", {
+		beforeEach : function() {
+			initModel();
+		},
+
+		afterEach : function() {
+			destroyControls();
+			oModel.destroy();
+			oModel = undefined;
+		}
+	});
+
+	QUnit.test("parseError", function(assert) {
+		var done = assert.async();
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oZip, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 1, 'ParseError Message propagated to control');
+				assert.ok(oZip.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oZip.getValueStateText(), "EnterInt", 'Input: ValueStateText set correctly');
+			});
+			oZip.setValue('bbb');
+		});
+		setTimeout(function() {
+			spyDataState(oZip, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
+				assert.ok(oZip.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oZip.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				done();
+			});
+			oZip.setValue('123');
+		}, this);
+	});
+
+	QUnit.test("validationError", function(assert) {
+		var done = assert.async();
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 1, 'Validation Message propagated to control');
+				assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('am Busche');
+		});
+		setTimeout(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
+				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				done();
+			});
+			oStreet.setValue('Busch');
+		}, this);
+	});
+
+	QUnit.test("validationError - multiple input", function(assert) {
+		var done = assert.async();
+
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('am Busche');
+		});
+
+		setTimeout(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('Busch');
+
+			setTimeout(function() {
+				TestUtils.withNormalizedMessages(function() {
+					spyDataState(oStreet, function(sName, oDataState) {
+						assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+						assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+					});
+					oStreet.setValue('am Busche');
+				});
+
+				setTimeout(function() {
+					spyDataState(oStreet, function(sName, oDataState) {
+						assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+						assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+						done();
+					});
+					oStreet.setValue('Busch');
+				}, 0);
+			}, 0);
+		}, 0);
+	});
+
+});