@openui5/sap.ui.core 1.117.0 → 1.118.0

package/test/sap/ui/core/qunit/performance/trace/Interaction.qunit.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	'sap/ui/core/mvc/XMLView',
 	'sap/ui/performance/trace/FESRHelper',
 	"sap/ui/test/actions/Press",
-	"sap/m/Button"
-], function(Interaction, XMLView, FESRHelper, Press, Button) {
+	"sap/m/Button",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Interaction, XMLView, FESRHelper, Press, Button, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Interaction API", {
@@ -76,19 +77,40 @@ sap.ui.define([
 
 	});
 
+	QUnit.module("Interaction API with fake timer", {
+		before: function() {
+			this.clock = sinon.useFakeTimers();
+			window.performance.getEntriesByType = function() { return []; };
+			Interaction.setActive(true);
+			this.clock.runAll();
+		},
+		after: function() {
+			Interaction.setActive(false);
+
+			// Run all pending setTimeout and restore the timer
+			this.clock.runAll();
+			delete window.performance.getEntriesByType;
+			this.clock.restore();
+		}
+	});
+
 	QUnit.test("Semantic Stepname", function(assert) {
 		assert.expect(2);
-		this.clock = sinon.useFakeTimers();
-		window.performance.getEntriesByType = function() { return []; };
+
+		 // Call setActive after activating fakeTimers again, in order to ensure setTimeout calls triggered
+		 // by setActive are also covered by fakeTimers
+		Interaction.setActive(true);
+		this.clock.runAll();
 
 		return XMLView.create({
 			definition: '<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m" xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1">'
 			+ '          <Button id="btnWithDeclarativeSemanticAnnotation" text="Create something" fesr:press="create"/>                     '
 			+ '          <Button id="btnWithProgramaticSemanticAnnotation" text="Delete something"/>                     '
 			+ '    </mvc:View>         '
-		}).then(function (oView) {
+		}).then(async function (oView) {
 			oView.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			this.clock.runAll();
+			await nextUIUpdate();
 			return new Promise(function(resolve, reject) {
 				var oBtn1 = oView.byId("btnWithDeclarativeSemanticAnnotation"),
 					oBtn2 = oView.byId("btnWithProgramaticSemanticAnnotation"),
@@ -114,19 +136,12 @@ sap.ui.define([
 			}.bind(this)).then(function () {
 				// cleanup
 				oView.destroy();
-
-				// Run all pending setTimeout and restore the timer
-				this.clock.runAll();
-				delete window.performance.getEntriesByType;
-				this.clock.restore();
-			}.bind(this));
+			});
 		}.bind(this));
 	});
 
-	QUnit.test("Pending interaction should be finalized even if the handler does not trigger any timing relevant action.", function (assert) {
+	QUnit.test("Pending interaction should be finalized even if the handler does not trigger any timing relevant action.", async function (assert) {
 		assert.expect(3);
-		this.clock = sinon.useFakeTimers();
-		window.performance.getEntriesByType = function() { return []; };
 
 		//Create and render button
 		var oButton = new Button({
@@ -138,31 +153,27 @@ sap.ui.define([
 			}
 		});
 		oButton.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		this.clock.runAll();
+		await nextUIUpdate();
 
 		// Press button and check that a new interaction is created and that the interaction is also finalized after 300ms
 		var oPress = new Press();
 		oPress.executeOn(oButton);
 		this.clock.tick(301);
 		assert.notOk(Interaction.getPending(), "There is no pending interaction anymore.");
-
-		// Run all pending setTimeout and restore the timer
-		this.clock.runAll();
-		delete window.performance.getEntriesByType;
-		this.clock.restore();
 	});
 
-	QUnit.test("Cleanup browser events in case they don't lead to an interaction.", function (assert) {
+	QUnit.test("Cleanup browser events in case they don't lead to an interaction.", async function (assert) {
 		assert.expect(5);
 		var notifyEventStartSpy = sinon.spy(Interaction, "notifyEventStart");
 		var notifyEventEndSpy = sinon.spy(Interaction, "notifyEventEnd");
-		this.clock = sinon.useFakeTimers();
 		assert.notOk(Interaction.eventEndTimer, "There shouldn't be an eventEndTimer and therefore also no oCurrentBrowserEvent");
 
 		//Create and render button
 		var oButton = new Button(); // Button without press handler to simulate controls which should not result in interactions
 		oButton.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		this.clock.runAll();
+		await nextUIUpdate();
 
 		// Press button and check that browser events are triggered
 		var oPress = new Press();
@@ -172,9 +183,5 @@ sap.ui.define([
 		assert.ok(Interaction.eventEndTimer, "There should be an eventEndTimer to cleanup oCurrentBrowserEvent at the end.");
 		this.clock.tick(10);
 		assert.notOk(Interaction.eventEndTimer, "There shouldn't be an eventEndTimer at the end after the oCurrentBrowserEvent was reset.");
-
-		// Run all pending setTimeout and restore the timer
-		this.clock.runAll();
-		this.clock.restore();
 	});
 });

package/test/sap/ui/core/qunit/routing/Placeholder.qunit.js

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/m/Page",
 	"sap/m/SplitApp",
 	"sap/m/routing/TargetHandler",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/m/routing/Router", /* need to require this module to correctly resolve router class in manifest */
 	"sap/f/routing/Router" /* need to require this module to correctly resolve router class in manifest */
 	], function(
@@ -18,7 +19,8 @@ sap.ui.define([
 		NavContainer,
 		Page,
 		SplitApp,
-		MTargetHandler
+		MTargetHandler,
+		nextUIUpdate
 	) {
 
 	"use strict";
@@ -67,7 +69,7 @@ sap.ui.define([
 		oButton.addEventDelegate(oButtonDelegate);
 	});
 
-	QUnit.test("NavContainer - showPlaceholder / hidePlaceholder", function(assert) {
+	QUnit.test("NavContainer - showPlaceholder / hidePlaceholder", async function(assert) {
 		var oNavContainer = new NavContainer();
 		var oPlaceholder = new Placeholder({
 			html: "my/placeholder.fragment.html"
@@ -78,7 +80,7 @@ sap.ui.define([
 
 		// render NavContainer
 		oNavContainer.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// show placeholder
 		oNavContainer.showPlaceholder({
@@ -216,7 +218,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("NavContainer", function(assert) {
+	QUnit.test("NavContainer", async function(assert) {
 		var oNavConShowPlaceholderSpy = sinon.spy(NavContainer.prototype, "showPlaceholder"),
 			oNavConHidePlaceholderSpy = sinon.spy(NavContainer.prototype, "hidePlaceholder");
 
@@ -228,7 +230,7 @@ sap.ui.define([
 
 		oComponentContainer.placeAt("qunit-fixture");
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		return new Promise(function(resolve, reject) {
 			oComponentContainer.attachEvent("componentCreated", function(oEvent) {
@@ -301,7 +303,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("SplitContainer", function(assert) {
+	QUnit.test("SplitContainer", async function(assert) {
 		var oSplitApp;
 
 		// spies creation
@@ -320,7 +322,7 @@ sap.ui.define([
 
 		oComponentContainer.placeAt("qunit-fixture");
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		return new Promise(function(resolve, reject) {
 			oComponentContainer.attachEvent("componentCreated", function(oEvent) {
@@ -460,7 +462,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("FlexibleColumnLayout", function(assert) {
+	QUnit.test("FlexibleColumnLayout", async function(assert) {
 		var oFlexColumnLayout;
 
 		// spies creation
@@ -477,7 +479,7 @@ sap.ui.define([
 
 		oComponentContainer.placeAt("qunit-fixture");
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		return new Promise(function(resolve, reject) {
 			oComponentContainer.attachEvent("componentCreated", function(oEvent) {

package/test/sap/ui/core/qunit/routing/PlaceholderOptOut.qunit.js

@@ -5,13 +5,15 @@ sap.ui.define([
 	"sap/ui/core/Placeholder",
 	"sap/m/NavContainer",
 	"sap/m/routing/TargetHandler",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/m/routing/Router" /* need to require this module to correctly resolve router class in manifest */
 	], function(
 		LoaderExtensions,
 		ComponentContainer,
 		Placeholder,
 		NavContainer,
-		MTargetHandler
+		MTargetHandler,
+		nextUIUpdate
 	) {
 
 	"use strict";
@@ -22,7 +24,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("xx-placeholder config set to 'false'", function(assert) {
+	QUnit.test("xx-placeholder config set to 'false'", async function(assert) {
 		var oNavConShowPlaceholderSpy = sinon.spy(NavContainer.prototype, "showPlaceholder");
 		var oMTargetHandlerSpy = sinon.spy(MTargetHandler.prototype, "showPlaceholder");
 
@@ -34,7 +36,7 @@ sap.ui.define([
 
 		oComponentContainer.placeAt("qunit-fixture");
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		return new Promise(function(resolve, reject) {
 			oComponentContainer.attachEvent("componentCreated", function(oEvent) {

package/test/sap/ui/core/qunit/routing/async/Router.qunit.js

@@ -3270,6 +3270,63 @@ sap.ui.define([
 		}.bind(this));
 	});
 
+	QUnit.test("Call navTo multiple times with specific route and parameter for nested component", function(assert) {
+		return Component.create({
+			name: "qunit.router.component.2LevelsMultiNavTo.Parent"
+		}).then(function(oComponent) {
+			this.oParentComponent = oComponent;
+
+			var oRouter = this.oParentComponent.getRouter(),
+				sId = "productA",
+				oNestedRouteInfo = {
+					home: {
+						route: "product",
+						parameters: {
+							id: sId
+						}
+					}
+				};
+
+			var pCategoryRouteMatched = new Promise(function(resolve, reject) {
+				var fnMatched = function(oEvent) {
+					this.detachMatched(fnMatched);
+					resolve();
+				};
+				oRouter.getRoute("category").attachMatched(fnMatched);
+			});
+
+
+			HashChanger.getInstance().setHash("category");
+
+			oRouter.initialize();
+
+			return pCategoryRouteMatched.then(function() {
+				oRouter.navTo("home", {}, oNestedRouteInfo);
+
+				return new Promise(function(resolve, reject) {
+					var fnMatched = function(oEvent) {
+						this.detachMatched(fnMatched);
+
+						var oControl = oEvent.getParameter("view");
+
+						if (oControl instanceof ComponentContainer) {
+							resolve(oControl.getComponentInstance());
+						}
+					};
+
+					oRouter.getRoute("home").attachMatched(fnMatched);
+				});
+			}).then(function(oNestedComponent) {
+				assert.ok(oNestedComponent, "nested component is loaded");
+				var oNestedRouter = oNestedComponent.getRouter();
+				var oNestedHashChanger = oNestedRouter.getHashChanger();
+
+				assert.equal(oNestedHashChanger.getHash(), oNestedRouter.getURL("product", {id: sId}));
+
+			});
+		}.bind(this));
+	});
+
 	QUnit.test("Call navTo with specific route and parameter for deep nested component", function(assert) {
 		return Component.create({
 			name: "qunit.router.component.3Levels.Parent"

package/test/sap/ui/core/qunit/routing/fixture/historyIframe/iframe/index.html

@@ -10,7 +10,7 @@
 	<script
 		id='sap-ui-bootstrap'
 		src='../../../../../../../../../resources/sap-ui-core.js'
-		data-sap-ui-theme='sap_fiori_3'
+		data-sap-ui-theme='sap_horizon'
 		data-sap-ui-lib='sap.ui.core'
 		data-sap-ui-compatVersion="edge"
 		data-sap-ui-async="true"

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Child/Component.js

@@ -0,0 +1,30 @@
+sap.ui.define([
+	'sap/ui/core/UIComponent',
+	'sap/ui/core/Component'
+], function(UIComponent, Component) {
+	"use strict";
+
+	var ChildComponent = UIComponent.extend("qunit.router.component.2LevelsMultiNavTo.Child.Component", {
+		metadata : {
+			manifest: "json"
+		},
+		init : function() {
+			UIComponent.prototype.init.apply(this, arguments);
+			this.getRouter().initialize();
+
+			var oParentComponent = Component.getOwnerComponentFor(this);
+
+			oParentComponent.getRouter().navTo("home", {}, {
+				home: {
+					route: "product",
+					parameters: {
+						id: "productA"
+					}
+				}
+			});
+		}
+	});
+
+	return ChildComponent;
+
+});

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Child/manifest.json

@@ -0,0 +1,25 @@
+{
+	"sap.app": {
+		"id": "qunit.router.component.2LevelsMultiNavTo.Child",
+		"applicationVersion": {
+			"version": "1.0.0"
+		}
+	},
+	"sap.ui5": {
+		"routing": {
+			"config": {
+				"async": true
+			},
+			"routes": [
+				{
+					"pattern": "product/{id}",
+					"name": "product"
+				},
+				{
+					"pattern": "",
+					"name": "nestedHome"
+				}
+			]
+		}
+	}
+}

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Parent/Component.js

@@ -0,0 +1,14 @@
+sap.ui.define([
+	'sap/ui/core/UIComponent'
+], function(UIComponent) {
+	"use strict";
+
+	var Component = UIComponent.extend("qunit.router.component.2LevelsMultiNavTo.Parent.Component", {
+		metadata : {
+			manifest: "json"
+		}
+	});
+
+	return Component;
+
+});

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Parent/manifest.json

@@ -0,0 +1,51 @@
+{
+	"sap.app": {
+		"id": "qunit.router.component.2LevelsMultiNavTo.Parent",
+		"applicationVersion": {
+			"version": "1.0.0"
+		}
+	},
+	"sap.ui5": {
+		"rootView": {
+			"viewName": "qunit.router.component.2LevelsMultiNavTo.Parent.view.RootView",
+			"type": "XML",
+			"async": true
+		},
+		"routing": {
+			"config": {
+				"async": true
+			},
+			"routes": [
+				{
+					"pattern": "",
+					"name": "home",
+					"target": [{
+						"name": "home",
+						"prefix": "child"
+					}]
+				},
+				{
+					"pattern": "category",
+					"name": "category"
+				}
+			],
+			"targets": {
+				"home": {
+					"name": "Child",
+					"path": "qunit.router.component.2LevelsMultiNavTo",
+					"type": "Component",
+					"controlId": "shell",
+					"controlAggregation": "content"
+				},
+				"notFound": {
+					"name": "NotFound",
+					"viewType": "XML",
+					"type": "View",
+					"path": "qunit.router.component.2LevelsMultiNavTo.Parent.view",
+					"controlId": "shell",
+					"controlAggregation": "content"
+				}
+			}
+		}
+	}
+}

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Parent/view/NotFound.view.xml

@@ -0,0 +1,3 @@
+<mvc:View xmlns="sap.m" xmlns:mvc="sap.ui.core.mvc">
+	<Button id="button" text="Not Found"></Button>
+</mvc:View>

package/test/sap/ui/core/qunit/routing/fixture/router/component/2LevelsMultiNavTo/Parent/view/RootView.view.xml

@@ -0,0 +1,5 @@
+<mvc:View xmlns="sap.m" xmlns:mvc="sap.ui.core.mvc">
+	<VBox id="box">
+		<Panel id="shell"></Panel>
+	</VBox>
+</mvc:View>

package/test/sap/ui/core/qunit/rule/app/syncXHR.qunit.js

@@ -2,17 +2,14 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Control",
-	"sap/ui/core/Component",
+	"sap/ui/core/Core",
 	"sap/ui/core/IconPool",
-	"sap/ui/core/AppCacheBuster",
 	"sap/ui/core/Manifest",
-	"sap/ui/core/Fragment",
-	"sap/ui/core/XMLComposite",
+	"sap/ui/core/UIArea",
 	"sap/ui/thirdparty/sinon",
-	"sap/ui/thirdparty/jquery",
 	"test-resources/sap/ui/support/TestHelper",
 	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Log, Control, Component, IconPool, AppCacheBuster, Manifest, Fragment, XMLComposite, sinon, jQuery, testRule, createAndAppendDiv) {
+], function(Log, Control, Core, IconPool, Manifest, UIArea, sinon, testRule, createAndAppendDiv) {
 	"use strict";
 
 	// the rules rely on a certain log level for analyzing issues
@@ -21,6 +18,7 @@ sap.ui.define([
 	// create content div
 	createAndAppendDiv('content');
 
+	var fnOrigRerender;
 	var iIncrement = 0;
 	var fnIncrement = function(iNumber){
 		return function(){
@@ -31,8 +29,19 @@ sap.ui.define([
 
 	QUnit.module("Renderer", {
 		beforeEach: function(assert) {
-			assert.ok(sap.ui.getCore().isInitialized(), "Core must be initialized");
-			return new Promise(function(resolve) {
+			fnOrigRerender = UIArea.prototype.rerender;
+			UIArea.prototype.rerender = function() {
+				try {
+					fnOrigRerender.apply(this, arguments);
+				} catch (e) {
+					// prevent 404 exception from breaking the test
+					// the rule TestHelper does not support assert throwing
+					// the actual check should be on a log for a sync XHR to "NoRendererControlRenderer.js"
+					assert.ok(e, "404 should be fired for '" + e.message + "'");
+				}
+			};
+			return Core.ready().then(function() {
+				assert.ok(true, "Core must be initialized");
 
 				var No = Control.extend("NoRendererControl", {
 					metadata: {
@@ -41,17 +50,15 @@ sap.ui.define([
 				});
 				var n = new No();
 				n.placeAt("content");
-				try {
-					sap.ui.getCore().applyChanges();
-				} catch (e) {
-					// prevent 404 exception from breaking the test
-					// the rule TestHelper does not support assert throwing
-					// the actual check should be on a log for a sync XHR to "NoRendererControlRenderer.js"
-					assert.ok(e, "404 should be fired for '" + e.message + "'");
-					resolve();
-				}
+				// wait for rendering
+				return new Promise(function(resolve) {
+					setTimeout(resolve);
+				});
 			});
 
+		},
+		afterEach: function() {
+			UIArea.prototype.rerender = fnOrigRerender;
 		}
 	});
 

package/test/sap/ui/core/qunit/rule/app/syncXHRBootstrap.qunit.js

@@ -10,9 +10,9 @@
 				sap.ui.require(["sap/base/Log", "sap/ui/Device"], function(Log, Device) {
 					Log.logSupportInfo(true);
 					Log.setLevel(4);
-					sap.ui.require(["sap/ui/core/Core"], function(core) {
-						core.boot();
-						core.attachInit(resolve);
+					sap.ui.require(["sap/ui/core/Core"], function(Core) {
+						Core.boot();
+						Core.ready().then(resolve);
 					});
 				});
 			});

package/test/sap/ui/core/qunit/rule/app/syncXHRBootstrapDebug.qunit.js

@@ -9,9 +9,9 @@
 				sap.ui.require(["sap/base/Log", "sap/ui/Device"], function(Log, Device) {
 					Log.logSupportInfo(true);
 					Log.setLevel(4);
-					sap.ui.require(["sap/ui/core/Core"], function(core) {
-						core.boot();
-						core.attachInit(resolve);
+					sap.ui.require(["sap/ui/core/Core"], function(Core) {
+						Core.boot();
+						Core.ready().then(resolve);
 					});
 				});
 			});

package/test/sap/ui/core/qunit/rule/config/asynchronousXMLViews.qunit.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	"use strict";
 
 	QUnit.module("sap.ui.core asynchronousXMLViews rule tests", {
-		beforeEach: function() {
+		beforeEach: async function() {
 			Log.setLevel(4);
 
 			var sViewContent =
@@ -43,31 +43,22 @@ sap.ui.define([
 				]
 			});
 
-			this.pComponent = sap.ui.getCore().createComponent({
-				name: "testdata.routing",
-				async: true
+			this.oSyncComponent = await Component.create({
+				name: "testdata.routing"
 			});
 
-			this.pComponent.then(function(oComponent) {
-				oComponent.getRouter()._oConfig._async = false;
-			});
+			this.oSyncComponent.getRouter()._oConfig._async = false;
 
-			this.pComponentAsyncConfig = sap.ui.getCore().createComponent({
-				name: "testdata.routing",
-				async: true
+			this.oAsyncComponent = await Component.create({
+					name: "testdata.routing"
 			});
 
 			this.oComponentWithoutRouter = new Component();
-
 		},
 		afterEach: function() {
 			this.oRootControl.destroy();
-			this.pComponent.then(function(oComponent) {
-				oComponent.destroy();
-			});
-			this.pComponentAsyncConfig.then(function(oComponent) {
-				oComponent.destroy();
-			});
+			this.oSyncComponent.destroy();
+			this.oAsyncComponent.destroy();
 			this.oComponentWithoutRouter.destroy();
 		}
 	});
@@ -76,6 +67,6 @@ sap.ui.define([
 		executionScopeType: "global",
 		libName: "sap.ui.core",
 		ruleId: "asynchronousXMLViews",
-		expectedNumberOfIssues: 1
+		expectedNumberOfIssues: 2
 	});
 });

package/test/sap/ui/core/qunit/support/techinfo/TechnicalInfoTestbench.html

@@ -14,8 +14,10 @@
 	>
 	</script>
 	<script>
-		sap.ui.getCore().attachInit(function () {
+		sap.ui.require(["sap/ui/core/Core"], function(Core) {
+			Core.ready().then(function () {
 			new sap.m.Text({text: "A simple test page that is used to trigger the Technical Information Dialog"}).placeAt("content");
+			});
 		});
 	</script>
 </head>

package/test/sap/ui/core/qunit/test/starter/find/index.html

@@ -9,7 +9,7 @@
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-libs="sap.m,sap.ui.table"
 			data-sap-ui-async="true"
-			data-sap-ui-theme="sap_fiori_3"
+			data-sap-ui-theme="sap_horizon"
 			data-sap-ui-resourceroots='{"apps":"test-resources/sap/ui/core/qunit/test/starter/"}'
 			data-sap-ui-oninit="module:apps/find/main"></script>
 </head>

package/test/sap/ui/core/qunit/test/starter/find/main.js

@@ -19,6 +19,7 @@ sap.ui.define([
 	"sap/m/SegmentedButtonItem",
 	"sap/m/Text",
 	"sap/m/Toolbar",
+	"sap/ui/core/Core",
 	"sap/ui/table/Table",
 	"sap/ui/table/Column",
 	"sap/ui/model/Filter",
@@ -30,7 +31,7 @@ sap.ui.define([
 	"require",
 	"./discovery",
 	"./filter"
-], function(App, Bar, HBox, Label, Link, Page, SearchField, SegmentedButton, SegmentedButtonItem, Text, Toolbar, Table, Column, Filter, JSONModel, Log, includeStylesheet, Storage, _utils, require, discovery, makeFilterFunction) {
+], function(App, Bar, HBox, Label, Link, Page, SearchField, SegmentedButton, SegmentedButtonItem, Text, Toolbar, Core, Table, Column, Filter, JSONModel, Log, includeStylesheet, Storage, _utils, require, discovery, makeFilterFunction) {
 	"use strict";
 
 	function compare(s1,s2) {
@@ -309,7 +310,7 @@ sap.ui.define([
 	const url = new URL(window.location.href);
 
 	const uiCreated = new Promise( (resolve, reject) => {
-		sap.ui.getCore().attachInit(() => {
+		Core.ready().then(() => {
 			const showSuite = url.searchParams.has('showSuite');
 			createUI(showSuite).then( resolve, reject );
 		});