@openui5/sap.ui.core 1.123.0 → 1.124.0

package/test/sap/ui/core/qunit/json/JSONModel.qunit.js

@@ -12,65 +12,52 @@ sap.ui.define([
 ], function (fakeService, Label, List, ListItem, UI5Date, VerticalLayout, Context, JSONModel, jQuery) {
 	"use strict";
 
-	var oLabel,
-		oLayout,
-		oModel,
-		oModelChild,
-		aTestData,
-		aTestDataChild;
-
-	function cleanUp(){
-		oLabel.destroy();
-	}
-
-	function setup(){
-		aTestData = {
-			teamMembers:[
-				{firstName:"Andreas", lastName:"Klark"},
-				{firstName:"Peter", lastName:"Miller"},
-				{firstName:"Gina", lastName:"Rush"},
-				{firstName:"Steave", lastName:"Ander"},
-				{firstName:"Michael", lastName:"Spring"},
-				{firstName:"Marc", lastName:"Green"},
-				{firstName:"Frank", lastName:"Wallace"}
-			],
-			additionalData:{
-				level1:{
-					text:"level1",
-					level2: {
-						text:"level2"
-					}
-				}
-			},
-			rootproperty: "test1"
-		};
-
-		aTestDataChild = {
-			pets:[
-				{type:"ape", age:"1"},
-				{type:"bird", age:"2"},
-				{type:"cat", age:"3"},
-				{type:"fish", age:"4"},
-				{type:"dog", age:"5"}
-			]
-		};
-
-		oModel = new JSONModel();
-		oModel.setData(aTestData);
-		oModelChild = new JSONModel();
-		oModelChild.setData(aTestDataChild);
-		oLayout = new VerticalLayout();
-		oLabel = new Label("myLabel");
-		oLabel.setText("testText");
-		oLabel.setModel(oModel);
-	}
-
 	QUnit.module("sap.ui.model.json.JSONModel", {
-		afterEach: function() {
-			cleanUp();
+		afterEach: function () {
+			if (this.oModel) {
+				this.oModel.destroy();
+			}
+			if (this.oLabel) {
+				this.oLabel.destroy();
+			}
 		},
-		beforeEach: function() {
-			setup();
+		/**
+		 * Gets the default model and a label having the model set as default model.
+		 * @returns {Object<sap.m.Label|sap.ui.model.json.JSONModel>}
+		 *   An object with the properties "oModel" and "oLabel" containing the created model and label
+		 */
+		createModelAndLabel() {
+			const oModel = this.createModel();
+			const oLabel = new Label({text: "testText"});
+			oLabel.setModel(oModel);
+			this.oLabel = oLabel;
+
+			return {oLabel, oModel};
+		},
+		/**
+		 * Gets the default JSON model.
+		 * @returns {sap.ui.model.json.JSONModel} The model
+		 */
+		createModel() {
+			this.oModel = new JSONModel({
+				additionalData: {
+					level1: {
+						text: "level1",
+						level2: {text: "level2"}
+					}
+				},
+				rootproperty: "test1",
+				teamMembers: [
+					{firstName: "Andreas", lastName: "Klark"},
+					{firstName: "Peter", lastName: "Miller"},
+					{firstName: "Gina", lastName: "Rush"},
+					{firstName: "Steave", lastName: "Ander"},
+					{firstName: "Michael", lastName: "Spring"},
+					{firstName: "Marc", lastName: "Green"},
+					{firstName: "Frank", lastName: "Wallace"}
+				]
+			});
+			return this.oModel;
 		}
 	});
 
@@ -94,6 +81,7 @@ sap.ui.define([
 		oModel.setData(arr1);
 		oModel.setData(arr2, true);
 		assert.deepEqual(oModel.getData(), arrMerged, "setData array with merge");
+		oModel.destroy();
 	});
 
 	QUnit.test("test model observation", function(assert) {
@@ -133,7 +121,6 @@ sap.ui.define([
 			bArrName = false,
 			iChangeCount = 0;
 
-
 		oString.attachChange(function(){bString = true; iChangeCount++;});
 		oNumber.attachChange(function(){bNumber = true; iChangeCount++;});
 		oBool.attachChange(function(){bBool = true; iChangeCount++;});
@@ -166,9 +153,14 @@ sap.ui.define([
 		assert.equal(oBool.getValue(), false, "Boolean new value");
 		assert.ok(bBool, "Boolean change event fired");
 
-		assert.equal(oDate.getValue(), oData.date, "Date old value");
-		oData.date = UI5Date.getInstance();
-		assert.equal(oDate.getValue(), oData.date, "Date new value");
+		const oModelValue = oData.date;
+		assert.strictEqual(oDate.getValue(), oModelValue, "Binding and model values are same");
+		assert.strictEqual(oModelValue.getFullYear(), 2022, "Year of old model value is 2022");
+		const oNewModelValue = UI5Date.getInstance(2024, 1, 3);
+		oData.date = oNewModelValue;
+		assert.strictEqual(oData.date, oNewModelValue, "Model value: " + oData.date + ", expected: " + oNewModelValue);
+		assert.strictEqual(oDate.getValue(), oNewModelValue,
+			"Binding value: " + oDate.getValue() + ", expected: " + oNewModelValue);
 		assert.ok(bDate, "Date change event fired");
 
 		assert.equal(oObj.getValue(), oData.obj, "Object old value");
@@ -188,10 +180,11 @@ sap.ui.define([
 		assert.ok(bArrName, "Array name change event fired");
 
 		assert.equal(iChangeCount, 8, "All 8 change handlers have been called once");
-
+		oModel.destroy();
 	});
 
 	QUnit.test("test model getProperty", function(assert) {
+		const oModel = this.createModel();
 		var value = oModel.getProperty("/teamMembers/6/lastName");
 		assert.equal(value, "Wallace", "model value");
 		value = oModel.getProperty("/rootproperty");
@@ -199,6 +192,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("test model getProperty with context", function(assert) {
+		const oModel = this.createModel();
 		var oContext = oModel.createBindingContext("/teamMembers");
 		var value = oModel.getProperty("6/lastName", oContext);
 		assert.equal(value, "Wallace", "model value");
@@ -207,6 +201,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("test model setProperty", function(assert) {
+		const oModel = this.createModel();
 		oModel.setProperty("/teamMembers/4/lastName", "Jackson");
 		var value = oModel.getProperty("/teamMembers/4/lastName");
 		assert.equal(value, "Jackson", "model value");
@@ -220,9 +215,11 @@ sap.ui.define([
 			oTest = {b:2};
 		oModel.setProperty("/", oTest);
 		assert.equal(oModel.getData(), oTest, "model data changed");
+		oModel.destroy();
 	});
 
 	QUnit.test("test model setProperty with context", function(assert) {
+		const oModel = this.createModel();
 		var oContext = oModel.createBindingContext("/teamMembers");
 		oModel.setProperty("4/lastName", "Smith", oContext);
 		var value = oModel.getProperty("/teamMembers/4/lastName");
@@ -233,12 +230,14 @@ sap.ui.define([
 	});
 
 	QUnit.test("test getProperty on label", function(assert) {
+		const {oLabel} = this.createModelAndLabel();
 		assert.equal(oLabel.getText(),"testText", "old text value");
 		oLabel.bindProperty("text", "/teamMembers/4/firstName");
 		assert.equal(oLabel.getText(), "Michael", "text value from model");
 	});
 
 	QUnit.test("test model setProperty onlabel", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oLabel.setText("test");
 		assert.equal(oLabel.getText(),"test", "old text value");
 		oLabel.bindProperty("text", "/teamMembers/1/firstName");
@@ -249,12 +248,14 @@ sap.ui.define([
 	});
 
 	QUnit.test("test model setProperty with invalid bindingContext and relative path", function(assert) {
+		const oModel = this.createModel();
 		var oContext = oModel.createBindingContext("/teamMembers/HorstDerGrosse");
 		oModel.setProperty("firstName", "Peter", oContext);
 		assert.expect(0);
 	});
 
 	QUnit.test("test model setProperty onlabel with bindingContext and relative path", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		var oContext = oModel.createBindingContext("/teamMembers");
 		oLabel.setBindingContext(oContext);
 		oLabel.bindProperty("text", "1/firstName");
@@ -265,6 +266,7 @@ sap.ui.define([
 	});
 	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel with bindingContext and relative path (legacySyntax = true)", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oModel.setLegacySyntax(true);
 		var oContext = oModel.createBindingContext("/teamMembers");
 		oLabel.setBindingContext(oContext);
@@ -277,6 +279,7 @@ sap.ui.define([
 	});
 	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel without bindingContext and relative path (legacySyntax = true)", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oModel.setLegacySyntax(true);
 		oLabel.setBindingContext(undefined);
 		oLabel.bindProperty("text", "teamMembers/1/firstName");
@@ -288,6 +291,7 @@ sap.ui.define([
 	});
 	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel with bindingContext and absolute path (legacySyntax = true)", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oModel.setLegacySyntax(true);
 		var oContext = oModel.createBindingContext("/teamMembers/HorstDerGrosse");
 		oLabel.setBindingContext(oContext);
@@ -300,6 +304,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("test model setProperty onlabel with bindingContext and absolute path", function(assert) {
+		const {oModel, oLabel} = this.createModelAndLabel();
 		var oContext = oModel.createBindingContext("/teamMembers/HorstDerGrosse");
 		oLabel.setBindingContext(oContext);
 		oLabel.bindProperty("text", "/teamMembers/1/firstName");
@@ -310,25 +315,31 @@ sap.ui.define([
 	});
 
 	QUnit.test("test model getProperty with bindingContext and path = null", function(assert) {
+		const oModel = this.createModel();
 		var oContext = oModel.createBindingContext("/teamMembers");
 		assert.equal(oModel.getProperty(null, oContext).length, 7, "array of teammembers");
 	});
 
-
 	QUnit.test("test createBindingContext with two models", function(assert) {
-		var oContext = oModel.createBindingContext("/teamMembers");
+		const oModelChild = new JSONModel({
+			pets: [{type: "ape", age: "1"}, {type: "bird", age: "2"}, {type: "cat", age: "3"}]
+		});
+		const oLayout = new VerticalLayout();
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oLayout.addContent(oLabel);
 		oLayout.setModel(oModel);
-		oLayout.setBindingContext(oContext);
+		oLayout.setBindingContext(oModel.createBindingContext("/teamMembers"));
 		oLabel.setModel(oModelChild);
 		oLabel.bindProperty("text", "/pets/0/type");
 		assert.equal(oLabel.getText(), "ape", "text value from model");
 		oModelChild.setProperty("/pets/0/type", "hamster");
 		assert.equal(oLabel.getText(), "hamster", "new text value from model");
+		oLayout.destroy();
+		oModelChild.destroy();
 	});
 
 	QUnit.test("test model bindAggregation on List", function(assert) {
-
+		const oModel = this.createModel();
 		var oLB = new List("myLb");
 		oLB.setModel(oModel);
 		var oItemTemplate = new ListItem();
@@ -339,16 +350,16 @@ sap.ui.define([
 		var listItems = oLB.getItems();
 		assert.equal(listItems.length, 7, "length of items");
 
+		const aTeamMembers = oModel.getObject("/teamMembers");
 		listItems.forEach( function(item, i) {
-			assert.equal(item.getTitle(), aTestData.teamMembers[i].firstName, "firstName");
-			assert.equal(item.getDescription(), aTestData.teamMembers[i].lastName, "lastName");
+			assert.equal(item.getTitle(), aTeamMembers[i].firstName, "firstName");
+			assert.equal(item.getDescription(), aTeamMembers[i].lastName, "lastName");
 		});
 
 		oLB.destroy();
 	});
 
 	QUnit.test("test JSONModel JSON constructor", function(assert) {
-
 		var testModel = new JSONModel({
 			"foo": "The quick brown fox jumps over the lazy dog.",
 			"bar": "ABCDEFG",
@@ -357,10 +368,11 @@ sap.ui.define([
 		assert.equal(testModel.getProperty("/foo"), "The quick brown fox jumps over the lazy dog.");
 		assert.equal(testModel.getProperty("/bar"), "ABCDEFG");
 		assert.equal(testModel.getProperty("/baz")[1], 97);
-
+		testModel.destroy();
 	});
 
 	QUnit.test("test create binding context", function(assert) {
+		const oModel = this.createModel();
 		var oContext;
 		oContext = oModel.createBindingContext("/root/test/subtest/name");
 		assert.equal(oContext.getPath(), "/root/test/subtest/name", "newContext returnValue");
@@ -383,9 +395,13 @@ sap.ui.define([
 	});
 
 	QUnit.test("test inheritance of context", function(assert) {
-		var oContext;
+		const oModelChild = new JSONModel({
+			pets: [{type: "ape", age: "1"}, {type: "bird", age: "2"}, {type: "cat", age: "3"}]
+		});
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oLabel.setBindingContext(undefined);
-		oContext = oModel.createBindingContext("/teamMembers");
+		let oContext = oModel.createBindingContext("/teamMembers");
+		const oLayout = new VerticalLayout();
 		oLayout.setModel(oModel);
 		oLayout.setBindingContext(oContext);
 		oLabel.setModel(oModelChild);
@@ -397,6 +413,8 @@ sap.ui.define([
 		assert.equal(oLabel.getBindingContext().getPath(), "/pets", "context set correctly");
 		oModelChild.setProperty("0/type", "rat",oLabel.getBindingContext());
 		assert.equal(oLabel.getText(), "rat", "new text value from model");
+		oLayout.destroy();
+		oModelChild.destroy();
 	});
 
 	QUnit.test("test JSONModel loadData: sync",function(assert) {
@@ -405,6 +423,7 @@ sap.ui.define([
 		assert.equal(testModel.getProperty("/foo"), "The quick brown fox jumps over the lazy dog.");
 		assert.equal(testModel.getProperty("/bar"), "ABCDEFG");
 		assert.equal(testModel.getProperty("/baz")[1], 97);
+		testModel.destroy();
 	});
 
 	QUnit.test("test JSONModel loadData: sync - error",function(assert) {
@@ -431,6 +450,7 @@ sap.ui.define([
 		});
 
 		testModel.loadData("nothingThere.json", null, false);
+		testModel.destroy();
 	});
 
 	QUnit.test("test JSONModel loadData: async - error",function(assert) {
@@ -455,6 +475,7 @@ sap.ui.define([
 			assert.equal(mParams.statusCode, 404);
 			assert.ok(mParams.statusText);
 			assert.ok(mParams.responseText);
+			testModel.destroy();
 			done();
 		});
 
@@ -469,6 +490,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/foo"), "The quick brown fox jumps over the lazy dog.");
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFG");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
+			testModel.destroy();
 			done();          // resume normal testing
 		});
 	});
@@ -481,6 +503,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/foo"), "The quick brown fox jumps over the lazy dog.");
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFG");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
+			testModel.destroy();
 			done();          // resume normal testing
 		});
 	});
@@ -503,6 +526,7 @@ sap.ui.define([
 				assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 				assert.equal(testModel.getProperty("/baz")[1], 97);
 				assert.equal(testModel.getProperty("/merged"), true);
+				testModel.destroy();
 				done();
 			}
 		});
@@ -519,6 +543,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -550,6 +575,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -572,6 +598,7 @@ sap.ui.define([
 		});
 
 		Promise.all([pLoad1, pLoad2]).then(function() {
+			testModel.destroy();
 			done();
 		});
 	});
@@ -594,6 +621,7 @@ sap.ui.define([
 				assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 				assert.ok(!testModel.getProperty("/baz"), "deleted as no merge");
 				assert.equal(testModel.getProperty("/merged"), true);
+				testModel.destroy();
 				done();
 			}
 		});
@@ -609,6 +637,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.ok(!testModel.getProperty("/baz"), "deleted as no merge");
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -642,6 +671,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.ok(!testModel.getProperty("/baz"), "deleted as no merge");
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -670,6 +700,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.ok(!testModel.getProperty("/baz"), "deleted as no merge");
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -685,6 +716,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
 			assert.equal(testModel.getProperty("/merged"), true);
+			testModel.destroy();
 			done();
 		});
 	});
@@ -711,6 +743,7 @@ sap.ui.define([
 		});
 
 		Promise.all([p1, p2, p3]).then(function() {
+			testModel.destroy();
 			done();
 		});
 	});
@@ -732,6 +765,7 @@ sap.ui.define([
 				assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 				assert.equal(testModel.getProperty("/baz")[1], 97);
 				assert.equal(testModel.getProperty("/merged"), true);
+				testModel.destroy();
 				done();
 			}
 		});
@@ -755,6 +789,7 @@ sap.ui.define([
 				assert.equal(testModel.getProperty("/bar"), "ABCDEFGHIJ");
 				assert.equal(testModel.getProperty("/baz")[1], 97);
 				assert.equal(testModel.getProperty("/merged"), true);
+				testModel.destroy();
 				done();
 			}
 		});
@@ -767,6 +802,7 @@ sap.ui.define([
 			assert.equal(testModel.getProperty("/foo"), "The quick brown fox jumps over the lazy dog.");
 			assert.equal(testModel.getProperty("/bar"), "ABCDEFG");
 			assert.equal(testModel.getProperty("/baz")[1], 97);
+			testModel.destroy();
 			done();          // resume normal testing
 		});
 	});
@@ -817,6 +853,7 @@ sap.ui.define([
 		assert.equal(aContexts[0].getPath(), "/array/0");
 		assert.equal(aContexts[1].getPath(), "/array/1");
 		assert.equal(aContexts[2].getPath(), "/array/2");
+		oModel.destroy();
 	});
 
 	QUnit.test("test JSON setJSON", function(assert) {
@@ -824,6 +861,7 @@ sap.ui.define([
 		var sJSON = '{"name":"John"}';
 		oModel.setJSON(sJSON,false);
 		assert.equal(oModel.getProperty("/name"), "John" , "parse test");
+		oModel.destroy();
 	});
 
 	QUnit.test("test JSON setJSON error", function(assert) {
@@ -836,7 +874,7 @@ sap.ui.define([
 		});
 		oModel.setJSON(sJSON,false);
 		assert.ok(error, "error occurred");
-
+		oModel.destroy();
 	});
 
 	QUnit.test("test JSON getJSON", function(assert) {
@@ -844,6 +882,7 @@ sap.ui.define([
 		var sJSON = '{"name":"John"}';
 		oModel.setJSON(sJSON,false);
 		assert.equal(oModel.getJSON(), sJSON, "get JSON test");
+		oModel.destroy();
 	});
 
 	QUnit.test("test JSON getData", function(assert) {
@@ -851,10 +890,11 @@ sap.ui.define([
 		var sJSON = '{"name":"John"}';
 		oModel.setJSON(sJSON,false);
 		assert.equal(oModel.getData().name, "John", "get Data test");
+		oModel.destroy();
 	});
 	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test JSON compatible syntax", function(assert) {
-		var oModel = new JSONModel(aTestData);
+		const oModel = this.createModel();
 		oModel.setLegacySyntax(true);
 		var value = oModel.getProperty("teamMembers/6/lastName");
 		assert.equal(value, "Wallace", "model value");
@@ -867,7 +907,7 @@ sap.ui.define([
 	});
 	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test JSON compatible syntax fail", function(assert) {
-		var oModel = new JSONModel(aTestData);
+		const oModel = this.createModel();
 		oModel.setLegacySyntax(false);
 		var value = oModel.getProperty("teamMembers/6/lastName");
 		assert.equal(value, undefined, "model value");
@@ -901,7 +941,6 @@ sap.ui.define([
 	});
 
 	QUnit.test("test JSONModel loadData after destroy", function(assert) {
-
 		var spy = sinon.spy(jQuery, "ajax");
 		var testModel = new JSONModel();
 
@@ -929,12 +968,10 @@ sap.ui.define([
 
 	QUnit.test("bind Element", function(assert) {
 		var oContext;
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oModel.createBindingContext("/additionalData", null, function(context){
 			oContext = context;
 		});
-		var oLabel = new Label("myLabel2");
-		oLabel.setModel(oModel);
-		oLabel.setText("testText");
 		oLabel.setBindingContext(oContext);
 		oLabel.bindElement("level1");
 		assert.equal(oLabel.getBindingContext().getPath(), "/additionalData/level1", "context should be considered for element binding");
@@ -944,17 +981,14 @@ sap.ui.define([
 		assert.equal(oLabel.getText(), "level2", "text value from model");
 		oLabel.unbindElement();
 		assert.equal(oLabel.getText(), "", "text value from model");
-		oLabel.destroy();
 	});
 
 	QUnit.test("bind Element", function(assert) {
 		var oContext;
+		const {oModel, oLabel} = this.createModelAndLabel();
 		oModel.createBindingContext("/additionalData", null, function(context){
 			oContext = context;
 		});
-		var oLabel = new Label("myLabel2");
-		oLabel.setModel(oModel);
-		oLabel.setText("testText");
 		oLabel.bindElement("level1");
 		oLabel.setBindingContext(oContext);
 		assert.equal(oLabel.getBindingContext().getPath(), "/additionalData/level1", "context should be considered for element binding");
@@ -964,7 +998,5 @@ sap.ui.define([
 		assert.equal(oLabel.getText(), "level2", "text value from model");
 		oLabel.unbindElement();
 		assert.equal(oLabel.getText(), "", "text value from model");
-		oLabel.destroy();
 	});
-
 });

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

@@ -2,14 +2,12 @@
 sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/core/message/Message',
-	'sap/ui/core/message/MessageProcessor'
-], function(coreLibrary, Message, MessageProcessor) {
+	'sap/ui/core/message/MessageProcessor',
+	'sap/ui/core/message/MessageType'
+], function(coreLibrary, Message, MessageProcessor, MessageType) {
 	/*eslint max-nested-callbacks: 0 */
 	"use strict";
 
-	// shortcut for sap.ui.core.MessageType
-	var MessageType = coreLibrary.MessageType;
-
 	QUnit.module("sap/ui/core/message/Message");
 
 
@@ -220,6 +218,10 @@ sap.ui.define([
 ].forEach(function (sType0, i0, aTypes) {
 	var oMessage0 = new Message({type : sType0});
 
+	/**
+	 * Creating Messages with an unknown type will not be possible in UI5 2.x
+	 * @deprecated
+	 */
 	QUnit.test("compare " + sType0 + " with unknown", function (assert) {
 		var oMessageUnknown = new Message({type : "unknown"});
 

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

@@ -4,24 +4,22 @@
 /*global QUnit*/
 // 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/ui/core/message/MessageType",
 	"sap/m/Input",
 	"test-resources/sap/ui/core/qunit/odata/data/ODataModelFakeService" // used only indirectly
 ], function(
-	library,
 	Messaging,
 	ODataModel,
 	Message,
+	MessageType,
 	Input,
-	fakeService
+	_fakeService
 ) {
 	"use strict";
 
-	var MessageType = library.MessageType;
-
 	var sServiceUri = "http://services.odata.org/V3/Northwind/Northwind.svc/";
 	sServiceUri = "/proxy/http/" + sServiceUri.replace("http://","");