@openui5/sap.ui.core 1.119.1 → 1.120.1

package/test/sap/ui/core/qunit/bootstrap/Configuration.qunit.js

@@ -3,16 +3,18 @@ sap.ui.define([
 	'sap/ui/core/CalendarType',
 	'sap/ui/core/Configuration',
 	'sap/ui/core/Core',
+	'sap/ui/core/Lib',
 	'sap/ui/core/date/CalendarWeekNumbering',
 	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/core/Theming',
+	'sap/ui/security/Security',
 	'sap/base/config',
 	'sap/base/Log',
 	"sap/base/config/GlobalConfigurationProvider",
 	'../routing/HistoryUtils',
 	'sap/ui/base/config/URLConfigurationProvider',
 	'sap/ui/core/LocaleData' // only used indirectly via Configuration.getCalendarType
-], function(CalendarType, Configuration, Core, CalendarWeekNumbering, TimezoneUtil, Theming, BaseConfig, Log,
+], function(CalendarType, Configuration, Core, Library, CalendarWeekNumbering, TimezoneUtil, Theming, Security, BaseConfig, Log,
 		GlobalConfigurationProvider, HistoryUtils, URLConfigurationProvider/*, LocaleData*/) {
 	"use strict";
 
@@ -34,6 +36,7 @@ sap.ui.define([
 	};
 
 	var AnimationMode = Configuration.AnimationMode;
+	let mConfigStubValues = {};
 
 	var sLocalTimezone = TimezoneUtil.getLocalTimezone();
 
@@ -67,7 +70,7 @@ sap.ui.define([
 
 	QUnit.test("Settings", function(assert) {
 		assert.equal(Theming.getTheme(), "SapSampleTheme2", "tag config should override global config");
-		assert.deepEqual(Configuration.getValue("modules"), ["sap.ui.core.library"], "Module List in configuration matches configured modules/libraries");
+		assert.ok(Library.all()["sap.ui.core"], "Core library loaded");
 	});
 
 	QUnit.test("jQuery and $", function(assert) {
@@ -491,17 +494,16 @@ sap.ui.define([
 			{ param: 'y', expected: 'Y' }
 		].forEach(function (data) {
 			// setup
-			oStub && oStub.restore();
-			oStub = sinon.stub(BaseConfig, "get");
-			oStub.callsFake(function(mParameters) {
-				if (mParameters.name === "sapUiLegacyNumberFormat") {
+			BaseConfig._.invalidate();
+			oStub?.restore();
+			oStub = sinon.stub(URLConfigurationProvider, "get");
+			oStub.callsFake(function(sKey) {
+				if (sKey === "sapUiLegacyNumberFormat") {
 					return data.param;
 				} else {
-					return oStub.wrappedMethod.call(this, mParameters);
+					return oStub.wrappedMethod.call(this, sKey);
 				}
 			}.bind(this));
-			// call method under test
-			Configuration.setCore();
 
 			// verify results
 			assert.equal(Configuration.getFormatSettings().getLegacyNumberFormat(), data.expected, "Value of number format must be '" + data.expected + "'.");
@@ -510,7 +512,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Read 'sap-ui-legacy-date-format' from URL", function(assert) {
-		var oStub;
+		var oStub, oBaseStub;
 		[
 			{ param: '', expected: undefined },
 			{ param: '1', expected: '1' },
@@ -530,21 +532,28 @@ sap.ui.define([
 			{ param: 'c', expected: 'C' }
 		].forEach(function (data) {
 			// setup
-			oStub && oStub.restore();
-			oStub = sinon.stub(BaseConfig, "get");
-			oStub.callsFake(function(mParameters) {
-				if (mParameters.name === "sapUiLegacyDateFormat") {
+			BaseConfig._.invalidate();
+			oStub?.restore();
+			oStub = sinon.stub(URLConfigurationProvider, "get");
+			oStub.callsFake(function(sKey) {
+				if (sKey === "sapUiLegacyDateFormat") {
 					return data.param;
 				} else {
-					return oStub.wrappedMethod.call(this, mParameters);
+					return oStub.wrappedMethod.call(this, sKey);
 				}
 			}.bind(this));
-
-			Configuration.setCore();
+			//reset memory Provider
+			oBaseStub?.restore();
+			oBaseStub = sinon.stub(BaseConfig, "get");
+			oBaseStub.callsFake(function(mParameters) {
+				mParameters.provider = undefined;
+				return oBaseStub.wrappedMethod.call(this, mParameters);
+			}.bind(this));
 
 			assert.equal(Configuration.getFormatSettings().getLegacyDateFormat(), data.expected, "Value of date format must be '" + data.expected + "'.");
 		});
 		oStub.restore();
+		oBaseStub.restore();
 	});
 
 	QUnit.test("Read 'sap-ui-legacy-time-format' from URL", function(assert) {
@@ -560,7 +569,7 @@ sap.ui.define([
 		].forEach(function (data) {
 			// setup
 			BaseConfig._.invalidate();
-			oStub && oStub.restore();
+			oStub?.restore();
 			oStub = sinon.stub(URLConfigurationProvider, "get");
 			oStub.callsFake(function(key) {
 				if (key === "sapUiLegacyTimeFormat") {
@@ -570,24 +579,20 @@ sap.ui.define([
 				}
 			}.bind(this));
 			//reset memory Provider
-			oBaseStub && oBaseStub.restore();
+			oBaseStub?.restore();
 			oBaseStub = sinon.stub(BaseConfig, "get");
 			oBaseStub.callsFake(function(mParameters) {
 				mParameters.provider = undefined;
 				return oBaseStub.wrappedMethod.call(this, mParameters);
 			}.bind(this));
 
-			Configuration.setCore();
-
 			assert.equal(Configuration.getFormatSettings().getLegacyTimeFormat(), data.expected, "Value of time format must be '" + data.expected + "'.");
 		});
 		oStub.restore();
 		oBaseStub.restore();
 	});
 
-	QUnit.module("CalendarWeekNumbering", {
-
-	});
+	QUnit.module("CalendarWeekNumbering");
 
 	QUnit.test("Read calendarWeekNumbering from URL", function(assert) {
 		// setup
@@ -607,9 +612,6 @@ sap.ui.define([
 			return oBaseStub.wrappedMethod.call(this, mParameters);
 		}.bind(this));
 
-		// call method under test
-		Configuration.setCore();
-
 		// verify results
 		assert.equal(Configuration.getCalendarWeekNumbering(), CalendarWeekNumbering.ISO_8601,
 			'calendarWeekNumbering set via URL');
@@ -635,9 +637,6 @@ sap.ui.define([
 			return oBaseStub.wrappedMethod.call(this, mParameters);
 		}.bind(this));
 
-		// call method under test
-		Configuration.setCore();
-
 		// verify results
 		assert.equal(Configuration.getCalendarWeekNumbering(), CalendarWeekNumbering.Default,
 			'no value in URL leads to default value');
@@ -883,112 +882,68 @@ sap.ui.define([
 		assert.equal(getHtmlAttribute("data-sap-ui-animation-mode"), AnimationMode.full, "Default animation mode should stay the same.");
 	});
 
-	QUnit.module("Flexibility Services & Connectors", {
-		afterEach: function () {
-			delete window["sap-ui-config"]["flexibilityservices"];
-		}
-	});
+	QUnit.module("Flexibility Services & Connectors");
 
 	QUnit.test("Get the Flexibility Services", function(assert) {
-		Configuration.setCore();
 		var sFlexibilityService = Configuration.getFlexibilityServices();
-		assert.deepEqual(sFlexibilityService, [{layers: ["ALL"], connector: "LrepConnector", url: "/sap/bc/lrep"}]);
+		assert.deepEqual(sFlexibilityService, [{connector: "LrepConnector", url: "/sap/bc/lrep"}]);
 	});
 
 	QUnit.test("Get the Flexibility Services - set to an empty string", function(assert) {
-		window["sap-ui-config"]["flexibilityservices"] = "";
-
-		Configuration.setCore();
+		BaseConfig._.invalidate();
+		var oStub = sinon.stub(GlobalConfigurationProvider, "get");
+		oStub.callsFake(function(sKey) {
+			if (sKey === "sapUiFlexibilityServices") {
+				return "";
+			} else {
+				return oStub.wrappedMethod.call(this, sKey);
+			}
+		}.bind(this));
 		var sFlexibilityService = Configuration.getFlexibilityServices();
 		assert.deepEqual(sFlexibilityService, []);
+		oStub.restore();
 	});
 
 	QUnit.test("Get the Flexibility Services - set to an empty array", function(assert) {
-		window["sap-ui-config"]["flexibilityservices"] = "[]";
-
-		Configuration.setCore();
+		BaseConfig._.invalidate();
+		var oStub = sinon.stub(GlobalConfigurationProvider, "get");
+		oStub.callsFake(function(sKey) {
+			if (sKey === "sapUiFlexibilityServices") {
+				return "[]";
+			} else {
+				return oStub.wrappedMethod.call(this, sKey);
+			}
+		}.bind(this));
 		var sFlexibilityService = Configuration.getFlexibilityServices();
 		assert.deepEqual(sFlexibilityService, []);
+		oStub.restore();
 	});
 
 	QUnit.test("Get the Flexibility Services - set to multiple objects", function(assert) {
+		BaseConfig._.invalidate();
 		var oFirstConfigObject = {'layers': ['CUSTOMER'], 'connector': 'KeyUserConnector', 'url': '/flex/keyUser'};
 		var oSecondConfigObject = {'layers': ['USER'], 'connector': 'PersonalizationConnector', 'url': '/sap/bc/lrep'};
 		var aConfig = [oFirstConfigObject, oSecondConfigObject];
 		var sConfigString = JSON.stringify(aConfig);
 
-		window["sap-ui-config"]["flexibilityservices"] = sConfigString;
+		var oStub = sinon.stub(GlobalConfigurationProvider, "get");
+		oStub.callsFake(function(sKey) {
+			if (sKey === "sapUiFlexibilityServices") {
+				return sConfigString;
+			} else {
+				return oStub.wrappedMethod.call(this, sKey);
+			}
+		}.bind(this));
 
-		Configuration.setCore();
 		var sFlexibilityService = Configuration.getFlexibilityServices();
 		assert.deepEqual(sFlexibilityService, aConfig);
-	});
-
-	function _getNumberOfFlModules(oCfg) {
-		return oCfg.getValue("modules").filter(function(sModule) {
-			return sModule === "sap.ui.fl.library";
-		}).length;
-	}
-
-	QUnit.test("Set flexibilityServices enforces the loading of sap.ui.fl", function(assert) {
-		window["sap-ui-config"]["flexibilityservices"] = '[{"connector": "KeyUser", "url": "/some/url", laverFilters: []}]';
-
-		Configuration.setCore();
-		assert.equal(_getNumberOfFlModules(Configuration), 1);
-	});
-
-	QUnit.test("Set flexibilityServices URL enforces the loading of sap.ui.fl", function(assert) {
-		var sEncodedConfig = encodeURI('[{"connector":"KeyUser","url": "/some/url","laverFilters":[]}]');
-		browserUrl.change(location.origin + "?sap-ui-flexibilityServices="  + sEncodedConfig);
-
-		try {
-			Configuration.setCore();
-			assert.equal(_getNumberOfFlModules(Configuration), 1);
-		} finally {
-			browserUrl.reset();
-		}
-	});
-
-	QUnit.test("Set flexibilityServices URL but setting the loading to async does NOT enforces the loading of sap.ui.fl", function(assert) {
-		var sEncodedConfig = encodeURI('[{"connector":"KeyUser","url": "/some/url","laverFilters":[]}]');
-		browserUrl.change(location.origin + "?sap-ui-xx-skipAutomaticFlLibLoading=true&sap-ui-flexibilityServices=" + sEncodedConfig);
-
-		try {
-			Configuration.setCore();
-			assert.equal(_getNumberOfFlModules(Configuration), 0);
-		} finally {
-			browserUrl.reset();
-		}
-	});
-
-	QUnit.test("Default flexibilityServices does NOT enforces the loading of sap.ui.fl", function(assert) {
-		Configuration.setCore();
-		assert.equal(_getNumberOfFlModules(Configuration), 0);
-	});
-
-	QUnit.test("Cleared flexibilityServices does NOT enforces the loading of sap.ui.fl", function(assert) {
-		Configuration.setCore();
-		assert.equal(_getNumberOfFlModules(Configuration), 0);
-	});
-
-	QUnit.test("Set flexibilityServices does NOT add the loading of sap.ui.fl an additional time if it is already set", function(assert) {
-		window["sap-ui-config"]["flexibilityservices"] = "";
-		window["sap-ui-config"]["libs"] = 'sap.ui.fl';
-		Configuration.setCore();
-		assert.equal(_getNumberOfFlModules(Configuration), 1);
-	});
-
-	QUnit.test("Cleared flexibilityServices does NOT remove the loading of sap.ui.fl if it is set", function(assert) {
-		window["sap-ui-config"]["flexibilityservices"] = "";
-		window["sap-ui-config"]["libs"] = 'sap.ui.fl';
-		Configuration.setCore();
-		assert.equal(_getNumberOfFlModules(Configuration), 1);
+		oStub.restore();
 	});
 
 	QUnit.module("ThemeRoot Validation");
 
 	// determine the default port depending on the protocol of the current page
-	const defaultPort = window.location.protocol === "https" ? 443 : 80;
+	const defaultPort = window.location.protocol === "https:" ? 443 : 80;
 	const origin = window.location.origin;
 	const originWithoutProtocol = origin.replace(window.location.protocol, "");
 
@@ -1121,28 +1076,15 @@ sap.ui.define([
 
 	QUnit.module("Allowlist configuration options", {
 		beforeEach: function() {
-			/**
-			 * @deprecated Since 1.85.0.
-			 */
-			delete window["sap-ui-config"]["whitelistservice"];
-			delete window["sap-ui-config"]["allowlistservice"];
-			delete window["sap-ui-config"]["frameoptionsconfig"];
+			BaseConfig._.invalidate();
+			this.oStub = sinon.stub(BaseConfig, "get");
+			this.oStub.callsFake((oParams) =>
+				(mConfigStubValues.hasOwnProperty(oParams.name) ? mConfigStubValues[oParams.name] : this.oStub.wrappedMethod.call(this, oParams))
+			);
 		},
 		afterEach: function() {
-			/**
-			 * @deprecated Since 1.85.0.
-			 */
-			delete window["sap-ui-config"]["whitelistservice"];
-			delete window["sap-ui-config"]["allowlistservice"];
-			delete window["sap-ui-config"]["frameoptionsconfig"];
-			if (this.oMetaWhiteList) {
-				this.oMetaWhiteList.remove();
-				this.oMetaWhiteList = null;
-			}
-			if (this.oMetaAllowList) {
-				this.oMetaAllowList.remove();
-				this.oMetaAllowList = null;
-			}
+			mConfigStubValues = {};
+			this.oStub.restore();
 		}
 	});
 
@@ -1154,80 +1096,23 @@ sap.ui.define([
 	 */
 	QUnit.test("whitelistService", function(assert) {
 		var SERVICE_URL = "/service/url/from/config";
-		window["sap-ui-config"]["whitelistservice"] = SERVICE_URL;
-		Configuration.setCore();
+		mConfigStubValues["sapUiWhitelistService"] = SERVICE_URL;
 		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
 		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
 	});
 
-	/**
-	 * @deprecated Since 1.85.0.
-	 */
-	QUnit.test("sap.whitelistService meta tag", function(assert) {
-		var SERVICE_URL = "/service/url/from/meta";
-		this.oMetaWhiteList = document.createElement('meta');
-		this.oMetaWhiteList.setAttribute('name', 'sap.whitelistService');
-		this.oMetaWhiteList.setAttribute('content', SERVICE_URL);
-		document.head.appendChild(this.oMetaWhiteList);
-
-		Configuration.setCore();
-		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
-		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
-	});
-
-	/**
-	 * @deprecated Since 1.85.0.
-	 */
-	QUnit.test("frameOptionsConfig.whitelist", function(assert) {
-		var LIST = "example.com";
-		window["sap-ui-config"]["frameoptionsconfig"] = {
-			whitelist: LIST
-		};
-		Configuration.setCore();
-		assert.equal(Configuration.getValue("frameOptionsConfig").whitelist, LIST, "Deprecated frameOptionsConfig.whitelist should be set");
-		assert.equal(Configuration.getValue("frameOptionsConfig").allowlist, LIST, "Successor frameOptionsConfig.allowlist should be set");
-	});
-
 	// AllowList Service only
 	QUnit.test("allowlistService", function(assert) {
 		var SERVICE_URL = "/service/url/from/config";
-		window["sap-ui-config"]["allowlistservice"] = SERVICE_URL;
-		Configuration.setCore();
-		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
-		/**
-		 * @deprecated Since 1.85.0.
-		 */
-		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
-	});
+		mConfigStubValues["sapUiAllowlistService"] = SERVICE_URL;
 
-	QUnit.test("sap.allowlistService meta tag", function(assert) {
-		var SERVICE_URL = "/service/url/from/meta";
-		this.oMetaWhiteList = document.createElement('meta');
-		this.oMetaWhiteList.setAttribute('name', 'sap.allowlistService');
-		this.oMetaWhiteList.setAttribute('content', SERVICE_URL);
-		document.head.appendChild(this.oMetaWhiteList);
-
-		Configuration.setCore();
-		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
+		assert.equal(Security.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
 		/**
 		 * @deprecated Since 1.85.0.
 		 */
 		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
 	});
 
-	QUnit.test("frameOptionsConfig.allowlist", function(assert) {
-		var LIST = "example.com";
-		window["sap-ui-config"]["frameoptionsconfig"] = {
-			allowlist: LIST
-		};
-		Configuration.setCore();
-		assert.equal(Configuration.getValue("frameOptionsConfig").allowlist, LIST, "Successor frameOptionsConfig.allowlist should be set");
-		/**
-		 * @deprecated Since 1.85.0.
-		 */
-		assert.equal(Configuration.getValue("frameOptionsConfig").whitelist, undefined, "Deprecated frameOptionsConfig.whitelist should not be set");
-	});
-
 	// AllowList mixed with WhiteList Service (AllowList should be preferred)
 	// SAP strives to replace insensitive terms with inclusive language.
 	// Since APIs cannot be renamed or immediately removed for compatibility reasons, this API has been deprecated.
@@ -1236,136 +1121,107 @@ sap.ui.define([
 	 */
 	QUnit.test("whitelistService mixed with allowlistService", function(assert) {
 		var SERVICE_URL = "/service/url/from/config";
-		window["sap-ui-config"]["whitelistservice"] = SERVICE_URL;
-		window["sap-ui-config"]["allowlistservice"] = SERVICE_URL;
-		Configuration.setCore();
-		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
-		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
-	});
+		mConfigStubValues["sapUiWhitelistService"] = SERVICE_URL;
+		mConfigStubValues["sapUiAllowlistService"] = SERVICE_URL;
 
-	/**
-	 * @deprecated Since 1.85.0.
-	 */
-	QUnit.test("sap.whitelistService mixed with sap.allowlistService meta tag", function(assert) {
-		var SERVICE_URL = "/service/url/from/meta";
-		this.oMetaWhiteList = document.createElement('meta');
-		this.oMetaWhiteList.setAttribute('name', 'sap.whitelistService');
-		this.oMetaWhiteList.setAttribute('content', SERVICE_URL);
-		document.head.appendChild(this.oMetaWhiteList);
-
-		this.oMetaAllowList = document.createElement('meta');
-		this.oMetaAllowList.setAttribute('name', 'sap.allowlistService');
-		this.oMetaAllowList.setAttribute('content', SERVICE_URL);
-		document.head.appendChild(this.oMetaAllowList);
-
-		Configuration.setCore();
 		assert.equal(Configuration.getWhitelistService(), SERVICE_URL, "Deprecated getWhitelistService should return service url");
 		assert.equal(Configuration.getAllowlistService(), SERVICE_URL, "Successor getAllowlistService should return service url");
 	});
 
-	/**
-	 * @deprecated Since 1.85.0.
-	 */
-	QUnit.test("frameOptionsConfig.whitelist mixed with frameoptions.allowlist", function(assert) {
-		var LIST = "example.com";
-		window["sap-ui-config"]["frameoptionsconfig"] = {
-			allowlist: LIST,
-			whitelist: LIST
-		};
-		Configuration.setCore();
-		assert.equal(Configuration.getValue("frameOptionsConfig").whitelist, LIST, "Deprecated frameOptionsConfig.whitelist should be set");
-		assert.equal(Configuration.getValue("frameOptionsConfig").allowlist, LIST, "Successor frameOptionsConfig.allowlist should be set");
+	QUnit.module("OData V4", {
+		beforeEach: function() {
+			BaseConfig._.invalidate();
+			this.oStub = sinon.stub(GlobalConfigurationProvider, "get");
+			this.oStub.callsFake((sKey) =>
+				(mConfigStubValues.hasOwnProperty(sKey) ? mConfigStubValues[sKey] : this.oStub.wrappedMethod.call(this, sKey))
+			);
+		},
+		afterEach: function() {
+			mConfigStubValues = {};
+			this.oStub.restore();
+		}
 	});
 
-	QUnit.module("OData V4");
-
 	QUnit.test("securityTokenHandlers", function(assert) {
-		var oCfg = Configuration,
-			fnSecurityTokenHandler1 = function () {},
-			fnSecurityTokenHandler2 = function () {},
-			aSecurityTokenHandlers = [fnSecurityTokenHandler1];
+		var fnSecurityTokenHandler1 = function () {},
+			fnSecurityTokenHandler2 = function () {};
+		BaseConfig._.invalidate();
 
 		// code under test
-		Configuration.setCore();
-
-		assert.deepEqual(oCfg.getSecurityTokenHandlers(), []);
+		assert.deepEqual(Security.getSecurityTokenHandlers(), []);
 
 		// bootstrap does some magic and converts to lower case, test does not :-(
-		window["sap-ui-config"].securitytokenhandlers = [];
+		mConfigStubValues["sapUiSecurityTokenHandlers"] = [];
+		BaseConfig._.invalidate();
 
 		// code under test
-		Configuration.setCore();
-
-		assert.strictEqual(oCfg.getSecurityTokenHandlers().length, 0, "check length");
+		assert.strictEqual(Security.getSecurityTokenHandlers().length, 0, "check length");
 
-		window["sap-ui-config"].securitytokenhandlers = aSecurityTokenHandlers;
+		mConfigStubValues["sapUiSecurityTokenHandlers"] = [fnSecurityTokenHandler1];
+		BaseConfig._.invalidate();
 
 		// code under test
-		Configuration.setCore();
-
-		assert.notStrictEqual(aSecurityTokenHandlers, oCfg.securityTokenHandlers);
-		assert.strictEqual(oCfg.getSecurityTokenHandlers().length, 1, "check length");
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1, "check Fn");
+		assert.strictEqual(Security.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1, "check Fn");
+		assert.strictEqual(Security.getSecurityTokenHandlers().length, 1, "check length");
 
-		window["sap-ui-config"].securitytokenhandlers
+		mConfigStubValues["sapUiSecurityTokenHandlers"]
 			= [fnSecurityTokenHandler1, fnSecurityTokenHandler2];
+		BaseConfig._.invalidate();
 
 		// code under test
-		Configuration.setCore();
-
-		assert.strictEqual(oCfg.getSecurityTokenHandlers().length, 2, "check length");
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1, "check Fn");
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[1], fnSecurityTokenHandler2, "check Fn");
+		assert.strictEqual(Security.getSecurityTokenHandlers().length, 2, "check length");
+		assert.strictEqual(Security.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1, "check Fn");
+		assert.strictEqual(Security.getSecurityTokenHandlers()[1], fnSecurityTokenHandler2, "check Fn");
 
-		window["sap-ui-config"].securitytokenhandlers = fnSecurityTokenHandler1;
+		mConfigStubValues["sapUiSecurityTokenHandlers"] = fnSecurityTokenHandler1;
+		BaseConfig._.invalidate();
 
 		assert.throws(function () {
 			// code under test
-			Configuration.setCore();
+			Security.getSecurityTokenHandlers();
 		}); // aSecurityTokenHandlers.forEach is not a function
 
-		window["sap-ui-config"].securitytokenhandlers = [fnSecurityTokenHandler1, "foo"];
+		mConfigStubValues["sapUiSecurityTokenHandlers"] = [fnSecurityTokenHandler1, "foo"];
+		BaseConfig._.invalidate();
 
 		assert.throws(function () {
 			// code under test
-			Configuration.setCore();
+			Security.getSecurityTokenHandlers();
 		}, "Not a function: foo");
 
 		// code under test
-		oCfg.setSecurityTokenHandlers(aSecurityTokenHandlers);
+		Security.setSecurityTokenHandlers([fnSecurityTokenHandler1]);
 
-		assert.notStrictEqual(aSecurityTokenHandlers, oCfg.securityTokenHandlers);
-		assert.notStrictEqual(oCfg.getSecurityTokenHandlers(), oCfg.securityTokenHandlers);
-		assert.strictEqual(oCfg.getSecurityTokenHandlers().length, 1);
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1);
+		assert.notStrictEqual([fnSecurityTokenHandler1], Security.securityTokenHandlers);
+		assert.notStrictEqual(Security.getSecurityTokenHandlers(), Security.securityTokenHandlers);
+		assert.strictEqual(Security.getSecurityTokenHandlers().length, 1);
+		assert.strictEqual(Security.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1);
 
 		assert.throws(function () {
 			// code under test
-			oCfg.setSecurityTokenHandlers([fnSecurityTokenHandler1, "foo"]);
+			Security.setSecurityTokenHandlers([fnSecurityTokenHandler1, "foo"]);
 		}, "Not a function: foo");
 
 		assert.throws(function () {
 			// code under test
-			oCfg.setSecurityTokenHandlers([undefined]);
+			Security.setSecurityTokenHandlers([undefined]);
 		}, "Not a function: undefined");
 
 		assert.throws(function () {
 			// code under test
-			oCfg.setSecurityTokenHandlers("foo");
+			Security.setSecurityTokenHandlers("foo");
 		}); // aSecurityTokenHandlers.forEach is not a function
 
 		// code under test
-		oCfg.setSecurityTokenHandlers([fnSecurityTokenHandler1, fnSecurityTokenHandler2]);
+		Security.setSecurityTokenHandlers([fnSecurityTokenHandler1, fnSecurityTokenHandler2]);
 
-		assert.strictEqual(oCfg.getSecurityTokenHandlers().length, 2);
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1);
-		assert.strictEqual(oCfg.getSecurityTokenHandlers()[1], fnSecurityTokenHandler2);
+		assert.strictEqual(Security.getSecurityTokenHandlers().length, 2);
+		assert.strictEqual(Security.getSecurityTokenHandlers()[0], fnSecurityTokenHandler1);
+		assert.strictEqual(Security.getSecurityTokenHandlers()[1], fnSecurityTokenHandler2);
 
 		// code under test
-		oCfg.setSecurityTokenHandlers([]);
-
-		assert.deepEqual(oCfg.getSecurityTokenHandlers(), []);
+		Security.setSecurityTokenHandlers([]);
 
-		delete window["sap-ui-config"].securitytokenhandlers;
+		assert.deepEqual(Security.getSecurityTokenHandlers(), []);
 	});
 });

package/test/sap/ui/core/qunit/bootstrap/ConfigurationFlexibility_LibConfigured.qunit.html

@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>Test Page for Flexibility Configuration</title>
+		<script id="sap-ui-bootstrap"
+				src="../../../../../../resources/sap-ui-core.js"
+				data-sap-ui-async="true"
+				data-sap-ui-resourceroots='{
+					"test-resources": "../../../../../../test-resources/"
+				}'></script>
+		<link  href="../../../../../../resources/sap/ui/thirdparty/qunit-2.css" rel="stylesheet" media="screen">
+		<script src="../../../../../../resources/sap/ui/thirdparty/qunit-2.js"></script>
+		<script src="../../../../../../resources/sap/ui/qunit/qunit-junit.js"></script>
+		<script src="../../../../../../resources/sap/ui/thirdparty/sinon-4.js"></script>
+		<script src="../../../../../../resources/sap/ui/qunit/sinon-qunit-bridge.js"></script>
+		<script src="ConfigurationFlexibility_LibConfigured.qunit.js"></script>
+	</head>
+	<body>
+		<div id="qunit"></div>
+	</body>
+</html>

package/test/sap/ui/core/qunit/bootstrap/ConfigurationFlexibility_LibConfigured.qunit.js

@@ -0,0 +1,22 @@
+/*global QUnit */
+QUnit.config.autostart = false;
+sap.ui.require([
+	'sap/ui/core/Lib'
+], function(
+	Library
+) {
+	"use strict";
+
+	QUnit.module("Flexibility Services & Connectors");
+
+	function _getNumberOfFlModules() {
+		return Object.keys(Library.all()).filter(function(sModule) {
+			return sModule === "sap.ui.fl";
+		}).length;
+	}
+
+	QUnit.test("Set flexibilityServices does NOT add the loading of sap.ui.fl an additional time if it is already set", function(assert) {
+		assert.equal(_getNumberOfFlModules(), 1);
+	});
+	QUnit.start();
+});