@openui5/sap.ui.core 1.122.0 → 1.123.0

package/test/sap/ui/core/qunit/model/PropertyBinding.qunit.js

@@ -89,4 +89,292 @@ sap.ui.define([
 
 		assert.strictEqual(oPropertyBinding.fnTypeChangedCallback, "~fnCallback");
 	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: no type", function (assert) {
+		const oPropertyBinding = {getDataState() {}, setValue() {}};
+		const oDataState = {setInvalidValue() {}};
+		this.mock(oPropertyBinding).expects("getDataState").withExactArgs().returns(oDataState);
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs(undefined);
+		this.mock(oPropertyBinding).expects("setValue").withExactArgs("~vValue");
+
+		// code under test
+		assert.strictEqual(
+			PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", "~fnParse"), undefined);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, sync", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			getDataState() {},
+			setValue() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns("~vParsedValue");
+		this.mock(oType).expects("validateValue").withExactArgs("~vParsedValue").returns();
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs(undefined);
+		oPropertyBindingMock.expects("setValue").withExactArgs("~vParsedValue");
+
+		// code under test
+		assert.strictEqual(
+			PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse), undefined);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, sync, error in fnParse", function (assert) {
+		const oPropertyBinding = {
+			oType: "~oType",
+			checkDataState() {},
+			getDataState() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oHelper = {fnParse() {}};
+		const oError = new Error("~oParseError");
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").throws(oError);
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		assert.throws(() => {
+			// code under test
+			PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+		}, oError);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, sync, error in validateValue", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			checkDataState() {},
+			getDataState() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns("~vParsedValue");
+		const oError = new Error("~oValidateError");
+		this.mock(oType).expects("validateValue").withExactArgs("~vParsedValue").throws(oError);
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		assert.throws(() => {
+			// code under test
+			PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+		}, oError);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, sync, error in setValue", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			checkDataState() {},
+			getDataState() {},
+			setValue() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns("~vParsedValue");
+		this.mock(oType).expects("validateValue").withExactArgs("~vParsedValue").returns();
+		const oDataStateMock = this.mock(oDataState);
+		oDataStateMock.expects("setInvalidValue").withExactArgs(undefined);
+		const oError = new Error("~oError");
+		oPropertyBindingMock.expects("setValue").withExactArgs("~vParsedValue").throws(oError);
+		oDataStateMock.expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		assert.throws(() => {
+			// code under test
+			PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+		}, oError);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, async", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			getDataState() {},
+			setValue() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		let fnParseResolve;
+		const oParseValuePromise = new Promise(function(resolve, rejected) {
+			fnParseResolve = resolve;
+		});
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns(oParseValuePromise);
+		const oTypeMock = this.mock(oType);
+		oTypeMock.expects("validateValue").never();
+		let bResolved = false;
+
+		// code under test
+		const oPromise = PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+		oPromise.then(() => {
+			bResolved = true;
+		});
+
+		assert.notOk(bResolved);
+
+		let fnValidateResolve;
+		const oValidateValuePromise = new Promise((resolve, rejected) => {
+			fnValidateResolve = resolve;
+		});
+		oTypeMock.expects("validateValue").withExactArgs("~vParsedValue").returns(oValidateValuePromise);
+
+		// code under test
+		fnParseResolve("~vParsedValue");
+
+		assert.notOk(bResolved);
+
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs(undefined);
+		oPropertyBindingMock.expects("setValue").withExactArgs("~vParsedValue");
+
+		// code under test
+		fnValidateResolve();
+
+		return oPromise.then((vResult) => {
+			assert.strictEqual(vResult, undefined);
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, async, fnParse rejects", function (assert) {
+		const oPropertyBinding = {
+			oType: "~oType",
+			checkDataState() {},
+			getDataState() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		let fnParseReject;
+		const oParseValuePromise = new Promise((resolve, rejected) => {
+			fnParseReject = rejected;
+		});
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns(oParseValuePromise);
+
+		// code under test
+		const oPromise = PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		// code under test
+		fnParseReject("~Error");
+
+		return oPromise.then(() => {
+			assert.ok(false);
+		}, (oException) => {
+			assert.strictEqual(oException, "~Error");
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, async, validateValue rejects", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			checkDataState() {},
+			getDataState() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		let fnParseResolve;
+		const oParseValuePromise = new Promise((resolve, rejected) => {
+			fnParseResolve = resolve;
+		});
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns(oParseValuePromise);
+		const oTypeMock = this.mock(oType);
+		oTypeMock.expects("validateValue").never();
+
+		// code under test
+		const oPromise = PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+
+		let fnValidateReject;
+		const oValidateValuePromise = new Promise(function(resolve, rejected) {
+			fnValidateReject = rejected;
+		});
+		oTypeMock.expects("validateValue").withExactArgs("~vParsedValue").returns(oValidateValuePromise);
+
+		// code under test
+		fnParseResolve("~vParsedValue");
+
+		this.mock(oDataState).expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		// code under test
+		fnValidateReject("~Error");
+
+		return oPromise.then(() => {
+			assert.ok(false);
+		}, (oException) => {
+			assert.strictEqual(oException, "~Error");
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_setBoundValue: with type, async, error in setValue", function (assert) {
+		const oType = {validateValue() {}};
+		const oPropertyBinding = {
+			oType: oType,
+			checkDataState() {},
+			getDataState() {},
+			setValue() {}
+		};
+		const oDataState = {setInvalidValue() {}};
+		const oPropertyBindingMock = this.mock(oPropertyBinding);
+		oPropertyBindingMock.expects("getDataState").withExactArgs().returns(oDataState);
+		let fnParseResolve;
+		const oParseValuePromise = new Promise(function(resolve, rejected) {
+			fnParseResolve = resolve;
+		});
+		const oHelper = {fnParse() {}};
+		this.mock(oHelper).expects("fnParse").withExactArgs("~vValue").returns(oParseValuePromise);
+		const oTypeMock = this.mock(oType);
+		oTypeMock.expects("validateValue").never();
+
+		// code under test
+		const oPromise = PropertyBinding.prototype._setBoundValue.call(oPropertyBinding, "~vValue", oHelper.fnParse);
+
+		let fnValidateResolve;
+		const oValidateValuePromise = new Promise((resolve, rejected) => {
+			fnValidateResolve = resolve;
+		});
+		oTypeMock.expects("validateValue").withExactArgs("~vParsedValue").returns(oValidateValuePromise);
+
+		// code under test
+		fnParseResolve("~vParsedValue");
+
+		const oDataStateMock = this.mock(oDataState);
+		oDataStateMock.expects("setInvalidValue").withExactArgs(undefined);
+		const oError = new Error("~oError");
+		oPropertyBindingMock.expects("setValue").withExactArgs("~vParsedValue").throws(oError);
+		oDataStateMock.expects("setInvalidValue").withExactArgs("~vValue");
+		oPropertyBindingMock.expects("checkDataState").withExactArgs();
+
+		// code under test
+		fnValidateResolve();
+
+		return oPromise.then(() => {
+			assert.ok(false);
+		}, (oException) => {
+			assert.strictEqual(oException, oError);
+		});
+	});
 });

package/test/sap/ui/core/qunit/model/controlhelper/TreeBindingProxy.qunit.js

@@ -256,6 +256,12 @@ sap.ui.define([
 			"Binding#setAggregation called with the correct parameters if expandTo changes");
 		assert.ok(oRefreshSpy.notCalled, "Binding#refresh not called if expandTo changes");
 
+		oSetAggregationSpy.resetHistory();
+		oRefreshSpy.resetHistory();
+		this.oProxy.collapseAll();
+		assert.ok(oSetAggregationSpy.notCalled, "Binding#setAggregation not called if expandTo doesn't change");
+		assert.ok(oRefreshSpy.calledOnceWithExactly(), "Binding#refresh called if expandTo doesn't change");
+
 		oSetAggregationSpy.restore();
 		oRefreshSpy.restore();
 	});
@@ -269,6 +275,12 @@ sap.ui.define([
 			"Binding#setAggregation called with the correct parameters if expandTo changes");
 		assert.ok(oRefreshSpy.notCalled, "Binding#refresh not called if expandTo changes");
 
+		oSetAggregationSpy.resetHistory();
+		oRefreshSpy.resetHistory();
+		this.oProxy.expandToLevel(2);
+		assert.ok(oSetAggregationSpy.notCalled, "Binding#setAggregation not called if expandTo doesn't change");
+		assert.ok(oRefreshSpy.calledOnceWithExactly(), "Binding#refresh called if expandTo doesn't change");
+
 		oSetAggregationSpy.restore();
 		oRefreshSpy.restore();
 	});

package/test/sap/ui/core/qunit/mvc/Controller.qunit.js

@@ -440,7 +440,10 @@ sap.ui.define([
 				}
 			});
 		});
-		// @deprecated
+
+		/**
+		 * @deprecated
+		 */
 		const oErrorLogSpy = sinon.spy(Log, "error");
 		const oFatalLogSpy = sinon.spy(Log, "fatal");
 		const oView = await XMLView.create({
@@ -459,7 +462,9 @@ sap.ui.define([
 		oView.destroy();
 		assert.ok(oFatalLogSpy.getCall(3).calledWith("[FUTURE FATAL] The registered Event Listener 'onExit' must not have a return value."), "Correct Fatal Log displayed");
 
-		// @deprecated
+		/**
+		 * @deprecated
+		 */
 		await (async () => {
 			await Promise.allSettled(aPromises);
 			assert.equal(oErrorLogSpy.callCount, 2, "Two error logs should occur reg. rejected Promises.");

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

@@ -11315,74 +11315,257 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 	//*********************************************************************************************
 	// Scenario: Do not show more decimal places than available for the amount/quantity part
+	// Observe different formats if the scale of the amount part type's changes
 	// JIRA: CPOUI5MODELS-1600
-	QUnit.test("OData UnitType with unit decimals places > measure scale", function (assert) {
-		const oModel = createModel("/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?CPOUI5MODELS-1600=true",
+	QUnit.test("CPOUI5MODELS-1600: UnitType with unit decimals places > measure scale", function (assert) {
+		const URLParameter = "CPOUI5MODELS-1600=true"; // unqiue URL for each test needed
+		const oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${URLParameter}`,
 				{defaultBindingMode : "TwoWay", tokenHandling : false});
-		const sView = '\
-<FlexBox binding="{/ProductSet(\'P1\')}">\
-	<Input id="weight" value="{\
-		parts : [{\
-			constraints : {precision : 13, scale : 3},\
-			path : \'WeightMeasure\',\
-			type : \'sap.ui.model.odata.type.Decimal\'\
-		}, {\
-			path : \'WeightUnit\',\
-			type : \'sap.ui.model.odata.type.String\'\
-		}, {\
-			mode : \'OneTime\',\
-			path : \'/##@@requestUnitsOfMeasure\',\
-			targetType : \'any\'\
-		}],\
-		mode : \'TwoWay\',\
-		type : \'sap.ui.model.odata.type.Unit\'\
-	}" />\
-</FlexBox>';
-		let oControl;
+		const sView = `\
+<FlexBox binding="{/ProductSet('P1')}">
+	<Input id="weight" value="{
+		parts : [{
+			constraints : {precision : 13, scale : 3},
+			path : 'WeightMeasure',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			path : 'WeightUnit',
+			type : 'sap.ui.model.odata.type.String'
+		}, {
+			mode : 'OneTime',
+			path : '/##@@requestUnitsOfMeasure',
+			targetType : 'any'
+		}],
+		mode : 'TwoWay',
+		type : 'sap.ui.model.odata.type.Unit',
+		formatOptions : {preserveDecimals : false}
+	}"/>
+</FlexBox>`;
+		let oBindingPart;
+		this.expectRequest(`ProductSet('P1')?${URLParameter}`, {
+				ProductID : "P1",
+				WeightMeasure : "12.341",
+				WeightUnit : "KWH"
+			})
+			.expectRequest(`SAP__UnitsOfMeasure?${URLParameter}&$skip=0&$top=5000`, {
+				results : [{
+					DecimalPlaces : 7, // more decimals than WeightMeasure's scale
+					ExternalCode : "KWH"
+				}]
+			})
+			.expectValue("weight", "12.341 KWH"); // amount type's scale wins
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oBindingPart = this.oView.byId("weight").getBinding("value").getBindings()[0];
+			this.expectValue("weight", "12.3410000 KWH");
+
+			// code under test
+			oBindingPart.setType(new Decimal(undefined, {precision : 13, scale : "variable"}));
+
+			return this.waitForChanges(assert, "change scale to variable -> unit's decimals wins");
+		}).then(() => {
+			this.expectValue("weight", "12.34 KWH");
+
+			// code under test
+			oBindingPart.setType(new Decimal(undefined, {precision : 13, scale : 2}));
+
+			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
+		}).then(() => {
+			this.expectValue("weight", "12.3410000 KWH");
+
+			// code under test
+			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
+
+			return this.waitForChanges(assert, "change scale to undefined -> unit's decimals wins");
+		});
+	});
 
-		this.expectRequest("ProductSet('P1')?CPOUI5MODELS-1600=true", {
+	//*********************************************************************************************
+	// Scenario: Do not show more decimal places than available for the amount/quantity part
+	// Show that the Unit amount is formatted properly regarding the decimal places depending on:
+	// a) the maxFractionDigits formatOption for the unit type
+	// 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
+[
+	{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
+].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 oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${sURLParameter}`,
+			{defaultBindingMode : "TwoWay", tokenHandling : false});
+		const sScaleConstraint = iScale ? `, scale : ${iScale}` : "";
+		const sMaxFractionDigitsOption = iMaxFractionDigits ? `, maxFractionDigits : ${iMaxFractionDigits}` : "";
+		const sView = `\
+<FlexBox binding="{/ProductSet('P1')}">
+	<Input id="weight" value="{
+		parts : [{
+			constraints : {precision : 13${sScaleConstraint}},
+			path : 'WeightMeasure',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			path : 'WeightUnit',
+			type : 'sap.ui.model.odata.type.String'
+		}, {
+			mode : 'OneTime',
+			path : '/##@@requestUnitsOfMeasure',
+			targetType : 'any'
+		}],
+		mode : 'TwoWay',
+		type : 'sap.ui.model.odata.type.Unit',
+		formatOptions : {preserveDecimals : false${sMaxFractionDigitsOption}}
+	}"/>\
+</FlexBox>`;
+
+		this.expectRequest(`ProductSet('P1')?${sURLParameter}`, {
 				ProductID : "P1",
-				WeightMeasure : "12.34",
+				WeightMeasure : "12.341",
 				WeightUnit : "KWH"
 			})
-			.expectRequest("SAP__UnitsOfMeasure?CPOUI5MODELS-1600=true&$skip=0&$top=5000", {
+			.expectRequest(`SAP__UnitsOfMeasure?${sURLParameter}&$skip=0&$top=5000`, {
 				results : [{
-					DecimalPlaces : 99, // more decimals than WeightMeasure's scale
+					DecimalPlaces : 7, // more decimals than WeightMeasure's scale
 					ExternalCode : "KWH",
 					ISOCode : "KWH",
 					Text : "Kilowatt hour",
 					UnitCode : "KWH"
 				}]
 			})
-			.expectValue("weight", "12.340 KWH");
+			.expectValue("weight", sExpected);
 
-		return this.createView(assert, sView, oModel).then(() => {
-			oControl = this.oView.byId("weight");
+		return this.createView(assert, sView, oModel);
+	});
+});
 
-			this.expectValue("weight", "23.456 KWH");
+	//*********************************************************************************************
+	// Scenario: Do not show more decimal places than available for the amount/quantity part.
+	// Observe different formats if the scale of the amount part type changes
+	// JIRA: CPOUI5MODELS-1619
+	QUnit.test("CPOUI5MODELS-1619: CurrencyType with currency decimals places > measure scale", function (assert) {
+		const sURLParameter = "CPOUI5MODELS-1619=true"; // unqiue URL for each test needed
+		const oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${sURLParameter}`,
+			{defaultBindingMode : "TwoWay", tokenHandling : false});
+		const sView = `\
+<FlexBox binding="{/ProductSet('P1')}">
+	<Input id="price" value="{
+		parts : [{
+			constraints : {precision : 5, scale : 3},
+			path : 'Price',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			path : 'CurrencyCode',
+			type : 'sap.ui.model.odata.type.String'
+		}, {
+			mode : 'OneTime',
+			path : '/##@@requestCurrencyCodes',
+			targetType : 'any'
+		}],
+		mode : 'TwoWay',
+		type : 'sap.ui.model.odata.type.Currency',
+		formatOptions : {preserveDecimals : false}
+	}"/>
+</FlexBox>`;
+		let oBindingPart;
+		this.expectRequest(`ProductSet('P1')?${sURLParameter}`, {
+				ProductID : "P1",
+				Price : "12.341",
+				CurrencyCode : "FOO"
+			})
+			.expectRequest(`SAP__Currencies?${sURLParameter}&$skip=0&$top=5000`, {
+				results : [{
+					CurrencyCode : "FOO",
+					DecimalPlaces : 7 // more decimals than Price's scale
+				}]
+			})
+			.expectValue("price", "12.341\u00a0FOO");
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oBindingPart = this.oView.byId("price").getBinding("value").getBindings()[0];
+			this.expectValue("price", "12.3410000\u00a0FOO");
 
 			// code under test
-			oControl.setValue("23.456 KWH");
+			oBindingPart.setType(new Decimal(undefined, {precision : 13, scale : "variable"}));
 
-			return this.waitForChanges(assert);
+			return this.waitForChanges(assert, "change scale to variable -> currency's decimals wins");
 		}).then(() => {
-			this.expectValue("weight", "0.000 KWH")
-				.expectValue("weight", "0.000 KWH"); // twice because 2 parts changed
+			this.expectValue("price", "12.34\u00a0FOO");
 
 			// code under test
-			oControl.setValue("");
+			oBindingPart.setType(new Decimal(undefined, {precision : 13, scale : 2}));
 
-			return this.waitForChanges(assert);
+			return this.waitForChanges(assert, "change scale to 2 -> amount type's scale wins");
 		}).then(() => {
-			this.expectValue("weight", "0.00 KWH");
+			this.expectValue("price", "12.3410000\u00a0FOO");
 
-			// code under test (change WeightMeasure's type, scale is now 2)
-			oControl.getBinding("value").getBindings()[0].setType(new Decimal(undefined, {precision : 13, scale : 2}));
+			// code under test
+			oBindingPart.setType(new Decimal(undefined, {precision : 13}));
 
-			return this.waitForChanges(assert);
+			return this.waitForChanges(assert, "change scale to undefined -> currency's decimals wins");
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: Do not show more decimal places than available for the amount/quantity part.
+	// Show that the currency amount is formatted properly regarding the decimal places depending on:
+	// a) the maxFractionDigits formatOption for the unit type
+	// b) the amount part data type's scale and
+	// with a fix currency decimal places of 7 for the used currency
+	// JIRA: CPOUI5MODELS-1600
+[
+	{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
+].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
+		const oModel = createModel(`/sap/opu/odata/sap/ZUI5_GWSAMPLE_BASIC/?${sURLParameter}`,
+			{defaultBindingMode : "TwoWay", tokenHandling : false});
+		const sScaleConstraint = iScale ? `, scale : ${iScale}` : "";
+		const sMaxFractionDigitsOption = iMaxFractionDigits ? `, maxFractionDigits : ${iMaxFractionDigits}` : "";
+		const sView = `\
+<FlexBox binding="{/ProductSet('P1')}">
+	<Input id="price" value="{
+		parts : [{
+			constraints : {precision : 13${sScaleConstraint}},
+			path : 'Price',
+			type : 'sap.ui.model.odata.type.Decimal'
+		}, {
+			path : 'CurrencyCode',
+			type : 'sap.ui.model.odata.type.String'
+		}, {
+			mode : 'OneTime',
+			path : '/##@@requestCurrencyCodes',
+			targetType : 'any'
+		}],
+		mode : 'TwoWay',
+		type : 'sap.ui.model.odata.type.Currency',
+		formatOptions : {preserveDecimals : false${sMaxFractionDigitsOption}}
+	}" />
+</FlexBox>`;
+
+		this.expectRequest(`ProductSet('P1')?${sURLParameter}`, {
+				ProductID : "P1",
+				Price : "12.341",
+				CurrencyCode : "FOO"
+			})
+			.expectRequest(`SAP__Currencies?${sURLParameter}&$skip=0&$top=5000`, {
+				results : [{
+					CurrencyCode : "FOO",
+					DecimalPlaces : 7 // more decimals than Price's scale
+				}]
+			})
+			.expectValue("price", sExpected);
+
+		return this.createView(assert, sView, oModel);
+	});
+});
+
 	//*********************************************************************************************
 	// Scenario: If the OData service has no customizing for currencies, the OData Currency type
 	// uses the UI5 built-in CLDR information for formatting and parsing.