@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/table/delegates/data/tabledelegate.cds

@@ -10,7 +10,11 @@ service JestService {
             DoubleProp : Double @( Common.Label: 'Double property', Common.QuickInfo : 'Double property tooltip',);
             DecimalProp : Decimal(15,7) @( Common.Label: 'Decimal property');
             Int64Prop : Integer64 @( Common.Label: 'Integer64 property');
-            Amount: Decimal	@Measures.ISOCurrency : Unit@( Common.Label: 'Total Amount');
+            Amount: Decimal	@Measures.ISOCurrency : Currency@( Common.Label: 'Total Amount');
+            Amount2: Decimal @Measures.ISOCurrency : 'EURO';
+            Amount3: Decimal @Measures.Unit : Unit;
+            Amount4: Decimal @Measures.Unit : 'Kilogram';
+            Currency: String  @( Common.Label: 'Requested Quantity');
 	        Unit: String  @( Common.Label: 'Requested Quantity');
             ShippingDate :Date  @( Common.Label: 'Shipping date');  
             CreationDateTimestamp :Timestamp @( Common.Label: 'Creation date timestamp');
@@ -67,7 +71,10 @@ annotate JestService.SalesOrderManage with @(UI : {
             Action            : 'com.c_salesordermanage_sd.myAction',
             Inline            : true,
             IconUrl           : 'sap-icon://arrow-right'
-        }
+        },
+        {Value : Amount2},
+        {Value : Amount3},
+        {Value : Amount4}
     ],
     DataPoint #Rating          : {
             Value       : StringProp,

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FieldHelper.qunit.js

@@ -15,62 +15,6 @@ sap.ui.define(
 		"use strict";
 		var sandbox = sinon.sandbox.create();
 
-		QUnit.module("Unit Test for getRequiredForDataField");
-
-		QUnit.test("Unit test to check requiredForDataField ", function(assert) {
-			[
-				{
-					oFieldControl: "com.sap.vocabularies.Common.v1.FieldControlType/Mandatory",
-					expectedValue: false,
-					sMessage: "without editmode and with Field Control Enum Member"
-				},
-				{
-					expectedValue: false,
-					sMessage: "without Field Control and EditMode"
-				},
-				{
-					oFieldControl: "{height}",
-					expectedValue: false,
-					sMessage: "with Field Control Path without EditMode"
-				},
-				{
-					editMode: "{ui>/editMode}",
-					expectedValue: false,
-					sMessage: "without Field Control Path with EditMode"
-				},
-				{
-					sEditMode: "{ui>/editMode}",
-					oFieldControl: "com.sap.vocabularies.Common.v1.FieldControlType/Mandatory",
-					expectedValue: "{= %{ui>/editMode} === 'Editable'}",
-					sMessage: "with nullable true and Field Control Enum Member with EditMode"
-				},
-				{
-					sEditMode: "{ui>/editMode}",
-					oFieldControl: "{height}",
-					expectedValue: "{= %{height} === 7 && %{ui>/editMode} === 'Editable'}",
-					sMessage: "with Field Control Path and EditMode"
-				},
-				{
-					sEditMode: "Editable",
-					oFieldControl: "com.sap.vocabularies.Common.v1.FieldControlType/Mandatory",
-					expectedValue: true,
-					sMessage: "with nullable true and Field Control Enum Member with EditMode"
-				},
-				{
-					sEditMode: "Display",
-					expectedValue: false,
-					sMessage: "with Edit Mode as Display"
-				}
-			].forEach(function(oProperty) {
-				var actualValue = FieldHelper.getRequiredForDataField(oProperty.oFieldControl, oProperty.sEditMode);
-				assert.equal(
-					actualValue,
-					oProperty.expectedValue,
-					"Unit test to check requiredForDataField " + oProperty.sMessage + ": ok"
-				);
-			});
-		});
-
 		QUnit.module("Unit Test for getImportance");
 
 		QUnit.test("Unit test to check getImportance ", function(assert) {

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FieldHelperTemplate.qunit.js

@@ -20,296 +20,6 @@ sap.ui.define(
 			/* Define all fragment tests in this array */
 
 			var aSimpleMetadataFragmentTests = [
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "Semantic key shown as Label",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "LabelSemanticKey",
-							formatOptions: {
-								displayMode: "Value",
-								semanticKeyStyle: "Label"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"property": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/0/Value",
-								"dataField": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/0",
-								"entitySet": "/someEntitySet",
-								"entityType": "/someEntitySet/"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldLabel": {
-									"text":
-										"{= (!%{IsActiveEntity} ? !%{HasActiveEntity} ? (${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === '' || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === undefined || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === null ? 'New Object': ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}) : (${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === '' || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === undefined || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === null ? 'Unnamed Object': ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}) : (${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === '' || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === undefined || ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'} === null ? 'Unnamed Object': ${mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}))}"
-								}
-							}
-							//semantic as label
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "ObjectStatus icon binding",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "ObjectStatus",
-							formatOptions: {
-								displayMode: "Value"
-							},
-							text:
-								"{path:'PropertyString',type:'sap.ui.model.odata.type.String',formatOptions:{'parseKeepsEmptyString':true}}"
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"property": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/7/Value",
-								"dataField": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/7",
-								"entitySet": "/someEntitySet"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldObjectStatus": {
-									"icon":
-										"{= (%{propertyIcon} === 'UI.CriticalityType/Negative' || %{propertyIcon} === 1 || %{propertyIcon} === '1') ? 'sap-icon://message-error' : ((%{propertyIcon} === 'UI.CriticalityType/Critical' || %{propertyIcon} === 2 || %{propertyIcon} === '2') ? 'sap-icon://message-warning' : ((%{propertyIcon} === 'UI.CriticalityType/Positive' || %{propertyIcon} === 3 || %{propertyIcon} === '3') ? 'sap-icon://message-success' : ((%{propertyIcon} === 'UI.CriticalityType/Information' || %{propertyIcon} === 5 || %{propertyIcon} === '5') ? 'sap-icon://message-information' : '')))}",
-									"text":
-										"{path:'PropertyString',type:'sap.ui.model.odata.type.String',formatOptions:{'parseKeepsEmptyString':true}}"
-								}
-							}
-							// object status icon binding
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataField property validate contentDisplay Label text",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "LabelSemanticKey",
-							formatOptions: {
-								semanticKeyStyle: "Label"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"property": "/someEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/0/Value",
-								"dataField": "/someEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/0",
-								"entitySet": "/someEntitySetNew",
-								"entityType": "/someEntitySet/"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldLabel": {
-									"text":
-										"{mode:'TwoWay',parts:[{path:'PropertyQuantity',type:'sap.ui.model.odata.type.Decimal',constraints:{'precision':15,'scale':3},formatOptions:{'groupingEnabled':false}},{path:'PropertyUnit',type:'sap.ui.model.odata.type.String',constraints:{'maxLength':3},formatOptions:{'parseKeepsEmptyString':true,'groupingEnabled':false}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}"
-								}
-							}
-							// decimal with constraints
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataField property validate contentDisplay Label with Text annotation passed",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "LabelSemanticKey",
-							formatOptions: {
-								semanticKeyStyle: "Label"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"property": "/some2ndEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/8/Value",
-								"dataField": "/some2ndEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/8/",
-								"entitySet": "/some2ndEntitySetNew",
-								"entityType": "/some2ndEntitySetNew/"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldLabel": {
-									"text": "{ path : '_Unit/UnitOfMeasure_Text', parameters: {'$$noPatch': true}}"
-								}
-							}
-							// semantic key label with a description annotation text
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataFieldForAnnotation on a DataPoint uses ValueFormat",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "DataPoint",
-							formatOptions: {
-								displayMode: "Value"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"dataField": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/9/",
-								"entitySet": "/someEntitySet",
-								"property": "/someEntitySet/@com.sap.vocabularies.UI.v1.DataPoint#withValueFormat/Value"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataPointObjectStatus": {
-									"text":
-										"{path: 'PropertyDecimal', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 1, precision: 4}}",
-									"tooltip": "Object Status"
-								}
-							}
-							// datafield for annotation on a datapoint with value format
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.DataPoint",
-					sDescription: "DataPoint Object Number Currency validate",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							displayStyle: "DataPoint",
-							formatOptions: {
-								defaultDataPointStyle: "ObjectNumber"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"entitySet": "/someEntitySet",
-								"metaPath": "/someEntitySet/@com.sap.vocabularies.UI.v1.DataPoint#withCurrency/"
-							},
-							oExpectedResultsPerTest: {
-								"ObjectNumberCurrencyTest": {
-									"tooltip": "Object number with currency"
-								}
-							}
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.DataPoint",
-					sDescription: "DataPoint Object Number validate",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							displayStyle: "DataPoint",
-							formatOptions: {
-								defaultDataPointStyle: "ObjectNumber"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"entitySet": "/someEntitySet",
-								"metaPath": "/someEntitySet/@com.sap.vocabularies.UI.v1.DataPoint#ObjectNumber/"
-							},
-							oExpectedResultsPerTest: {
-								"ObjectNumberTest": {
-									"tooltip": "Object number"
-								}
-							}
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataField action validate",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							idPrefix: "fe::table::SalesOrderManage::LineItem::DataFieldForAction::SomeAction",
-							navigateAfterAction: "false",
-							displayStyle: "Button"
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"dataField": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/5/",
-								"entitySet": "/someEntitySet"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldActionButton": {
-									"press":
-										".editFlow.invokeAction('SomeAction', { contexts: ${$source>/}.getBindingContext(), invocationGrouping: 'Isolated', model: ${$source>/}.getModel(), label: 'BreakUp', isNavigable: false})",
-									"enabled": "true",
-									"visible": "true"
-								}
-							}
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataField for IBN validate",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							displayStyle: "Button"
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"dataField": "/someEntitySet/@com.sap.vocabularies.UI.v1.LineItem/6/"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldForIntentBasedNavigationButton": {
-									"press":
-										'._intentBasedNavigation.navigate(\'v4Freestyle\', \'Inbound\', { navigationContexts: ${$source>/}.getBindingContext(), semanticObjectMapping: \'[{"LocalProperty":{"$PropertyPath":"Delivered"},"SemanticObjectProperty":"Completed"}]\'})',
-									"visible": "true"
-								}
-							}
-						}
-					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.DataPoint",
-					sDescription: "DataPoint Rating Indicator validate",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							displayStyle: "DataPoint"
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"entitySet": "/someEntitySet",
-								"metaPath": "/someEntitySet/@com.sap.vocabularies.UI.v1.DataPoint#RatingIndicator/"
-							},
-							oExpectedResultsPerTest: {
-								"HeaderRatingIndicatorTest": {
-									"tooltip": "Rating Indicator"
-								}
-							}
-						}
-					]
-				},
 				{
 					sFragmentName: "sap.fe.macros.field.DraftPopOverAdminData",
 					sDescription: "DataPoint Draft popover validate",
@@ -335,37 +45,6 @@ sap.ui.define(
 							}
 						}
 					]
-				},
-				{
-					sFragmentName: "sap.fe.macros.internal.Field",
-					sDescription: "DataField property validate semanticKey with semanticObject",
-					fileType: "fragment",
-					mModels: {
-						"this": new JSONModel({
-							editMode: "Display",
-							wrap: true,
-							displayStyle: "ObjectIdentifier",
-							formatOptions: {
-								semanticKeyStyle: "ObjectIdentifier"
-							}
-						})
-					},
-					tests: [
-						{
-							mBindingContexts: {
-								"property": "/someEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/10/Value",
-								"dataField": "/someEntitySetNew/@com.sap.vocabularies.UI.v1.LineItem/10/",
-								"entitySet": "/someEntitySetNew",
-								"entityType": "/someEntitySetNew/"
-							},
-							oExpectedResultsPerTest: {
-								"MacroDataFieldObjectIdentifier": {
-									"titleActive":
-										"{parts:[{path:'pageInternal>semanticsTargets/someEntitySet/_someEntitySetNew_SemanticKeyWithSemanticObject/HasTargetsNotFiltered'}], formatter:'FieldRuntime.hasTargets'}"
-								}
-							}
-						}
-					]
 				}
 			];
 

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FormContainerTemplating.qunit.js

@@ -219,6 +219,7 @@ sap.ui.define(
 							mBindingContexts: {
 								"facet": "/someEntitySet/@com.sap.vocabularies.UI.v1.Facets/0/Facets/0",
 								"entitySet": "/someEntitySet",
+								"contextPath": "/someEntitySet",
 								"formContainer": "/"
 							},
 							oExpectedResultsPerTest: {

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FormTemplating.qunit.js

@@ -27,9 +27,10 @@ sap.ui.define(
 						//For macro fragements we need to simulate the this model
 						"this": new JSONModel({
 							"id": "formId",
+							"_contentId": "formId",
 							"_editable": "{ui>someModel}",
 							"idPrefix": "somePrefix",
-							"formTitle": "Title",
+							"title": "Title",
 							"partOfPreview": "true",
 							"isVisible": "true"
 						})
@@ -163,9 +164,10 @@ sap.ui.define(
 						//For macro fragements we need to simulate the this model
 						"this": new JSONModel({
 							"id": "formId",
+							"_contentId": "formId",
 							"_editable": "{ui>someModel}",
 							"idPrefix": "somePrefix",
-							"formTitle": "Title",
+							"title": "Title",
 							"useFormContainerLabels": "true",
 							"partOfPreview": "true",
 							"isVisible": "true"
@@ -300,9 +302,10 @@ sap.ui.define(
 						//For macro fragements we need to simulate the this model
 						"this": new JSONModel({
 							"id": "formId",
+							"_contentId": "formId",
 							"_editable": "{ui>someModel}",
 							"idPrefix": "somePrefix",
-							"formTitle": "Title",
+							"title": "Title",
 							"partOfPreview": "true",
 							"isVisible": "true"
 						})
@@ -436,9 +439,10 @@ sap.ui.define(
 						//For macro fragements we need to simulate the this model
 						"this": new JSONModel({
 							"id": "formId",
+							"_contentId": "formId",
 							"_editable": "{ui>someModel}",
 							"idPrefix": "somePrefix",
-							"formTitle": "Title",
+							"title": "Title",
 							"useFormContainerLabels": "true",
 							"partOfPreview": "true",
 							"isVisible": "true"
@@ -498,9 +502,10 @@ sap.ui.define(
 						//For macro fragements we need to simulate the this model
 						"this": new JSONModel({
 							"id": "formId",
+							"_contentId": "formId",
 							"_editable": "{ui>someModel}",
 							"idPrefix": "somePrefix",
-							"formTitle": "Title",
+							"title": "Title",
 							"partOfPreview": "false",
 							"isVisible": "true"
 						})

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FormTemplatingTs.qunit.js

@@ -140,7 +140,7 @@ sap.ui.define(["sap/fe/macros/internal/form/FormTemplating", "sap/ui/mdc/enum/Ed
 					navigationProperties: []
 				},
 				bExpectedValue:
-					"{= ${parts:[{value: 'formatWithBrackets'},{path:'_ShippingCondition/ShippingCondition_Text', targetType : 'any'},{path:'ShippingCondition', type : 'sap.ui.model.odata.type.String', constraints: {maxLength: 2}, formatOptions: {parseKeepsEmptyString: true}}], formatter: 'sap.fe.core.formatters.ValueFormatter'} + ' - ' + ${path: 'PurchaseOrderByCustomer', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 35}} + ''}",
+					"{= ${parts: [{value: 'formatWithBrackets'}, {path: '_ShippingCondition/ShippingCondition_Text', targetType: 'any'}, {path: 'ShippingCondition', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 2}, formatOptions: {parseKeepsEmptyString: true}}], formatter: 'sap.fe.core.formatters.ValueFormatter'} + ' - ' + ${path: 'PurchaseOrderByCustomer', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 35}} + ''}",
 				sAnnotationPathMessage: "String fields"
 			},
 			{

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/MicroChartHelperForTemplate.qunit.js

@@ -162,8 +162,7 @@ sap.ui.define(
 									"id":
 										"SalesOrder::SalesOrderManageObjectPage--fe::HeaderFacet::MicroChart::HarveyBallMicroChart::HarveyBallMicroChart",
 									"uomPath": "PropertyCurrency",
-									"binding":
-										"{ path: '', parameters : {$$groupId : '$auto.LongRunners',$select : 'propertyColor,PropertyCurrency'} }",
+									"binding": "{ path: '', parameters : {$$groupId : '$auto.LongRunners',$select : 'propertyColor'} }",
 									"visible": "true"
 								},
 								"HarveyBallMicroChart": {

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/TableRuntime.qunit.js

@@ -845,7 +845,7 @@ sap.ui.define(
 						delete actualValue.controlId;
 						assert.deepEqual(
 							JSON.stringify(actualValue),
-							JSON.stringify(oProperty.bExpectedValue),
+							JSON.stringify(oProperty),
 							"Unit test to check setContexts " + oProperty.sMessage + ": ok"
 						);
 					})