@openui5/sap.ui.core 1.117.0 → 1.118.0

package/test/sap/ui/core/qunit/odata/v2/V2ODataModelB.qunit.js

@@ -10,9 +10,10 @@ sap.ui.define([
 	"sap/ui/model/odata/UpdateMethod",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/table/Table",
-	"sap/ui/table/Column"
+	"sap/ui/table/Column",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ], function(each, isEmptyObject, Input, Label, MockServer, Filter, Sorter, UpdateMethod, ODataModel,
-	Table, Column) {
+	Table, Column, nextUIUpdate) {
 
 	"use strict";
 
@@ -510,7 +511,7 @@ sap.ui.define([
 	QUnit.test("test oDataModel read deferred with batchGroupId", function(assert) {
 		var done = assert.async();
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId" ]);
+		oModel.setDeferredGroups([ "myId" ]);
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
 				batchGroupId : "myId",
@@ -534,7 +535,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ undefined ]);
+		oModel.setDeferredGroups([ undefined ]);
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
 				success : function(oData, oResponse) {
@@ -573,7 +574,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
 				batchGroupId : "myId1",
@@ -614,7 +615,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId1", "myId2" ]);
+		oModel.setDeferredGroups([ "myId1", "myId2" ]);
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
 				batchGroupId : "myId1",
@@ -653,7 +654,7 @@ sap.ui.define([
 		var done = assert.async();
 		var bSuccess = false;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId" ]);
+		oModel.setDeferredGroups([ "myId" ]);
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
 				batchGroupId : "myId",
@@ -801,7 +802,7 @@ sap.ui.define([
 		oModel.attachMetadataLoaded(this, fnTest);
 	});
 
-	QUnit.test("test oDataModel listbinding with aggregation binding and read in default batch group", function(assert) {
+	QUnit.test("test oDataModel listbinding with aggregation binding and read in default batch group", async function(assert) {
 		var done = assert.async();
 		var iCallCount = 0;
 		var bRead1 = false;
@@ -814,7 +815,7 @@ sap.ui.define([
 		};
 		var oTable = initTable(mEntities);
 		oTable.placeAt("target1");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		oTable.setModel(oModel);
 		var fnTest = function() {
 			oTable.bindRows({
@@ -912,7 +913,7 @@ sap.ui.define([
 		};
 		var oTable = initTable(mEntities);
 		oTable.placeAt("target1");
-		oModel.setDeferredBatchGroups([ "myId1", "myId2" ]);
+		oModel.setDeferredGroups([ "myId1", "myId2" ]);
 		oTable.setModel(oModel);
 		var fnTest = function() {
 			oTable.bindRows({
@@ -1119,7 +1120,7 @@ sap.ui.define([
 		var bUpdate = false;
 		var bRead = false;
 		var bRead2 = false;
-		oModel.setDeferredBatchGroups(["myId1", "myId2"]);
+		oModel.setDeferredGroups(["myId1", "myId2"]);
 		var fnTest = function() {
 			oModel.update("/ProductSet('AD-1000')", {
 					Name : "Hello2"
@@ -1259,7 +1260,7 @@ sap.ui.define([
 		var iCount = 0;
 		var bRead = false;
 		var bRemove = false;
-		oModel.setDeferredBatchGroups(["myId2"]);
+		oModel.setDeferredGroups(["myId2"]);
 		var fnTest = function() {
 			oModel.read("/ProductSet('AD-1000')", {
 				success : function(oData, oResponse) {
@@ -1309,8 +1310,8 @@ sap.ui.define([
 		oModel.setDefaultBindingMode("TwoWay");
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -1356,10 +1357,10 @@ sap.ui.define([
 		var bMetadataLoaded = false;
 		var bSetProp = false;
 		oModel.setDefaultBindingMode("TwoWay");
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -1408,10 +1409,10 @@ sap.ui.define([
 		var bSetProp = false;
 		var bSetProp2 = false;
 		oModel.setDefaultBindingMode("TwoWay");
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -1471,10 +1472,10 @@ sap.ui.define([
 		var bSetProp = false;
 		var bSetProp2 = false;
 		oModel.setDefaultBindingMode("TwoWay");
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: false
 			}
@@ -1574,8 +1575,8 @@ sap.ui.define([
 		var bSetProp = false;
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -1613,8 +1614,8 @@ sap.ui.define([
 		oModel.setUseBatch(false);
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 		var fnTest = function() {
@@ -1655,10 +1656,10 @@ sap.ui.define([
 				success : function(oData, oResponse) {
 					assert.ok(true, "request succeeded");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product": {
-							batchGroupId: "myId",
+							groupId: "myId",
 							changeSetId: "Test",
 							single: true
 						}
@@ -1707,10 +1708,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Name"), "Notebook Basic 15", "check name");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/TypeCode"), "PR", "check typecode");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product": {
-							batchGroupId: "myId",
+							groupId: "myId",
 							changeSetId: "Test",
 							single: true
 						}
@@ -1771,10 +1772,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Name"), "Notebook Basic 15", "check name");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product": {
-							batchGroupId: "myId",
+							groupId: "myId",
 							changeSetId: "Test",
 							single: true
 						}
@@ -1855,10 +1856,10 @@ sap.ui.define([
 				assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Name"), "Notebook Basic 15", "check name");
 				assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 				bRead = true;
-				oModel.setDeferredBatchGroups(["myId"]);
-				oModel.setChangeBatchGroups({
+				oModel.setDeferredGroups(["myId"]);
+				oModel.setChangeGroups({
 					"Product" : {
-						batchGroupId : "myId",
+						groupId : "myId",
 						changeSetId : "Test",
 						single : true
 					}
@@ -2003,10 +2004,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/CurrencyCode"), "EUR", "check price");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product": {
-							batchGroupId: "myId",
+							groupId: "myId",
 							changeSetId: "Test",
 							single: true
 						}
@@ -2091,10 +2092,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/CurrencyCode"), "EUR", "check price");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product" : {
-							batchGroupId : "myId",
+							groupId : "myId",
 							changeSetId : "Test",
 							single : true
 						}
@@ -2340,10 +2341,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/CurrencyCode"), "EUR", "check price");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product" : {
-							batchGroupId : "myId",
+							groupId : "myId",
 							changeSetId : "Test",
 							single : true
 						}
@@ -2432,10 +2433,10 @@ sap.ui.define([
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/Price"), "956.0", "check price");
 					assert.equal(oModel.getProperty("/ProductSet('HT-1000')/CurrencyCode"), "EUR", "check price");
 					bRead = true;
-					oModel.setDeferredBatchGroups(["myId"]);
-					oModel.setChangeBatchGroups({
+					oModel.setDeferredGroups(["myId"]);
+					oModel.setChangeGroups({
 						"Product" : {
-							batchGroupId : "myId",
+							groupId : "myId",
 							changeSetId : "Test",
 							single : true
 						}
@@ -2642,10 +2643,10 @@ sap.ui.define([
 		oModel = initModel();
 		oModel.setRefreshAfterChange(false);
 
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -2716,8 +2717,8 @@ sap.ui.define([
 		oModel = initModel();
 		oModel.setRefreshAfterChange(false);
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -2762,15 +2763,16 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.95.0, reason sap.ui.model.odata.v2.ODataModel#deleteCreatedEntry */
 	QUnit.test("test oDataModel createEntry and deleteCreatedEntry", function(assert) {
 		var done = assert.async();
 		var oContext;
 		oModel = initModel();
 		oModel.setRefreshAfterChange(false);
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -2826,15 +2828,16 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.95.0, reason sap.ui.model.odata.v2.ODataModel#deleteCreatedEntry */
 	QUnit.test("test oDataModel 2 times createEntry and one deleteCreatedEntry", function(assert) {
 		var done = assert.async();
 		var oContext;
 		oModel = initModel();
 		oModel.setRefreshAfterChange(false);
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -3075,7 +3078,7 @@ sap.ui.define([
 		var iReqFailed = 0;
 		var sReqId = null;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 
 		var fnTest = function() {
 			oModel.read("/ProductSet", {
@@ -3565,7 +3568,7 @@ sap.ui.define([
 		var done = assert.async();
 		var oAbort = {};
 		oModel = initModel();
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 
 		var fnTest = function() {
 			oModel.read("/ProductSet('HT-1001')", {
@@ -3844,10 +3847,10 @@ sap.ui.define([
 		var done = assert.async();
 		var oContext;
 		oModel = initModel();
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: false
 			}

package/test/sap/ui/core/qunit/odata/v2/V2ODataModelDataState.qunit.js

@@ -7,6 +7,7 @@ sap.ui.define([
 	"sap/m/Text",
 	"sap/ui/core/Configuration",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/message/ControlMessageProcessor",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/util/MockServer",
@@ -15,7 +16,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/type/Float"
-], function(deepEqual, deepExtend, Button, Input, Text, Configuration, library, ControlMessageProcessor,
+], function(deepEqual, deepExtend, Button, Input, Text, Configuration, library, Messaging, ControlMessageProcessor,
 		Message, MockServer, VerticalLayout, DataState, JSONModel, ODataModel, Float) {
 	"use strict";
 
@@ -1088,8 +1089,8 @@ sap.ui.define([
 				var oComositeBinding = oCompositeControl.getBinding("value");
 
 
-				sap.ui.getCore().getMessageManager().registerObject(oInputField, true);
-				sap.ui.getCore().getMessageManager().registerObject(oCompositeControl, true);
+				Messaging.registerObject(oInputField, true);
+				Messaging.registerObject(oCompositeControl, true);
 
 				Promise.resolve().then(function() {
 					return testDataState(
@@ -1204,7 +1205,7 @@ sap.ui.define([
 			}
 		});
 		//let the message manager control the vertical layout for messages
-		sap.ui.getCore().getMessageManager().registerObject(oVerticalLayout, true);
+		Messaging.registerObject(oVerticalLayout, true);
 
 		oVerticalLayout.addContent(oFloatInput);
 		oVerticalLayout.addContent(oNameInput);
@@ -1262,7 +1263,7 @@ sap.ui.define([
 									oNameInput.getBinding("value"),
 									function() {
 										oNameInput.setValue("Test1"); //async
-										sap.ui.getCore().getMessageManager().addMessages(oMessage1);
+										Messaging.addMessages(oMessage1);
 									},
 									{
 										originalValue : "Flyer",
@@ -1274,7 +1275,7 @@ sap.ui.define([
 									"Added warning and Error on Name input",
 									function () {
 										oNameInput.setValue("Test2");
-										sap.ui.getCore().getMessageManager().addMessages(oMessage2);
+										Messaging.addMessages(oMessage2);
 
 										testDataState(
 											assert,
@@ -1294,7 +1295,7 @@ sap.ui.define([
 													assert,
 													oNameInput.getBinding("value"),
 													function() {
-														sap.ui.getCore().getMessageManager().removeMessages(oMessage1);
+														Messaging.removeMessages(oMessage1);
 													},
 													{
 														originalValue : "Flyer",
@@ -1305,7 +1306,7 @@ sap.ui.define([
 													},
 													"Remove warning and Error on Name input",
 													function () {
-														sap.ui.getCore().getMessageManager().removeMessages(oMessage2);
+														Messaging.removeMessages(oMessage2);
 														testDataState(
 															assert,
 															oNameInput.getBinding("value"),
@@ -1357,7 +1358,7 @@ sap.ui.define([
 					}
 				});
 		//let the message manager control the vertical layout for messages
-		sap.ui.getCore().getMessageManager().registerObject(oVerticalLayout, true);
+		Messaging.registerObject(oVerticalLayout, true);
 
 		oVerticalLayout.addContent(oFloatInput);
 		oVerticalLayout.addContent(oNameInput);
@@ -1385,7 +1386,7 @@ sap.ui.define([
 					oCompositeInput.getBinding("value"),
 					function() {
 						oCompositeInput.setValue("Test1 2");
-						sap.ui.getCore().getMessageManager().addMessages(oMessage1);
+						Messaging.addMessages(oMessage1);
 					},
 					{
 						originalValue : ["Flyer", 1],
@@ -1397,7 +1398,7 @@ sap.ui.define([
 					"Added Messages to Composite input",
 					function() {
 						oCompositeInput.setValue("Test2 3");
-						sap.ui.getCore().getMessageManager().addMessages(oMessage2);
+						Messaging.addMessages(oMessage2);
 						testDataState(
 							assert,
 							oCompositeInput.getBinding("value"),
@@ -1443,11 +1444,10 @@ sap.ui.define([
 			}
 		});
 		//let the message manager control the vertical layout for messages
-		sap.ui.getCore().getMessageManager().registerObject(oInput, true);
+		Messaging.registerObject(oInput, true);
 		var oMessageProcessor = new ControlMessageProcessor();
-		var oMessageManager  = sap.ui.getCore().getMessageManager();
 
-		oMessageManager.registerMessageProcessor(oMessageProcessor);
+		Messaging.registerMessageProcessor(oMessageProcessor);
 
 		oInput.placeAt("content");
 		oInput.setModel(oModel);
@@ -1478,7 +1478,7 @@ sap.ui.define([
 				}, "Initial status of Composite input after read"
 			)
 			.then(function() {
-				oMessageManager.addMessages(oMessage1);
+				Messaging.addMessages(oMessage1);
 				return testDataState(
 					assert,
 					oBinding,
@@ -1537,7 +1537,7 @@ sap.ui.define([
 				);
 			})
 			.then(function() {
-				oMessageManager.removeMessages(oMessage1);
+				Messaging.removeMessages(oMessage1);
 				return testDataState(
 					assert,
 					oBinding,
@@ -1569,11 +1569,10 @@ sap.ui.define([
 			}
 		});
 		//let the message manager control the vertical layout for messages
-		sap.ui.getCore().getMessageManager().registerObject(oInput, true);
+		Messaging.registerObject(oInput, true);
 		var oMessageProcessor = new ControlMessageProcessor();
-		var oMessageManager  = sap.ui.getCore().getMessageManager();
 
-		oMessageManager.registerMessageProcessor(oMessageProcessor);
+		Messaging.registerMessageProcessor(oMessageProcessor);
 
 		oInput.placeAt("content");
 		oInput.setModel(oModel);
@@ -1604,7 +1603,7 @@ sap.ui.define([
 				}, "Initial status of Composite input after read"
 			)
 			.then(function() {
-				oMessageManager.addMessages(oMessage1);
+				Messaging.addMessages(oMessage1);
 				return testDataState(
 					assert,
 					oBinding,

package/test/sap/ui/core/qunit/odata/v2/testsuite.odatav2.qunit.js

@@ -76,6 +76,10 @@ sap.ui.define(function() {
 			ODataV2ListBinding: {
 				title: "sap.ui.model.odata.v2.ODataListBinding - QUnit tests"
 			},
+			/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter */
+			ODataV2ListBinding_Filter_legacyAPIs: {
+				title: "sap.ui.model.odata.v2.ODataListBinding_Filter - QUnit tests"
+			},
 			ODataV2ListBinding_Paging: {
 				title: "sap.ui.model.odata.v2.ODataListBinding_Paging - QUnit tests"
 			},