@openui5/sap.ui.core 1.118.0 → 1.119.0

package/test/sap/ui/core/qunit/component/Models.qunit.js

@@ -48,6 +48,9 @@ sap.ui.define([
 		spyModels: function() {
 			BaseConfig._.invalidate();
 			this.modelSpy = {
+				/**
+				 * @deprecated As of version 1.48
+				 */
 				odata: sinon.spy(sap.ui.model.odata, "ODataModel"),
 				odataV2: sinon.spy(sap.ui.model.odata.v2, "ODataModel"),
 				odataV4: sinon.spy(sap.ui.model.odata.v4, "ODataModel"),
@@ -154,6 +157,9 @@ sap.ui.define([
 						"sap/ui/core/CustomData",
 						"sap/ui/core/mvc/XMLView",
 						"sap/ui/core/routing/Router",
+						/**
+						 * @deprecated As of version 1.66
+						 */
 						"sap/ui/model/odata/ODataAnnotations"
 					], function() {
 						resolve();
@@ -183,18 +189,22 @@ sap.ui.define([
 
 			this.oComponent = oComponent;
 
-			// sap.ui.model.odata.ODataModel
-			sinon.assert.callCount(this.modelSpy.odata, 1);
-
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
+			/**
+			 * @deprecated As of version 1.48
+			 */
+			if ( this.modelSpy.odata ) {
+				// sap.ui.model.odata.ODataModel
+				sinon.assert.callCount(this.modelSpy.odata, 1);
+
+				// model: "ODataModel"
+				sinon.assert.calledWithExactly(this.modelSpy.odata, {
+					serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
+					annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
+					useBatch: false,
+					refreshAfterChange: false,
+					json: true
+				});
+			}
 
 			// sap.ui.model.odata.v2.ODataModel
 			sinon.assert.callCount(this.modelSpy.odataV2, 9);
@@ -360,6 +370,9 @@ sap.ui.define([
 				"": ODataModelV2,
 				"default-with-annotations": ODataModelV2,
 				"old-uri-syntax": ODataModelV2,
+				/**
+				 * @deprecated As of version 1.48
+				 */
 				"ODataModel": ODataModelV1,
 				"v2-ODataModel": ODataModelV2,
 				"invalid-annotations": ODataModelV2,
@@ -402,6 +415,9 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// model: "ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odata, {
 				serviceUrl: '/path/to/odata/service;o=BLA_123?sap-client=foo&sap-server=bar',
@@ -477,6 +493,9 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// model: "ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odata, {
 				serviceUrl: '/path/to/odata/service;o=STARTUP456?sap-client=foo&sap-server=bar',
@@ -557,6 +576,9 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// V1 ODataModel should not be affected by cache tokens
 			// model: "ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odata, {
@@ -637,6 +659,9 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// V1 ODataModel should not be affected by cache tokens
 			// model: "ODataModel"
 			sinon.assert.calledWithExactly(this.modelSpy.odata, {
@@ -752,18 +777,23 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			// sap.ui.model.odata.ODataModel
-			sinon.assert.callCount(this.modelSpy.odata, 1);
-
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
-				useBatch: true,
-				skipMetadataAnnotationParsing: true,
-				refreshAfterChange: false,
-				json: true
-			});
+			/**
+			 * @deprecated As of version 1.48
+			 */
+			if ( this.modelSpy.odata ) {
+				// sap.ui.model.odata.ODataModel
+				sinon.assert.callCount(this.modelSpy.odata, 1);
+
+				// model: "ODataModel"
+				sinon.assert.calledWithExactly(this.modelSpy.odata, {
+					serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
+					annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
+					useBatch: true,
+					skipMetadataAnnotationParsing: true,
+					refreshAfterChange: false,
+					json: true
+				});
+			}
 
 
 			// sap.ui.model.odata.v2.ODataModel
@@ -914,6 +944,9 @@ sap.ui.define([
 				"": ODataModelV2,
 				"default-with-annotations": ODataModelV2,
 				"old-uri-syntax": ODataModelV2,
+				/**
+				 * @deprecated As of version 1.48
+				 */
 				"ODataModel": ODataModelV1,
 				"v2-ODataModel": ODataModelV2,
 				"invalid-annotations": ODataModelV2,
@@ -952,8 +985,12 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// sap.ui.model.odata.ODataModel
 			sinon.assert.callCount(this.modelSpy.odata, 0);
+
 			// sap.ui.model.odata.v2.ODataModel
 			sinon.assert.callCount(this.modelSpy.odataV2, 0);
 			// sap.ui.model.json.JSONModel
@@ -984,14 +1021,19 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
-			// sap.ui.model.odata.ODataModel
-			sinon.assert.callCount(this.modelSpy.odata, 1);
-
-			// model: "sfapi"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: 'test-resources/sap/ui/core/qunit/component/testdata/v1/some/odata/service',
-				json: true
-			});
+			/**
+			 * @deprecated As of version 1.48
+			 */
+			if ( this.modelSpy.odata ) {
+				// sap.ui.model.odata.ODataModel
+				sinon.assert.callCount(this.modelSpy.odata, 1);
+
+				// model: "sfapi"
+				sinon.assert.calledWithExactly(this.modelSpy.odata, {
+					serviceUrl: 'test-resources/sap/ui/core/qunit/component/testdata/v1/some/odata/service',
+					json: true
+				});
+			}
 
 
 			// sap.ui.model.resource.ResourceModel
@@ -1005,6 +1047,9 @@ sap.ui.define([
 			// check if models are set on component (and save them internally)
 			this.assertModelInstances({
 				"i18n": ResourceModel,
+				/**
+				 * @deprecated As of version 1.48
+				 */
 				"sfapi": ODataModelV1
 			});
 
@@ -1028,8 +1073,12 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
+			/**
+			 * @deprecated As of version 1.48
+			 */
 			// sap.ui.model.odata.ODataModel
 			sinon.assert.callCount(this.modelSpy.odata, 0);
+
 			// sap.ui.model.odata.v2.ODataModel
 			sinon.assert.callCount(this.modelSpy.odataV2, 0);
 			// sap.ui.model.json.JSONModel
@@ -1248,18 +1297,22 @@ sap.ui.define([
 			this.oLogSpy.restore();
 		},
 		assertAll: function(assert) {
-			// sap.ui.model.odata.ODataModel
-			sinon.assert.callCount(this.modelSpy.odata, 1);
-
-			// model: "ODataModel"
-			sinon.assert.calledWithExactly(this.modelSpy.odata, {
-				serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
-				annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
-				useBatch: false,
-				refreshAfterChange: false,
-				json: true
-			});
-
+			/**
+			 * @deprecated As of version 1.48
+			 */
+			if ( this.modelSpy.odata ) {
+				// sap.ui.model.odata.ODataModel
+				sinon.assert.callCount(this.modelSpy.odata, 1);
+
+				// model: "ODataModel"
+				sinon.assert.calledWithExactly(this.modelSpy.odata, {
+					serviceUrl: '/path/to/odata/service?sap-client=foo&sap-server=bar',
+					annotationURI: [ '/path/to/odata/annotations/1', 'test-resources/sap/ui/core/qunit/component/testdata/v2models/parent/path/to/local/odata/annotations/2' ],
+					useBatch: false,
+					refreshAfterChange: false,
+					json: true
+				});
+			}
 
 			// sap.ui.model.odata.v2.ODataModel
 			sinon.assert.callCount(this.modelSpy.odataV2, 9);
@@ -1406,6 +1459,9 @@ sap.ui.define([
 				"": ODataModelV2,
 				"default-with-annotations": ODataModelV2,
 				"old-uri-syntax": ODataModelV2,
+				/**
+				 * @deprecated As of version 1.48
+				 */
 				"ODataModel": ODataModelV1,
 				"v2-ODataModel": ODataModelV2,
 				"invalid-annotations": ODataModelV2,
@@ -3744,6 +3800,9 @@ sap.ui.define([
 						"sap/ui/core/CustomData",
 						"sap/ui/core/mvc/XMLView",
 						"sap/ui/core/routing/Router",
+						/**
+						 * @deprecated As of version 1.66
+						 */
 						"sap/ui/model/odata/ODataAnnotations"
 					], function() {
 						resolve();

package/test/sap/ui/core/qunit/component/UIComponent.qunit.js

@@ -3,10 +3,11 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/mvc/View",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, ManagedObject, Component, ComponentContainer, UIComponent, View, nextUIUpdate) {
+], function(Log, ManagedObject, Component, ComponentContainer, Element, UIComponent, View, nextUIUpdate) {
 
 	"use strict";
 	/*global sinon, QUnit*/
@@ -145,7 +146,7 @@ sap.ui.define([
 
 			assert.equal(oComponent.getAutoPrefixId(), false, "AutoPrefixId is false!");
 
-			var oButton = sap.ui.getCore().byId("theButton");
+			var oButton = Element.getElementById("theButton");
 			assert.ok(!!oButton, "Button was prefixed with Component id!");
 
 			oComponentContainer.destroy();
@@ -169,7 +170,7 @@ sap.ui.define([
 
 			assert.equal(oComponent.getAutoPrefixId(), true, "AutoPrefixId is true!");
 
-			var oButton = sap.ui.getCore().byId(oComponent.createId("theButton"));
+			var oButton = Element.getElementById(oComponent.createId("theButton"));
 			assert.ok(!!oButton, "Button was prefixed with Component id!");
 
 			oComponentContainer.destroy();
@@ -193,7 +194,7 @@ sap.ui.define([
 
 			assert.equal(oComponent.getAutoPrefixId(), false, "AutoPrefixId is false!");
 
-			var oButton = sap.ui.getCore().byId("theButton");
+			var oButton = Element.getElementById("theButton");
 			assert.ok(!!oButton, "Button was not prefixed with Component id!");
 
 			oComponentContainer.destroy();
@@ -853,6 +854,9 @@ sap.ui.define([
 						"type": "sap.ui.model.resource.ResourceModel",
 						"uri": "i18n/i18n.properties"
 					},
+					/**
+					 * @deprecated as of version 1.48
+					 */
 					"odm1": {
 						"type": "sap.ui.model.odata.ODataModel",
 						"uri": "./some/odata/service"
@@ -860,6 +864,10 @@ sap.ui.define([
 					"odm2": {
 						"type": "sap.ui.model.odata.v2.ODataModel",
 						"uri": "./some/odata/service"
+					},
+					"odm4": {
+						"type": "sap.ui.model.odata.v4.ODataModel",
+						"uri": "./some/odata/service/"
 					}
 				},
 				"routing": {
@@ -889,14 +897,22 @@ sap.ui.define([
 					assert.ok(requireSpy.calledWith(["sap/ui/core/mvc/JSONView"]), "JSONView type required");
 					assert.ok(requireSpy.calledWith(["sap/ui/model/resource/ResourceModel"]), "ResourceModel required");
 					assert.ok(requireSpy.calledWith(["sap/ui/core/routing/Router"]), "Router loaded");
+					/**
+					 * @deprecated as of version 1.48
+					 */
 					assert.ok(requireSpy.calledWith(["sap/ui/model/odata/ODataModel"]), "ODataModel required");
 					assert.ok(requireSpy.calledWith(["sap/ui/model/odata/v2/ODataModel"]), "ODataModel v2 required");
+					assert.ok(requireSpy.calledWith(["sap/ui/model/odata/v4/ODataModel"]), "ODataModel v4 required");
 
 					assert.ok(sap.ui.require("sap/ui/core/mvc/JSONView"), "JSONView type loaded");
 					assert.ok(sap.ui.require("sap/ui/model/resource/ResourceModel"), "ResourceModel loaded");
 					assert.ok(sap.ui.require("sap/ui/core/routing/Router"), "Router loaded");
+					/**
+					 * @deprecated as of version 1.48
+					 */
 					assert.ok(sap.ui.require("sap/ui/model/odata/ODataModel"), "ODataModel loaded");
 					assert.ok(sap.ui.require("sap/ui/model/odata/v2/ODataModel"), "ODataModel v2 loaded");
+					assert.ok(sap.ui.require("sap/ui/model/odata/v4/ODataModel"), "ODataModel v4 loaded");
 
 					UIComponent.apply(this, arguments);
 				}

package/test/sap/ui/core/qunit/component/UIComponent_unavoidablySync.qunit.js

@@ -2,11 +2,12 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/ComponentContainer",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/mvc/View",
 	"sap/base/Log",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Component, ManagedObject, ComponentContainer, UIComponent, View, Log, nextUIUpdate) {
+], function(Component, ManagedObject, ComponentContainer, Element, UIComponent, View, Log, nextUIUpdate) {
 
 	"use strict";
 	/*global sinon, QUnit*/
@@ -149,7 +150,7 @@ sap.ui.define([
 
 		assert.equal(oComponent.getAutoPrefixId(), false, "AutoPrefixId is false!");
 
-		var oButton = sap.ui.getCore().byId("theButton");
+		var oButton = Element.getElementById("theButton");
 		assert.ok(!!oButton, "Button was prefixed with Component id!");
 
 		oComponentContainer.destroy();
@@ -174,7 +175,7 @@ sap.ui.define([
 
 		assert.equal(oComponent.getAutoPrefixId(), true, "AutoPrefixId is true!");
 
-		var oButton = sap.ui.getCore().byId(oComponent.createId("theButton"));
+		var oButton = Element.getElementById(oComponent.createId("theButton"));
 		assert.ok(!!oButton, "Button was prefixed with Component id!");
 
 		oComponentContainer.destroy();
@@ -199,7 +200,7 @@ sap.ui.define([
 
 		assert.equal(oComponent.getAutoPrefixId(), false, "AutoPrefixId is false!");
 
-		var oButton = sap.ui.getCore().byId("theButton");
+		var oButton = Element.getElementById("theButton");
 		assert.ok(!!oButton, "Button was not prefixed with Component id!");
 
 		oComponentContainer.destroy();

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component1/manifest.json

@@ -7,7 +7,8 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
-				"sap.tnt": {}
+				"sap.tnt": {},
+				"sap.ui.core": {}
 			},
 			"components": {
 				"sap.ui.test.dependencyLoading.component2": {}

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component2/manifest.json

@@ -6,6 +6,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		}

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component3/manifest.json

@@ -6,6 +6,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},
@@ -16,7 +17,7 @@
 			"css": [{
 				"uri": "css/comp3extended.css"
 			}],
-			
+
 			"js": [{
 				"uri": "scripts/component3_1_extendedScript.js"
 			}]

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component4/manifest.json

@@ -6,6 +6,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.table": {}
 			}
 		},

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component5/manifest.json

@@ -6,6 +6,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},
@@ -16,7 +17,6 @@
 			"css": [{
 				"uri": "css/comp5extended.css"
 			}],
-			
 			"js": [{
 				"uri": "scripts/component5_1_extendedSyncScript.js"
 			}]

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/component6/manifest.json

@@ -6,6 +6,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.table": {}
 			}
 		},

package/test/sap/ui/core/qunit/component/testdata/dependencyLoading/componentVariant/manifest.json

@@ -7,6 +7,7 @@
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.table": {}
 			}
 		},

package/test/sap/ui/core/qunit/component/testdata/v2asyncRootView/manifest.json

@@ -57,7 +57,7 @@
 				"uri": "i18n/i18n.properties"
 			},
 			"sfapi": {
-				"type": "sap.ui.model.odata.ODataModel",
+				"type": "sap.ui.model.odata.v2.ODataModel",
 				"uri": "./some/odata/service"
 			}
 		},

package/test/sap/ui/core/qunit/component/testdata/v2inline/Component.js

@@ -65,7 +65,7 @@ sap.ui.define(['sap/ui/core/UIComponent'],
 							"uri": "i18n/i18n.properties"
 						},
 						"sfapi": {
-							"type": "sap.ui.model.odata.ODataModel",
+							"type": "sap.ui.model.odata.v2.ODataModel",
 							"uri": "./some/odata/service"
 						}
 					},

package/test/sap/ui/core/qunit/composite/XMLComposite.qunit.js

@@ -1,5 +1,5 @@
 sap.ui.define([
-	"sap/ui/qunit/QUnitUtils", "sap/ui/core/Core",
+	"sap/ui/qunit/QUnitUtils", "sap/ui/core/Core", "sap/ui/core/Element",
 	"sap/ui/core/util/XMLPreprocessor", "sap/ui/core/XMLComposite", "sap/ui/core/mvc/Controller",
 	"sap/ui/model/json/JSONModel", "sap/ui/core/Item", "sap/m/Text", "composites/SimpleText",
 	"composites/SortedList", "composites/TextButton", "composites/TextList",
@@ -9,7 +9,7 @@ sap.ui.define([
 	"composites/WrapperLayouter", "composites/TranslatableText", "composites/TranslatableTextLib",
 	"composites/TranslatableTextBundle",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function (QUnitUtils, Core, XMLPreprocessor, XMLComposite, Controller, JSONModel, Item,
+], function (QUnitUtils, Core, Element, XMLPreprocessor, XMLComposite, Controller, JSONModel, Item,
 			 Text, SimpleText, SortedList, TextButton, TextList, ForwardText, Field, HiddenMetadata,
 			 TemplateTest, ChildOfAbstract, TextToggleButton, TextToggleButtonNested,
 			 TextToggleButtonForwarded, WrapperLayouter, TranslatableText, TranslatableTextLib,
@@ -38,7 +38,7 @@ sap.ui.define([
 		assert.strictEqual(this.oXMLComposite.bIsDestroyed, true, "The XMLComposite control is destroyed");
 		assert.strictEqual(oInnerText.bIsDestroyed, true, "The text is destroyed");
 		assert.strictEqual(oInnerText.getParent(), undefined, "Inner Control has no parent anymore");
-		assert.strictEqual(Core.byId(oInnerText.getId()), undefined, "Inner Control is destroyed");
+		assert.strictEqual(Element.getElementById(oInnerText.getId()), undefined, "Inner Control is destroyed");
 		try {
 			oInnerText.placeAt("qunit-fixture");
 			assert.ok(false, "This is not supposed to happen");
@@ -187,7 +187,7 @@ sap.ui.define([
 		this.oText.destroy();
 		assert.strictEqual(this.oXMLComposite.getText(), null, "The text is destroyed and the forwarded is null");
 		assert.strictEqual(this.oText.getParent(), undefined, "Inner Control has no parent anymore"); //remember: oInnerText===oText
-		assert.strictEqual(Core.byId(this.oText.getId()), undefined, "Inner Control is destroyed");
+		assert.strictEqual(Element.getElementById(this.oText.getId()), undefined, "Inner Control is destroyed");
 		try {
 			this.oText.placeAt("qunit-fixture");
 			assert.ok(false);
@@ -276,7 +276,7 @@ sap.ui.define([
 				assert.strictEqual(this.oXMLComposite.getTextItems()[j], oInnerVBox.getItems()[j], "Forwarding has reflected the destroy correctly");
 			}
 			assert.strictEqual(this.aTexts[i].getParent(), undefined, "Inner Control has no parent anymore");
-			assert.strictEqual(Core.byId(this.aTexts[i].getId()), undefined, "Inner Control is destroy");
+			assert.strictEqual(Element.getElementById(this.aTexts[i].getId()), undefined, "Inner Control is destroy");
 			try {
 				this.aTexts[i].placeAt("qunit-fixture");
 			} catch (ex) {

package/test/sap/ui/core/qunit/internal/1RingModels.qunit.html

@@ -20,6 +20,7 @@
 		<script src="resources/ui5loader.js"></script>
 		<script src="test-resources/sap/ui/core/qunit/internal/1Ring_handleAbort.js"></script>
 		<script id="sap-ui-bootstrap" src="resources/ui5loader-autoconfig.js"
+			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
 			data-sap-ui-libs="sap.m"
 			data-sap-ui-resourceroots='{
@@ -33,13 +34,11 @@
 		<script src="resources/sap/ui/qunit/qunit-junit.js"></script>
 		<script src="resources/sap/ui/qunit/QUnitUtils.js"></script>
 		<script src="resources/sap/ui/qunit/sinon-qunit-bridge.js"></script>
-		<script src="resources/sap/ui/qunit/qunit-coverage.js"
-			data-cover-flags="branchTracking"
+		<script src="resources/sap/ui/test/ModuleTracking.js"></script>
+		<script src="resources/sap/ui/qunit/qunit-coverage-istanbul.js"
 			data-sap-ui-cover-never="[.qunit.js]"
-			data-sap-ui-cover-only="[/odata/type/,AnnotationHelper,BindingParser,ExpressionParser,ODataMetaModel]">
+			data-sap-ui-cover-only="[ExpressionParser,/date/CalendarUtils,UI5Date,CompositeType,/model/_Helper,AnnotationHelper,ODataMetaModel,/odata/type/,/v2/Context,_CreatedContextsCache,/type/DateTime,/type/DateTimeInterval,/type/Time,/type/TimeInterval]">
 		</script>
-		<script src="resources/sap/ui/test/BranchTracking.js"
-			data-threshold="100"></script>
 
 		<script src="test-resources/sap/ui/core/qunit/internal/1RingModels.qunit.js"></script>
 	</head>

package/test/sap/ui/core/qunit/internal/1RingModels.qunit.js

@@ -85,6 +85,7 @@ sap.ui.require([
 		"sap/ui/core/qunit/model/_Helper.qunit",
 		"sap/ui/core/qunit/model/Binding.qunit",
 		"sap/ui/core/qunit/model/ClientListBinding.qunit",
+		"sap/ui/core/qunit/model/ClientPropertyBinding.qunit",
 		"sap/ui/core/qunit/model/ClientTreeBinding.qunit",
 		"sap/ui/core/qunit/model/ClientTreeBindingAdapter.qunit",
 		"sap/ui/core/qunit/model/CompositeDataState.qunit",

package/test/sap/ui/core/qunit/internal/AnnotationParser.qunit.html

@@ -13,6 +13,7 @@
 
 		<script src="test-resources/sap/ui/core/shared-config.js"></script>
 		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
+			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
 			data-sap-ui-resourceRoots='{
 				"sap.ui.core.qunit" : "test-resources/sap/ui/core/qunit"
@@ -25,11 +26,10 @@
 		<script src="resources/sap/ui/qunit/qunit-junit.js"></script>
 		<script src="resources/sap/ui/qunit/QUnitUtils.js"></script>
 		<script src="resources/sap/ui/qunit/sinon-qunit-bridge.js"></script>
-		<script src="resources/sap/ui/qunit/qunit-coverage.js"
-			data-cover-flags="branchTracking"
+		<!-- TODO: remove data-uncaught-in-promise attribute after tests have been fixed -->
+		<script src="resources/sap/ui/test/ModuleTracking.js" data-uncaught-in-promise="true"></script>
+		<script src="resources/sap/ui/qunit/qunit-coverage-istanbul.js"
 			data-sap-ui-cover-only="sap/ui/model/odata/AnnotationParser"></script>
-		<script src="resources/sap/ui/test/BranchTracking.js"
-			data-uncaught-in-promise="true"></script>
 
 		<script src="test-resources/sap/ui/core/qunit/internal/AnnotationParser.qunit.js"></script>
 	</head>