@openui5/sap.ui.core 1.123.1 → 1.124.1

package/test/sap/ui/core/qunit/odata/v2/ODataModel.integration.qunit.js

@@ -11,10 +11,10 @@ sap.ui.define([
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Lib",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/Rendering",
@@ -38,7 +38,7 @@ sap.ui.define([
 	// load Table resources upfront to avoid loading times > 1 second for the first test using Table
 	// "sap/ui/table/Table"
 ], function (Log, Localization, merge, uid, Input, Device, ManagedObjectObserver, SyncPromise,
-		Library, coreLibrary, Messaging, UI5Date, Message, Controller, View, Rendering, BindingMode, Filter,
+		Library, Messaging, UI5Date, Message, MessageType, Controller, View, Rendering, BindingMode, Filter,
 		FilterOperator, FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Decimal,
 		Context, ODataModel, XMLModel, TestUtils, datajs, XMLHelper) {
 	/*global QUnit, sinon*/
@@ -47,7 +47,6 @@ sap.ui.define([
 
 	var sDefaultLanguage = Localization.getLanguage(),
 		sDefaultTimezone = Localization.getTimezone(),
-		MessageType = coreLibrary.MessageType, // shortcut for sap.ui.core.MessageType
 		NO_CONTENT = {/*204 no content*/},
 		sODataListBindingClassName = "sap.ui.model.odata.v2.ODataListBinding",
 		sODataMessageParserClassName = "sap.ui.model.odata.ODataMessageParser",
@@ -56,7 +55,7 @@ sap.ui.define([
 		rRowIndex = /~(\d+)~/,
 		/**
 		 * Maps back-end response severity values to the values defined in the enumeration
-		 * <code>sap.ui.core.MessageType</code>.
+		 * <code>sap/ui/core/message/MessageType</code>.
 		 */
 		mSeverityMap = {
 			error : MessageType.Error,
@@ -308,7 +307,7 @@ sap.ui.define([
 	function getTableContent(oTable) {
 		return oTable.getRows().map(function(oRow) {
 			return oRow.getCells().map(function (oCell) {
-				return oCell.getText();
+				return oCell.getText ? oCell.getText() : oCell.getValue();
 			});
 		});
 	}
@@ -11373,12 +11372,12 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
 		}).then(() => {
-			this.expectValue("weight", "12.3410000 KWH");
+			this.expectValue("weight", "12 KWH");
 
 			// code under test
 			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
 
-			return this.waitForChanges(assert, "change scale to undefined -> unit's decimals wins");
+			return this.waitForChanges(assert, "change scale to undefined -> type Decimal default scale 0 wins");
 		});
 	});
 
@@ -11389,15 +11388,17 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// b) the amount part data type's scale and
 	// with a fix unit decimal places of 7 for the used unit code
 	// JIRA: CPOUI5MODELS-1600
+	// SNOW: DINC0152691 => consider scale default value 0 for sap.ui.model.odata.type.Decimal
 [
 	{iMaxFractionDigits: 1, iScale: 3, sExpected: "12.3 KWH"},  // maxFractionDigits wins
 	{iMaxFractionDigits: 9, iScale: 3, sExpected: "12.3410000 KWH"}, // unit's decimal places wins
 	{iMaxFractionDigits: undefined, iScale: 3, sExpected: "12.341 KWH"}, // scale wins
 	{iMaxFractionDigits: undefined, iScale: "'variable'", sExpected: "12.3410000 KWH"}, // unit's decimal places wins
-	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12.3410000 KWH"} // unit's decimal places wins
+	// DINC0152691: Decimal type scale defaults to 0 => scale wins
+	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12 KWH"}
 ].forEach(({iMaxFractionDigits, iScale, sExpected}, i) => {
 	QUnit.test(`CPOUI5MODELS-1600: UnitType with unit maxFractionDigits, ${i}`, function (assert) {
-		const sURLParameter = "CPOUI5MODELS-1600=true" + i; // unqiue URL for each test needed
+		const sURLParameter = "CPOUI5MODELS-1600=true" + i; // unique URL for each test needed
 		const oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${sURLParameter}`,
 			{defaultBindingMode : "TwoWay", tokenHandling : false});
 		const sScaleConstraint = iScale ? `, scale : ${iScale}` : "";
@@ -11501,12 +11502,12 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
 		}).then(() => {
-			this.expectValue("price", "12.3410000\u00a0FOO");
+			this.expectValue("price", "12\u00a0FOO");
 
 			// code under test
 			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
 
-			return this.waitForChanges(assert, "change scale to undefined -> currency's decimals wins");
+			return this.waitForChanges(assert, "change scale to undefined ->  type Decimal default scale 0 wins");
 		});
 	});
 
@@ -11517,12 +11518,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// b) the amount part data type's scale and
 	// with a fix currency decimal places of 7 for the used currency
 	// JIRA: CPOUI5MODELS-1600
+	// SNOW: DINC0152691 => consider scale default value 0 for sap.ui.model.odata.type.Decimal
 [
 	{iMaxFractionDigits: 1, iScale: 3, sExpected: "12.3\u00a0FOO"},  // maxFractionDigits wins
 	{iMaxFractionDigits: 9, iScale: 3, sExpected: "12.3410000\u00a0FOO"}, // currency's decimal places wins
 	{iMaxFractionDigits: undefined, iScale: 3, sExpected: "12.341\u00a0FOO"}, // scale wins
 	{iMaxFractionDigits: undefined, iScale: "'variable'", sExpected: "12.3410000\u00a0FOO"}, // currency's decimal places wins
-	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12.3410000\u00a0FOO"} // currency's decimal places wins
+	// DINC0152691: Decimal type scale defaults to 0 => scale wins
+	{iMaxFractionDigits: undefined, iScale: undefined, sExpected: "12\u00a0FOO"}
 ].forEach(({iMaxFractionDigits, iScale, sExpected}, i) => {
 	QUnit.test(`CPOUI5MODELS-1619: CurrencyType with unit maxFractionDigits: ${i}`, function (assert) {
 		const sURLParameter = "CPOUI5MODELS-1619=" + i; // unqiue URL for each test needed
@@ -22867,4 +22870,169 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 		return this.createView(assert, sView, oModel);
 	});
+
+	//*********************************************************************************************
+	// Scenario: If a context of a property binding is changed during an asynchronous validation, the validated value is
+	// saved for the correct entity in the model.
+	// JIRA: CPOUI5MODELS-1618
+	QUnit.test("ODataPropertyBinding with asynchronous type validation", function (assert) {
+		const oModel = createSalesOrdersModel({defaultBindingMode: BindingMode.TwoWay});
+		const sView = `
+<t:Table id="table" rows="{path: '/SalesOrderSet'}" visibleRowCount="2">
+	<Input id="Note" value="{path: 'Note', type: 'sap.ui.model.type.String'}"/>
+</t:Table>`;
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$skip=0&$top=102", {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					Note: "Note1"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('2')"},
+					SalesOrderID: "2",
+					Note: "Note2"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('3')"},
+					SalesOrderID: "3",
+					Note: "Note3"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('4')"},
+					SalesOrderID: "4",
+					Note: "Note4"
+				}]
+			})
+			.expectValue("Note", ["Note1", "Note2"]);
+		let fnResolveValidateValue1, fnResolveValidateValue2, oTable, pSetExternalValue1, pSetExternalValue2, oTypeMock;
+
+		return this.createView(assert, sView, oModel).then(() => {
+			this.expectValue("Note", "Note2", 1);
+			this.expectValue("Note", "Note3", 2);
+
+			oTable = this.oView.byId("table");
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock = this.mock(oBinding.getType());
+			oTypeMock.expects("validateValue").withExactArgs("NewNote1").returns(new Promise((fnResolve) => {
+				fnResolveValidateValue1 = fnResolve;
+			}));
+			pSetExternalValue1 = oBinding.setExternalValue("NewNote1");
+			oTable.setFirstVisibleRow(1);
+
+			return this.waitForChanges(assert, "Change first entry and scroll");
+		}).then(() => {
+			this.expectValue("Note", "Note3", 2);
+			this.expectValue("Note", "Note4", 3);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock.expects("validateValue").withExactArgs("NewNote2").returns(new Promise((fnResolve) => {
+				fnResolveValidateValue2 = fnResolve;
+			}));
+			pSetExternalValue2 = oBinding.setExternalValue("NewNote2");
+			oTable.setFirstVisibleRow(2);
+
+			return this.waitForChanges(assert, "Change second entry and scroll again");
+		}).then(() => {
+			fnResolveValidateValue1();
+			fnResolveValidateValue2();
+
+			return Promise.all([pSetExternalValue1, pSetExternalValue2,
+				this.waitForChanges(assert, "Validation of the changes finished")]);
+		}).then(() => {
+			this.expectValue("Note", "NewNote1", 0);
+			this.expectValue("Note", "NewNote2", 1);
+
+			oTable.setFirstVisibleRow(0);
+
+			return this.waitForChanges(assert, "Scroll back up and see correct values");
+		});
+	});
+
+	//*********************************************************************************************
+	// Scenario: If a context of a composite binding is changed during an asynchronous validation, the validated value
+	// is saved for the correct entity in the model.
+	// JIRA: CPOUI5MODELS-1618
+	QUnit.test("CompositeBinding with asynchronous type validation", function (assert) {
+		const oModel = createSalesOrdersModel({defaultBindingMode: BindingMode.TwoWay});
+		const sView = `
+<t:Table id="table" rows="{path: '/SalesOrderSet'}" visibleRowCount="2">
+<Input id="GrossAmount" value="{
+	parts: [{path: 'GrossAmount'}, {path: 'CurrencyCode'}],
+	type: 'sap.ui.model.type.Currency'}"/>
+</t:Table>`;
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$skip=0&$top=102", {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					GrossAmount: "10",
+					CurrencyCode: "EUR"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('2')"},
+					SalesOrderID: "2",
+					GrossAmount: "5",
+					CurrencyCode: "JPY"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('3')"},
+					SalesOrderID: "3",
+					GrossAmount: "15",
+					CurrencyCode: "USD"
+				},
+				{
+					__metadata: {uri: "/SalesOrderSet('4')"},
+					SalesOrderID: "4",
+					GrossAmount: "20",
+					CurrencyCode: "USDN"
+				}]
+			});
+
+		let fnResolveValidateValue1;
+		let fnResolveValidateValue2;
+		let oTable;
+		let pSetExternalValue1;
+		let pSetExternalValue2;
+		let oTypeMock;
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+			assert.deepEqual(getTableContent(oTable), [["10.00\u00a0EUR"], ["5\u00a0JPY"]]);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock = this.mock(oBinding.getType());
+			oTypeMock.expects("validateValue").withExactArgs([16, "EUR"]).returns(new Promise((fnResolve) => {
+				fnResolveValidateValue1 = fnResolve;
+			}));
+			pSetExternalValue1 = oBinding.setExternalValue("16 EUR");
+			oTable.setFirstVisibleRow(1);
+
+			return this.waitForChanges(assert, "Change first entry and scroll");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["5\u00a0JPY"], ["15.00\u00a0USD"]]);
+
+			const oBinding = oTable.getRows()[0].getCells()[0].getBinding("value");
+			oTypeMock.expects("validateValue").withExactArgs([29, "JPY"]).returns(new Promise((fnResolve) => {
+				fnResolveValidateValue2 = fnResolve;
+			}));
+			pSetExternalValue2 = oBinding.setExternalValue("29 JPY");
+			oTable.setFirstVisibleRow(2);
+
+			return this.waitForChanges(assert, "Change second entry and scroll again");
+		}).then(() => {
+			fnResolveValidateValue1();
+			fnResolveValidateValue2();
+
+			return Promise.all([pSetExternalValue1, pSetExternalValue2,
+				this.waitForChanges(assert, "Validation of the changes finished")]);
+		}).then(() => {
+			oTable.setFirstVisibleRow(0);
+
+			return this.waitForChanges(assert, "Scroll back up and see correct values");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["16.00\u00a0EUR"], ["29\u00a0JPY"]]);
+		});
+	});
 });

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

@@ -9,9 +9,9 @@ sap.ui.define([
 	"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/message/MessageType",
 	"sap/ui/core/util/MockServer",
 	"sap/ui/model/ChangeReason",
 	"sap/ui/model/Filter",
@@ -24,13 +24,11 @@ sap.ui.define([
 	"sap/ui/table/Table",
 	"sap/ui/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
+		Messaging, Message, MessageType, MockServer, ChangeReason, Filter, Sorter, UpdateMethod,
+		ODataModel, DateTime, createAndAppendDiv, nextUIUpdate, Table, Column
 ) {
 	"use strict";
 
-	// shortcut for sap.ui.core.MessageType
-	var MessageType = library.MessageType;
 	var sServiceUri = "/SalesOrderSrv/";
 	var sDataRootPath =  "test-resources/sap/ui/core/qunit/testdata/SalesOrder/";
 	var oModel, spy;

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

@@ -6,10 +6,10 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/m/Input",
 	"sap/m/Text",
-	"sap/ui/core/library",
 	"sap/ui/core/Messaging",
 	"sap/ui/core/message/ControlMessageProcessor",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/core/util/MockServer",
 	"sap/ui/layout/VerticalLayout",
 	"sap/ui/model/DataState",
@@ -17,13 +17,10 @@ sap.ui.define([
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/type/Currency",
 	"sap/ui/model/type/Float"
-], function(Localization, deepEqual, deepExtend, Button, Input, Text, library, Messaging, ControlMessageProcessor,
-		Message, MockServer, VerticalLayout, DataState, JSONModel, ODataModel, Currency, Float) {
+], function(Localization, deepEqual, deepExtend, Button, Input, Text, Messaging, ControlMessageProcessor,
+		Message, MessageType, MockServer, VerticalLayout, DataState, JSONModel, ODataModel, Currency, Float) {
 	"use strict";
 
-	// shortcut for sap.ui.core.MessageType
-	var MessageType = library.MessageType;
-
 	//add divs for control tests
 	var oContent = document.createElement("div");
 	oContent.id = "content";