@openui5/sap.ui.core 1.119.1 → 1.120.1

package/test/sap/ui/core/qunit/Core_unavoidablyUsingEval.qunit.js

@@ -6,8 +6,9 @@ sap.ui.require([
 	'sap/base/util/LoaderExtensions',
 	'sap/base/i18n/ResourceBundle',
 	'sap/base/Log',
-	'sap/ui/core/Configuration'
-], function(jQuery, ObjectPath, LoaderExtensions, ResourceBundle, Log, Configuration) {
+	'sap/ui/core/Configuration',
+	'sap/ui/core/Lib'
+], function(jQuery, ObjectPath, LoaderExtensions, ResourceBundle, Log, Configuration, Library) {
 	"use strict";
 
 	QUnit.assert.isLibLoaded = function(libName) {
@@ -126,7 +127,7 @@ sap.ui.require([
 		// Currently, it is still done synchronously in initLibrary based on initLibrary data.
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 
 		this.spy(sap.ui.loader._, 'loadJSResourceAsync');
 		this.spy(sap.ui, 'require');
@@ -183,7 +184,7 @@ sap.ui.require([
 			// TODO (sync initLibrary) sinon.assert.calledWith(sap.ui.require, ['testlibs/scenario1/lib7/library']);
 
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 
 	});
@@ -199,7 +200,7 @@ sap.ui.require([
 	QUnit.test("multiple libraries (sync, preloads are active)", function(assert) {
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 
 		this.spy(sap.ui, 'requireSync');
 
@@ -238,7 +239,7 @@ sap.ui.require([
 		assert.isLibLoaded('testlibs.scenario2.lib7');
 		sinon.assert.calledWith(sap.ui.requireSync, sinon.match(/scenario2\/lib7\/library-preload$/));
 
-		this.oConfigurationGetPreloadStub.restore();
+		this.oLibraryGetPreloadStub.restore();
 	});
 
 	/*
@@ -247,7 +248,7 @@ sap.ui.require([
 	QUnit.test("multiple libraries, one missing (async, preloads are active)", function(assert) {
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['testlibs.scenario3.lib1', 'testlibs.scenario3.lib2']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -258,7 +259,7 @@ sap.ui.require([
 			assert.ok(typeof e === 'object' && /failed to/.test(e.message), "rejected Promise should report an error");
 			// TODO check that only lib4 failed
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -268,7 +269,7 @@ sap.ui.require([
 	QUnit.test("two libraries, depending on each other (lib cycle, but not module cycle, async, preloads are active)", function(assert) {
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['testlibs.scenario4.lib1', 'testlibs.scenario4.lib2']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -278,7 +279,7 @@ sap.ui.require([
 		}, function(e) {
 			assert.ok(false, "Promise for libs with cyclic dependency should not be rejected");
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -310,7 +311,7 @@ sap.ui.require([
 		this.spy(Log, 'warning');
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['testlibs.scenario5.lib1', 'testlibs.scenario5.lib3']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -330,7 +331,7 @@ sap.ui.require([
 		}, function(e) {
 			assert.ok(false, "Promise for async loading should be fulfilled even when sync loading conflicts with it");
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -345,7 +346,7 @@ sap.ui.require([
 	QUnit.test("suppress access to js file by configuration", function(assert) {
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 
 		this.spy(sap.ui, 'requireSync');
 		sap.ui.getCore().loadLibraries([ { name: 'testlibs.scenario6.lib1', json: true } ], { async: false });
@@ -357,7 +358,7 @@ sap.ui.require([
 			assert.isLibLoaded('testlibs.scenario6.lib2');
 			sinon.assert.notCalled(sap.ui.loader._.loadJSResourceAsync);
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 
 	});
@@ -424,7 +425,7 @@ sap.ui.require([
 		this.server.respondWith(/my\/lib3\/library\.js/, makeLib('my.lib3'));
 		this.server.respondWith(/my\/lib4\/library\.js/, makeLib('my.lib4'));
 
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("off");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("off");
 		var vResult = sap.ui.getCore().loadLibraries(['my.lib3', 'my.lib4']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -432,7 +433,7 @@ sap.ui.require([
 			assert.isLibLoaded('my.lib3');
 			assert.isLibLoaded('my.lib4');
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -441,7 +442,7 @@ sap.ui.require([
 		this.server.respondWith(/my\/lib5\/library-preload\.json/, makeLibPreloadJSON('my.lib5'));
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['my.non.existing.lib', 'my.lib5']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -451,7 +452,7 @@ sap.ui.require([
 			assert.ok(true, "Promise for missing library should be rejected");
 			assert.ok(typeof e === 'object' && /failed to/.test(e.message), "rejected Promise should report an error");
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -459,7 +460,7 @@ sap.ui.require([
 
 		this.server.respondWith(/my\/lib6\/library\.js/, makeLib('my.lib6'));
 
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("off");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("off");
 		var vResult = sap.ui.getCore().loadLibraries(['my.lib6', 'my.non.existing.lib2']);
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -469,7 +470,7 @@ sap.ui.require([
 			assert.ok(true, "Promise for missing library should be rejected");
 			assert.ok(typeof e === 'object' && /failed to/.test(e.message), "rejected Promise should report an error");
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -479,7 +480,7 @@ sap.ui.require([
 		this.server.respondWith(/my\/lib13\/library-preload\.json/, makeLibPreloadJSON('my.lib13'));
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['my.lib12', 'my.lib13'], { preloadOnly: true });
 		assert.ok(vResult instanceof Promise, "async call to loadLibraries should return a promise");
 
@@ -491,7 +492,7 @@ sap.ui.require([
 			assert.ok(!sap.ui.getCore().getLoadedLibraries()['my.lib13'], "Core should not know or report lib13 as 'loaded'");
 			assert.ok(jQuery.sap.isResourceLoaded('my/lib13/library.js'), "lib13 library module should be preloaded");
 		}).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 
@@ -501,13 +502,13 @@ sap.ui.require([
 		this.server.respondWith(/my\/lib8\/library-preload\.json/, makeLibPreloadJSON('my.lib8'));
 
 		// sync or async both activate the preload
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 		var vResult = sap.ui.getCore().loadLibraries(['my.lib7', 'my.lib8'], { async: false });
 		assert.ok(vResult == null, "sync call to loadLibraries must not return a value");
 		assert.isLibLoaded('my.lib7');
 		assert.isLibLoaded('my.lib8');
 
-		this.oConfigurationGetPreloadStub.restore();
+		this.oLibraryGetPreloadStub.restore();
 	});
 
 	QUnit.test("multiple libraries (sync, existing, preload off)", function(assert) {
@@ -515,20 +516,20 @@ sap.ui.require([
 		this.server.respondWith(/my\/lib9\/library\.js/, makeLib('my.lib9'));
 		this.server.respondWith(/my\/lib10\/library\.js/, makeLib('my.lib10'));
 
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("off");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("off");
 		var vResult = sap.ui.getCore().loadLibraries(['my.lib9', 'my.lib10'], { async: false });
 		assert.ok(vResult == null, "sync call to loadLibraries must not return a value");
 		assert.isLibLoaded('my.lib9');
 		assert.isLibLoaded('my.lib10');
 
-		this.oConfigurationGetPreloadStub.restore();
+		this.oLibraryGetPreloadStub.restore();
 	});
 
 	QUnit.test("multiple libraries, one missing (sync, non-existing)", function(assert) {
 
 		this.server.respondWith(/my\/lib11\/library\.js/, makeLib('my.lib11'));
 
-		this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("off");
+		this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("off");
 		try {
 			sap.ui.getCore().loadLibraries(['my.non.existing.lib3', 'my.lib11'], { async: false });
 			assert.ok(false, "sync loadLibraries for missing lib must not succeed");
@@ -537,7 +538,7 @@ sap.ui.require([
 			assert.ok(typeof e === 'object' && /failed to/.test(e.message), "exception should report an error");
 		}
 
-		this.oConfigurationGetPreloadStub.restore();
+		this.oLibraryGetPreloadStub.restore();
 	});
 
 	// ---------------------------------------------------------------------------
@@ -571,7 +572,7 @@ sap.ui.require([
 			sap.ui.versioninfo = versioninfo;
 
 			// sync or async both activate the preload
-			this.oConfigurationGetPreloadStub = sinon.stub(Configuration, "getPreload").returns("sync");
+			this.oLibraryGetPreloadStub = sinon.stub(Library, "getPreloadMode").returns("sync");
 
 			this.spy(sap.ui.loader._, 'loadJSResourceAsync');
 			this.spy(sap.ui, 'require');
@@ -629,7 +630,7 @@ sap.ui.require([
 
 			});
 		}.bind(this)).finally(function () {
-			this.oConfigurationGetPreloadStub.restore();
+			this.oLibraryGetPreloadStub.restore();
 		}.bind(this));
 	});
 

package/test/sap/ui/core/qunit/DataState.qunit.js

@@ -9,6 +9,9 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.DataState", {
+		before() {
+			this.__ignoreIsolatedCoverage__ = true;
+		},
 		beforeEach : function () {
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
@@ -99,8 +102,8 @@ sap.ui.define([
 	//*********************************************************************************************
 [
 	{controlMessages : ["aControlMessages"], modelMessages : ["aModelMessages"]},
-	{controlMessages : ["aControlMessages"], modelMessages : undefined},
-	{controlMessages : undefined, modelMessages : ["aModelMessages"]}
+	{controlMessages : ["aControlMessages"], modelMessages : []},
+	{controlMessages : [], modelMessages : ["aModelMessages"]}
 ].forEach(function (oFixture, i) {
 	QUnit.test("getMessagesForProperties, " + i, function(assert) {
 		var aConcatCalls,
@@ -134,8 +137,8 @@ sap.ui.define([
 	QUnit.test("getMessagesForProperties, no messages", function(assert) {
 		var oConcatSpy = this.spy(Array.prototype, "concat"),
 			mProperties = {
-				controlMessages : undefined,
-				modelMessages : undefined
+				controlMessages : [],
+				modelMessages : []
 			},
 			oSortSpy = this.spy(Array.prototype, "sort");
 

package/test/sap/ui/core/qunit/DuplicateIds.qunit.js

@@ -7,6 +7,9 @@ sap.ui.define([
 	var oListItem;
 	var oListItem2;
 
+	/**
+	 * @deprecated As of Version 1.120.
+	 */
 	// check default settings
 	QUnit.test("Default Settings", function(assert) {
 		assert.expect(1);

package/test/sap/ui/core/qunit/DuplicateIds_noError.qunit.js

@@ -1,4 +1,8 @@
 /*global QUnit */
+/**
+ * @fileoverview
+ * @deprecated As of version 1.120.0
+ */
 sap.ui.define([
 	"sap/ui/core/ListItem", "sap/ui/core/Configuration"
 ], function(ListItem, Configuration) {

package/test/sap/ui/core/qunit/Element_metadata_renderer.qunit.js

@@ -315,10 +315,16 @@ sap.ui.define([
 			done = assert.async();
 
 		sap.ui.require(["testdata/core/testdata/MyControl"], function(MyControl) {
+			/**
+			 * @deprecated Sync loading is deprecated
+			 */
 			var oSyncLoadSpy = that.spy(sap.ui, "requireSync");
 
 			var oRenderer = MyControl.getMetadata().getRenderer();
 			assert.ok(oRenderer, "Renderer can be found");
+			/**
+			 * @deprecated Sync loading is deprecated
+			 */
 			assert.notOk(oSyncLoadSpy.called, "Renderer shouldn't be loaded synchronously");
 
 			done();

package/test/sap/ui/core/qunit/ExpressionParser.qunit.js

@@ -10,13 +10,15 @@ sap.ui.define([
 	"sap/ui/core/Icon",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/model/json/JSONModel",
+	"sap/ui/performance/Measurement",
+	"sap/ui/thirdparty/URI",
+	// following imports are only used while dynamically evaluating expressions
 	"sap/ui/model/odata/ODataUtils",
 	"sap/ui/model/odata/type/String",
 	"sap/ui/model/type/Integer",
-	"sap/ui/performance/Measurement",
-	"sap/ui/thirdparty/URI"
-], function (Log, JSTokenizer, BindingInfo, BindingParser, ExpressionParser, Icon,
-		InvisibleText, JSONModel, ODataUtils, StringType, Integer, Measurement, URI) {
+	"sap/ui/thirdparty/URITemplate"
+], function (Log, JSTokenizer, BindingInfo, BindingParser, ExpressionParser, Icon, InvisibleText,
+		JSONModel, Measurement, URI) {
 	/*global QUnit, sinon */
 	/*eslint no-warning-comments: 0 */
 	"use strict";
@@ -606,113 +608,170 @@ sap.ui.define([
 	}]);
 
 	//*********************************************************************************************
-[true, false].forEach(function (bPreloaded) {
-	QUnit.test("odata.compare, bPreloaded=" + bPreloaded, function (assert) {
-		var oDataUtils = {
-				compare : function () {}
-			},
-			oSapUiMock = this.mock(sap.ui);
-
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/model/odata/v4/ODataUtils")
-			.returns(bPreloaded ? oDataUtils : undefined);
-		oSapUiMock.expects("requireSync")
-			.withExactArgs("sap/ui/model/odata/v4/ODataUtils")
-			.exactly(bPreloaded ? 0 : 1)
-			.returns(oDataUtils);
+	QUnit.test("odata.compare, ODataUtils is loaded", function (assert) {
+		const oDataUtils = {compare() {}};
+		const oSapUiMock = this.mock(sap.ui);
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/v4/ODataUtils").returns(oDataUtils);
 		this.mock(oDataUtils).expects("compare").withExactArgs(2, 3).returns("-1");
 		// While destroying the control used in the check function, require is sometimes called
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/ResizeHandler")
-			.atLeast(0)
-			.callThrough();
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/FocusHandler")
-			.atLeast(0)
-			.callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
 
 		// code under test
 		check(assert, "{=odata.compare(2,3)}", "-1");
 	});
-});
 
 	//*********************************************************************************************
-[true, false].forEach(function (bPreloaded) {
-	QUnit.test("odata.uriEncode, bPreloaded=" + bPreloaded, function (assert) {
-		var oDataUtils = {
-				formatValue : function () {}
-			},
-			oSapUiMock = this.mock(sap.ui);
-
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/model/odata/ODataUtils")
-			.returns(bPreloaded ? oDataUtils : undefined);
-		oSapUiMock.expects("requireSync")
-			.withExactArgs("sap/ui/model/odata/ODataUtils")
-			.exactly(bPreloaded ? 0 : 1)
-			.returns(oDataUtils);
-		this.mock(oDataUtils).expects("formatValue")
-			.withExactArgs("foo", "Edm.String")
-			.returns("'foo'");
+	QUnit.test("odata.compare throws error if ODataUtils is not loaded", function (assert) {
+		const oSapUiMock = this.mock(sap.ui);
+
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/v4/ODataUtils").returns(undefined);
+		/** @deprecated As of version 1.120.0 */
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/model/odata/v4/ODataUtils").returns(undefined);
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+		const sExpression = "{=odata.compare(2,3)}";
+		this.oLogMock.expects("warning").withExactArgs("TypeError: Expression uses 'odata.compare' which requires"
+				+ " to import 'sap/ui/model/odata/v4/ODataUtils' in advance",
+				sExpression,
+				"sap.ui.base.ExpressionParser");
+
+		// code under test
+		check(assert, sExpression, "undefined");
+	});
+	/** @deprecated As of version 1.120.0 */
+	QUnit.test("odata.compare, load ODataUtils on demand", function (assert) {
+		const oDataUtils = {compare() {}};
+		const oSapUiMock = this.mock(sap.ui);
+
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/v4/ODataUtils").returns(undefined);
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/model/odata/v4/ODataUtils").returns(oDataUtils);
+		this.mock(oDataUtils).expects("compare").withExactArgs(2, 3).returns("-1");
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+
+		// code under test
+		check(assert, "{=odata.compare(2,3)}", "-1");
+	});
+
+	//*********************************************************************************************
+	QUnit.test("odata.uriEncode, ODataUtils is loaded", function (assert) {
+		const oDataUtils = {formatValue() {}};
+		const oSapUiMock = this.mock(sap.ui);
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/ODataUtils").returns(oDataUtils);
+		this.mock(oDataUtils).expects("formatValue").withExactArgs("foo", "Edm.String").returns("'foo'");
 		// While destroying the control used in the check function, require is sometimes called
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/ResizeHandler")
-			.atLeast(0)
-			.callThrough();
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/FocusHandler")
-			.atLeast(0)
-			.callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
 
 		// code under test
 		check(assert, "{=odata.uriEncode('foo', 'Edm.String')}", "'foo'");
 	});
-});
 
 	//*********************************************************************************************
-[true, false].forEach(function (bPreloaded) {
-	QUnit.test("odata.fillUriTemplate, bPreloaded=" + bPreloaded, function (assert) {
-		var oOriginalExpand = URI.expand,
-			oSapUiMock = this.mock(sap.ui),
-			oURI = {
-				expand : function () {}
-			};
+	QUnit.test("odata.uriEncode throws error if ODataUtils is not loaded", function (assert) {
+		const oSapUiMock = this.mock(sap.ui);
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/ODataUtils").returns(undefined);
+		/** @deprecated As of version 1.120.0 */
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/model/odata/ODataUtils").returns(undefined);
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+		const sExpression = "{=odata.uriEncode('foo', 'Edm.String')}";
+		this.oLogMock.expects("warning").withExactArgs("TypeError: Expression uses 'odata.uriEncode' which requires"
+				+ " to import 'sap/ui/model/odata/ODataUtils' in advance",
+				sExpression,
+				"sap.ui.base.ExpressionParser");
 
-		oSapUiMock.expects("requireSync")
-			.withExactArgs("sap/ui/thirdparty/URITemplate")
-			.exactly(bPreloaded ? 0 : 1)
-			.callsFake(function () {
-				URI.expand = oURI.expand;
+		// code under test
+		check(assert, sExpression, "undefined");
+	});
+	/** @deprecated As of version 1.120.0 */
+	QUnit.test("odata.uriEncode, load ODataUtils on demand", function (assert) {
+		const oDataUtils = {formatValue() {}};
+		const oSapUiMock = this.mock(sap.ui);
+		oSapUiMock.expects("require").withExactArgs("sap/ui/model/odata/ODataUtils").returns(undefined);
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/model/odata/ODataUtils").returns(oDataUtils);
+		this.mock(oDataUtils).expects("formatValue").withExactArgs("foo", "Edm.String").returns("'foo'");
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
 
-				return "~URITemplate";
-			});
-		this.mock(oURI).expects("expand")
-			.withExactArgs("http://foo/{t},{m}", {m : "tel", t : "mail"})
+		// code under test
+		check(assert, "{=odata.uriEncode('foo', 'Edm.String')}", "'foo'");
+	});
+
+	//*********************************************************************************************
+	QUnit.test("odata.fillUriTemplate, URITemplate is loaded", function (assert) {
+		const oOriginalExpand = URI.expand;
+		const oSapUiMock = this.mock(sap.ui);
+		const oURI = {expand() {}};
+		this.mock(oURI).expects("expand").withExactArgs("http://foo/{t},{m}", {m : "tel", t : "mail"})
+			.returns("http://foo/mail,tel");
+		URI.expand = oURI.expand;
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/Messaging").atLeast(0).callThrough();
+
+		// code under test
+		check(assert, "{=odata.fillUriTemplate('http://foo/{t},{m}', {'t': ${/mail}, 'm': ${/tel}})}",
+			"http://foo/mail,tel");
+
+		// cleanup
+		URI.expand = oOriginalExpand;
+	});
+
+	//*********************************************************************************************
+	QUnit.test("odata.fillUriTemplate throws error if URITemplate is not loaded", function (assert) {
+		const oOriginalExpand = URI.expand;
+		const oSapUiMock = this.mock(sap.ui);
+		/** @deprecated As of version 1.120.0 */
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/thirdparty/URITemplate");
+		URI.expand = undefined;
+		// While destroying the control used in the check function, require is sometimes called
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/Messaging").atLeast(0).callThrough();
+		const sExpression = "{=odata.fillUriTemplate('http://foo/{t},{m}', {'t': ${/mail}, 'm': ${/tel}})}";
+		this.oLogMock.expects("warning").withExactArgs("TypeError: Expression uses 'odata.fillUriTemplate' which"
+			+ " requires to import 'sap/ui/thirdparty/URITemplate' in advance",
+			sExpression,
+			"sap.ui.base.ExpressionParser");
+
+		// code under test
+		check(assert,sExpression, "");
+
+		// cleanup
+		URI.expand = oOriginalExpand;
+	});
+	/** @deprecated As of version 1.120.0 */
+	QUnit.test("odata.fillUriTemplate, load URITemplate on demand", function (assert) {
+		const oOriginalExpand = URI.expand;
+		const oSapUiMock = this.mock(sap.ui);
+		const oURI = {expand() {}};
+		oSapUiMock.expects("requireSync").withExactArgs("sap/ui/thirdparty/URITemplate").callsFake(function () {
+			URI.expand = oURI.expand;
+
+			return "~URITemplate";
+		});
+		this.mock(oURI).expects("expand").withExactArgs("http://foo/{t},{m}", {m : "tel", t : "mail"})
 			.returns("http://foo/mail,tel");
-		URI.expand = bPreloaded ? oURI.expand : undefined;
+		URI.expand = undefined;
 		// While destroying the control used in the check function, require is sometimes called
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/ResizeHandler")
-			.atLeast(0)
-			.callThrough();
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/FocusHandler")
-			.atLeast(0)
-			.callThrough();
-		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/Messaging")
-			.atLeast(0)
-			.callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/ResizeHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/FocusHandler").atLeast(0).callThrough();
+		oSapUiMock.expects("require").withExactArgs("sap/ui/core/Messaging").atLeast(0).callThrough();
 
 		// code under test
-		check(assert,
-			"odata.fillUriTemplate('http://foo/{t},{m}', {'t': ${/mail}, 'm': ${/tel}})",
+		check(assert,"{=odata.fillUriTemplate('http://foo/{t},{m}', {'t': ${/mail}, 'm': ${/tel}})}",
 			"http://foo/mail,tel");
 
 		// cleanup
 		URI.expand = oOriginalExpand;
 	});
-});
 
 	//*********************************************************************************************
 	QUnit.test("errors during evaluation", function (assert) {