@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -3,13 +3,14 @@ sap.ui.define([
 	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
 	"sap/ui/core/date/UI5Date",
-	"sap/m/DateTimeInput",
+	"sap/m/DateTimePicker",
 	"sap/m/Input",
 	"sap/m/Label",
 	"sap/m/List",
 	"sap/m/Panel",
 	"sap/m/StandardListItem",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/util/MockServer",
 	"sap/ui/model/ChangeReason",
@@ -19,11 +20,12 @@ sap.ui.define([
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/type/DateTime",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/table/Table",
 	"sap/ui/table/Column"
-], function (each, isEmptyObject, UI5Date, DateTimeInput, Input, Label, List, Panel, ListItem,
-		library, Message, MockServer, ChangeReason, Filter, Sorter, UpdateMethod, ODataModel,
-		DateTime, createAndAppendDiv, Table, Column
+], function (each, isEmptyObject, UI5Date, DateTimePicker, Input, Label, List, Panel, ListItem,
+		library, Messaging, Message, MockServer, ChangeReason, Filter, Sorter, UpdateMethod, ODataModel,
+		DateTime, createAndAppendDiv, nextUIUpdate, Table, Column
 ) {
 
 	"use strict";
@@ -636,7 +638,7 @@ sap.ui.define([
 
 	QUnit.test("test oDataModel read deferred with batchGroupId", function(assert) {
 		var done = assert.async();
-		oModel.setDeferredBatchGroups([ "myId" ]);
+		oModel.setDeferredGroups([ "myId" ]);
 		oModel.read("/ProductSet", {
 			batchGroupId : "myId",
 			success : function(oData, oResponse) {
@@ -657,7 +659,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 
-		oModel.setDeferredBatchGroups([ undefined ]);
+		oModel.setDeferredGroups([ undefined ]);
 		oModel.read("/ProductSet", {
 			success : function(oData, oResponse) {
 				bRead1 = true;
@@ -694,7 +696,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.read("/ProductSet", {
 			batchGroupId : "myId1",
 			success : function(oData, oResponse) {
@@ -733,7 +735,7 @@ sap.ui.define([
 		var bRead1 = false;
 		var bRead2 = false;
 
-		oModel.setDeferredBatchGroups([ "myId1", "myId2" ]);
+		oModel.setDeferredGroups([ "myId1", "myId2" ]);
 		oModel.read("/ProductSet", {
 			batchGroupId : "myId1",
 			success : function(oData, oResponse) {
@@ -771,7 +773,7 @@ sap.ui.define([
 	QUnit.test("test oDataModel read deferred with batchGroupId and submitChanges callback handler test", function(assert) {
 		var done = assert.async();
 		var bSuccess = false;
-		oModel.setDeferredBatchGroups([ "myId" ]);
+		oModel.setDeferredGroups([ "myId" ]);
 		oModel.read("/ProductSet", {
 			batchGroupId : "myId",
 			success : function(oData, oResponse) {
@@ -908,7 +910,7 @@ sap.ui.define([
 		oModel.attachBatchRequestCompleted(fnCheck);
 	});
 
-	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;
@@ -920,7 +922,7 @@ sap.ui.define([
 		};
 		var oTable = initTable(mEntities);
 		oTable.placeAt("target1");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		oTable.setModel(oModel);
 		oTable.bindRows({
 			path : mEntities.categories.collection
@@ -1010,7 +1012,7 @@ sap.ui.define([
 		};
 		var oTable = initTable(mEntities);
 		oTable.placeAt("target1");
-		oModel.setDeferredBatchGroups([ "myId1", "myId2" ]);
+		oModel.setDeferredGroups([ "myId1", "myId2" ]);
 		oTable.setModel(oModel);
 		oTable.bindRows({
 			path : mEntities.categories.collection,
@@ -1200,7 +1202,7 @@ sap.ui.define([
 		var bUpdate = false;
 		var bRead = false;
 		var bRead2 = false;
-		oModel.setDeferredBatchGroups(["myId1", "myId2"]);
+		oModel.setDeferredGroups(["myId1", "myId2"]);
 
 		oModel.update("/ProductSet('AD-1000')", {
 				Name : "Hello2"
@@ -1253,8 +1255,13 @@ sap.ui.define([
 	QUnit.test("test oDataModel setProperty - hasPendingChanges", function(assert) {
 		var done = assert.async();
 		oModel.setDefaultBindingMode("TwoWay");
-		var oDateType = new DateTime();
-		var oInput = new DateTimeInput({type: "DateTime", value: {path:"/ProductSet('AD-1000')/CreatedAt", type: oDateType, formatOptions: { style: 'medium', strictParsing: true}}});
+		var oInput = new DateTimePicker({value: {
+				path:"/ProductSet('AD-1000')/CreatedAt",
+				type: new DateTime(),
+				formatOptions: {
+					style: 'medium',
+					strictParsing: true
+			}}});
 		oInput.setModel(oModel);
 		oModel.read("/ProductSet('AD-1000')", {
 			success: function() {
@@ -1417,7 +1424,7 @@ sap.ui.define([
 		var iCount = 0;
 		var bRead = false;
 		var bRemove = false;
-		oModel.setDeferredBatchGroups(["myId2"]);
+		oModel.setDeferredGroups(["myId2"]);
 		oModel.read("/ProductSet('AD-1000')", {
 			success : function(oData, oResponse) {
 				assert.ok(true, "request succeeded");
@@ -1463,8 +1470,8 @@ sap.ui.define([
 		oModel.setDefaultBindingMode("TwoWay");
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 		});
 
 		var mEntities = {
@@ -1502,10 +1509,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
 			}
@@ -1548,10 +1555,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
 			}
@@ -1604,10 +1611,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
 			}
@@ -1888,10 +1895,10 @@ sap.ui.define([
 		var done = assert.async();
 		oModel.read("/ProductSet('AD-1000')", {
 			success: function() {
-				oModel.setDeferredBatchGroups(["myId"]);
-				oModel.setChangeBatchGroups({
+				oModel.setDeferredGroups(["myId"]);
+				oModel.setChangeGroups({
 					"Product": {
-						batchGroupId: "myId",
+						groupId: "myId",
 						changeSetId: "Test",
 						single: true
 					}
@@ -1959,7 +1966,7 @@ sap.ui.define([
 		oModel.read("/ProductSet('HT-1000')");
 		oModel.read("/ProductSet('AD-1000')", {
 			success: function() {
-				sap.ui.getCore().getMessageManager().addMessages([oMessage, oMessage2, oMessage3]);
+				Messaging.addMessages([oMessage, oMessage2, oMessage3]);
 				oModel.setProperty("/ProductSet('AD-1000')/Name", "NewName");
 				oModel.setProperty("/ProductSet('HT-1000')/Name", "NewName");
 				assert.ok(oModel.hasPendingChanges(), "model has pending changes");
@@ -1986,6 +1993,7 @@ sap.ui.define([
 		});
 	});
 
+	/** @deprecated As of version 1.95.0, reason sap.ui.model.odata.v2.ODataModel#deleteCreatedEntry */
 	QUnit.test("test oDataModel deleteCreatedEntry - messages should be deleted", function(assert) {
 		var done = assert.async();
 		oModel.metadataLoaded().then(function() {
@@ -2006,7 +2014,7 @@ sap.ui.define([
 				target: oContextPath,
 				processor: oModel
 			});
-			sap.ui.getCore().getMessageManager().addMessages([oMessage, oMessage2]);
+			Messaging.addMessages([oMessage, oMessage2]);
 			assert.ok(oModel.hasPendingChanges(), "model has pending changes");
 			assert.ok(oModel.getMessagesByEntity(oContextPath), "Messages set");
 			assert.strictEqual(oModel.getMessagesByEntity(oContextPath).length, 2, "2 Messages set");
@@ -2043,7 +2051,7 @@ sap.ui.define([
 		oModel.read("/ProductSet('HT-1000')");
 		oModel.read("/ProductSet('AD-1000')", {
 			success: function() {
-				sap.ui.getCore().getMessageManager().addMessages([oMessage, oMessage2, oMessage3]);
+				Messaging.addMessages([oMessage, oMessage2, oMessage3]);
 				oModel.setProperty("/ProductSet('AD-1000')/Name", "NewName");
 				oModel.setProperty("/ProductSet('HT-1000')/Name", "NewName");
 				assert.ok(oModel.hasPendingChanges(), "model has pending changes");
@@ -2096,7 +2104,7 @@ sap.ui.define([
 		oModel.read("/ProductSet('HT-1000')");
 		oModel.read("/ProductSet('AD-1000')", {
 			success: function() {
-				sap.ui.getCore().getMessageManager().addMessages([oMessage, oMessage2, oMessage3]);
+				Messaging.addMessages([oMessage, oMessage2, oMessage3]);
 				oModel.setProperty("/ProductSet('AD-1000')/Name", "NewName");
 				oModel.setProperty("/ProductSet('HT-1000')/Name", "NewName");
 				assert.ok(oModel.hasPendingChanges(), "model has pending changes");
@@ -2165,8 +2173,8 @@ sap.ui.define([
 		var bSetProp = false;
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -2199,8 +2207,8 @@ sap.ui.define([
 		oModel.setUseBatch(false);
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -2236,10 +2244,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
 					}
@@ -2283,10 +2291,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
 					}
@@ -2342,10 +2350,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
 					}
@@ -2420,10 +2428,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
 					}
@@ -2559,10 +2567,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
 					}
@@ -2641,10 +2649,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
 					}
@@ -2839,10 +2847,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
 					}
@@ -2925,10 +2933,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
 					}
@@ -3116,10 +3124,10 @@ sap.ui.define([
 		var bSuccess2 = false;
 		var oContext;
 
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -3187,8 +3195,8 @@ sap.ui.define([
 		var oContext;
 
 		// make request non deferred...
-		oModel.setChangeBatchGroups({
-			"*" : {batchgroupId : "myId"}
+		oModel.setChangeGroups({
+			"*" : {groupId : "myId"}
 
 		});
 
@@ -3231,14 +3239,15 @@ sap.ui.define([
 		oModel.metadataLoaded().then(fnTest);
 	});
 
+	/** @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.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -3292,14 +3301,15 @@ sap.ui.define([
 		oModel.metadataLoaded().then(fnTest);
 	});
 
+	/** @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.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: true
 			}
@@ -3558,7 +3568,7 @@ sap.ui.define([
 		var done = assert.async();
 		var oRefreshSpy = sinon.spy(oModel, "_refresh");
 		oModel.setUseBatch(true);
-		oModel.setDeferredBatchGroups(["myId1"]);
+		oModel.setDeferredGroups(["myId1"]);
 
 		changeOperation(true, false, function(oData, oResponse) {
 			setTimeout(function() { // Because _refresh might get triggered *after*
@@ -3575,7 +3585,7 @@ sap.ui.define([
 		var done = assert.async();
 		var oRefreshSpy = sinon.spy(oModel, "_refresh");
 		oModel.setUseBatch(true);
-		oModel.setDeferredBatchGroups(["myId1"]);
+		oModel.setDeferredGroups(["myId1"]);
 
 		changeOperation(false, true, function(oData, oResponse) {
 			setTimeout(function() { // Because _refresh might get triggered *after*
@@ -3592,7 +3602,7 @@ sap.ui.define([
 		var done = assert.async();
 		var oRefreshSpy = sinon.spy(oModel, "_refresh");
 		oModel.setUseBatch(true);
-		oModel.setDeferredBatchGroups(["myId1"]);
+		oModel.setDeferredGroups(["myId1"]);
 
 		changeOperation(true, undefined, function(oData, oResponse) {
 			setTimeout(function() { // Because _refresh might get triggered *after*
@@ -3609,7 +3619,7 @@ sap.ui.define([
 		var done = assert.async();
 		var oRefreshSpy = sinon.spy(oModel, "_refresh");
 		oModel.setUseBatch(true);
-		oModel.setDeferredBatchGroups(["myId1"]);
+		oModel.setDeferredGroups(["myId1"]);
 
 		changeOperation(false, undefined, function(oData, oResponse) {
 			setTimeout(function() { // Because _refresh might get triggered *after*
@@ -3626,7 +3636,7 @@ sap.ui.define([
 	QUnit.test("test oDataModel submitChanges remember bRefreshAfterChange flag in batch mode", function(assert) {
 		var done = assert.async();
 		var oRefreshSpy = sinon.spy(oModel, "_refresh");
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.setRefreshAfterChange(true);
 
 		oModel.update("/ProductSet('AD-1000')", {
@@ -4335,7 +4345,7 @@ sap.ui.define([
 		var iReqSent = 0;
 		var iReqFailed = 0;
 		var sReqId = null;
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.read("/ProductSet", {
 			success : function(oData, oResponse) {
 				assert.ok(false, "request succeeded...error expected");
@@ -4418,7 +4428,7 @@ sap.ui.define([
 		var iReqSent = 0;
 		var iReqFailed = 0;
 		var sReqId = null;
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.read("/ProductSet", {
 			success : function(oData, oResponse) {
 				assert.ok(false, "request succeeded...error expected");
@@ -5722,7 +5732,7 @@ sap.ui.define([
 	QUnit.test("test abort of deferred batch request", function(assert) {
 		var done = assert.async();
 		var oAbort = {};
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.read("/ProductSet('HT-1001')", {
 			success : function() {
 			},
@@ -5759,7 +5769,7 @@ sap.ui.define([
 		var iAbort = 0;
 		var iBatchComp = 0;
 		var oAbort = {};
-		oModel.setDeferredBatchGroups([ "myId1" ]);
+		oModel.setDeferredGroups([ "myId1" ]);
 		oModel.read("/ProductSet('HT-1001')", {
 			success : function() {
 				iSuccess++;
@@ -6200,10 +6210,10 @@ sap.ui.define([
 		var done = assert.async();
 		var oContext;
 
-		oModel.setDeferredBatchGroups(["myId"]);
-		oModel.setChangeBatchGroups({
+		oModel.setDeferredGroups(["myId"]);
+		oModel.setChangeGroups({
 			"Product": {
-				batchGroupId: "myId",
+				groupId: "myId",
 				changeSetId: "Test",
 				single: false
 			}