Merge "[FIX] sap.base.strings.formatMessage: Accept nullish arguments"

Author: RandomByte

src/sap.ui.core/src/sap/base/strings/formatMessage.js

@@ -66,6 +66,11 @@ sap.ui.define(["sap/base/assert"], function(assert) {
 	 * @public
 	 */
 	var fnFormatMessage = function(sPattern, aValues) {
+		if (sPattern == null) {
+			// Binding formatter case: arguments might be nullish while data is still being populated
+			// Return an empty string in those cases
+			return "";
+		}
 		assert(typeof sPattern === "string" || sPattern instanceof String, "pattern must be string");
 		if (arguments.length > 2 || (aValues != null && !Array.isArray(aValues))) {
 			aValues = Array.prototype.slice.call(arguments, 1);

src/sap.ui.core/test/sap/ui/core/qunit/base/strings/formatMessage.qunit.js

@@ -40,8 +40,15 @@ sap.ui.define(["sap/base/strings/formatMessage"], function(formatMessage) {
 		assert.equal(formatMessage("Say '{0}'", "Hello"), "Say {0}", "quoted placeholder should be ignored");
 	});
 
+	QUnit.test("nullish pattern", function(assert) {
+		assert.equal(formatMessage(undefined, ["Hello"]), "", "should return empty string");
+		assert.equal(formatMessage(undefined, 0), "", "should return empty string");
+		assert.equal(formatMessage(null, ["Hello"]), "", "should return empty string");
+		assert.equal(formatMessage(null, 0), "", "should return empty string");
+	});
+
 	QUnit.test("pattern syntax errors", function(assert) {
-		assert.expect(5);
+		assert.expect(6);
 		try {
 			formatMessage("Say }", [12.4]);
 		} catch (e) {
@@ -67,5 +74,10 @@ sap.ui.define(["sap/base/strings/formatMessage"], function(formatMessage) {
 		} catch (e) {
 			assert.ok(true, "nested placeholders raise an error");
 		}
+		try {
+			formatMessage(false, [5]);
+		} catch (e) {
+			assert.ok(true, "boolean instead of string raise an error");
+		}
 	});
 });