@openui5/sap.ui.core 1.126.1 → 1.127.0

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

@@ -8,7 +8,7 @@ sap.ui.define([
 	"sap/ui/core/UIArea",
 	"sap/ui/core/UIAreaRegistry",
 	"sap/ui/qunit/utils/createAndAppendDiv",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/ui/testlib/TestButton",
 	"sap/ui/test/actions/Press",
 	"sap/ui/thirdparty/jquery"

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

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI",
 	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/qunit/utils/waitForThemeApplied"
+	"sap/ui/test/utils/waitForThemeApplied"
 ], function(Localization, Lib, URI, Theming, Parameters, waitForThemeApplied) {
 	"use strict";
 

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

@@ -131,14 +131,7 @@ sap.ui.define(function() {
 				title: "Test Page for Bootstrap within Head",
 				bootCore: false,
 				ui5: {
-					onInit: "module:sap/ui/test/BootstrapMainModule"
-				},
-				loader: {
-					paths: {
-						"sap/ui/test": "test-resources/sap/ui/core/qunit/bootstrap/",
-						"sap/ui/test/qunitPause": "resources/sap/ui/test/qunitPause",
-						"sap/ui/test/RecorderHotkeyListener": "resources/sap/ui/test/RecorderHotkeyListener"
-					}
+					onInit: "module:test-resources/sap/ui/core/qunit/bootstrap/BootstrapMainModule"
 				},
 				beforeBootstrap: "./BootstrapMainModule.beforeBootstrap"
 			},

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

@@ -1,14 +1,14 @@
 sap.ui.define([
 	'sap/ui/qunit/utils/createAndAppendDiv',
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	'sap/ui/core/Component',
 	'sap/ui/core/Supportability',
 	'sap/ui/core/ComponentContainer',
 	'sap/ui/core/ComponentRegistry',
 	'sap/ui/core/Messaging',
 	'sap/ui/core/UIComponentMetadata',
-	'sap/ui/test/routing/Component',
-	'sap/ui/test/routing/RouterExtension',
+	'testdata/routing/Component',
+	'testdata/routing/RouterExtension',
 	'sap/base/Log',
 	'sap/base/util/deepExtend',
 	'sap/base/util/LoaderExtensions',
@@ -65,7 +65,7 @@ sap.ui.define([
 				}
 			}).placeAt("comparea1");
 			return Component.create({
-				name: "sap.ui.test.verticalLayout",
+				name: "testdata.verticalLayout",
 				id: "vLayout",
 				componentData: {
 					"foo": "bar"
@@ -136,7 +136,7 @@ sap.ui.define([
 		assert.equal(oComponent, oComp, "Factory function returns the same instance!");
 
 		return Component.create({
-			name: "sap.ui.test.verticalLayout",
+			name: "testdata.verticalLayout",
 			id: "factoryVLayout"
 		}).then(function() {
 			assert.ok(!!oComponent, "Component has been created!");
@@ -194,7 +194,7 @@ sap.ui.define([
 
 	QUnit.test("[Router] manifest = false", async function(assert) {
 		const oComp = await Component.create({
-			name: "sap.ui.test.routerPreloading",
+			name: "testdata.routerPreloading",
 			manifest: false
 		});
 
@@ -208,7 +208,7 @@ sap.ui.define([
 
 	QUnit.test("[Router] manifest = true", async function(assert) {
 		const oComp = await Component.create({
-			name: "sap.ui.test.routerPreloading"
+			name: "testdata.routerPreloading"
 			// manifest: true // implicitly set
 		});
 
@@ -222,7 +222,7 @@ sap.ui.define([
 
 	QUnit.test("[Targets] manifest = false", async function(assert) {
 		const oComp = await Component.create({
-			name: "sap.ui.test.targetsPreloading",
+			name: "testdata.targetsPreloading",
 			manifest: false
 		});
 
@@ -236,7 +236,7 @@ sap.ui.define([
 
 	QUnit.test("[Targets] manifest = true", async function(assert) {
 		const oComp = await Component.create({
-			name: "sap.ui.test.targetsPreloading",
+			name: "testdata.targetsPreloading",
 			manifest: false
 		});
 
@@ -415,7 +415,7 @@ sap.ui.define([
 	QUnit.module("Creation Context", {
 		beforeEach: function() {
 			return Component.create({
-				name: "sap.ui.test.verticalLayout",
+				name: "testdata.verticalLayout",
 				id: "vLayout",
 				componentData: {
 					"foo": "bar"
@@ -469,7 +469,7 @@ sap.ui.define([
 		beforeEach : function () {
 			// System under test
 			return Component.create({
-				name: "sap.ui.test.routing"
+				name: "testdata.routing"
 			}).then(function(oComponent) {
 				this.oComponent = oComponent;
 			}.bind(this));
@@ -521,7 +521,7 @@ sap.ui.define([
 			sap.ui.require(["sap/m/routing/Targets"], function() {
 				// System under test
 				Component.create({
-					name: "sap.ui.test.routing.targets",
+					name: "testdata.routing.targets",
 					async: true
 				}).then(function(oComponent) {
 					that.oComponent = oComponent;
@@ -561,7 +561,7 @@ sap.ui.define([
 		beforeEach : function () {
 			// System under test
 			return Component.create({
-				name: "sap.ui.test.routing"
+				name: "testdata.routing"
 			}).then(function(oComponent) {
 				this.oComponent = oComponent;
 			}.bind(this));
@@ -1551,7 +1551,7 @@ sap.ui.define([
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
 		return LoaderExtensions.loadResource(
-			"sap/ui/test/mixed_legacyAPIs/manifest.json",
+			"testdata/mixed_legacyAPIs/manifest.json",
 			{async: true}
 		).then(function(oManifest) {
 			return Component.create({
@@ -1573,7 +1573,7 @@ sap.ui.define([
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
 		return LoaderExtensions.loadResource(
-			"sap/ui/test/mixed/manifest.json",
+			"testdata/mixed/manifest.json",
 			{async: true}
 		).then(function(oManifest) {
 			return Component.create({
@@ -1599,14 +1599,14 @@ sap.ui.define([
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
 		return Component.create({
-			name: "sap.ui.test.inherit"
+			name: "testdata.inherit"
 		}).then(function(oComponent) {
 			assert.ok(oComponent, "Component instance is created");
 
 			// _processI18n are called 3 times:
 			//  1. for the oComponent instance itself
-			//  2. for the sap.ui.test.inherit ComponentMetadata
-			//  3. for the inheriting parent sap.ui.test.inherit.parent ComponentMetadata (component.json based)
+			//  2. for the testdata.inherit ComponentMetadata
+			//  3. for the inheriting parent testdata.inherit.parent ComponentMetadata (component.json based)
 			assert.equal(oProcessI18nSpy.callCount, 3, "_processI18n is called for the expected times");
 
 			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
@@ -1624,15 +1624,15 @@ sap.ui.define([
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
 		return Component.create({
-			name: "sap.ui.test.inheritAsync"
+			name: "testdata.inheritAsync"
 		}).then(function(oComponent) {
 			assert.ok(oComponent, "Component instance is created");
 
 			// _processI18n are called 4 times:
 			//  1. for the oComponent instance itself
-			//  2. for the sap.ui.test.inheritAsync ComponentMetadata
-			//  3. for the inheriting parent sap.ui.test.inheritAsync.parentB ComponentMetadata
-			//  4. for the inheriting parent sap.ui.test.inheritAsync.parentA ComponentMetadata
+			//  2. for the testdata.inheritAsync ComponentMetadata
+			//  3. for the inheriting parent testdata.inheritAsync.parentB ComponentMetadata
+			//  4. for the inheriting parent testdata.inheritAsync.parentA ComponentMetadata
 			assert.equal(oProcessI18nSpy.callCount, 4, "_processI18n is called for the expected times");
 
 			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
@@ -2072,7 +2072,7 @@ sap.ui.define([
 	QUnit.test("Hook is called when manifest is given in config object (Hook modifies the manifest)", function(assert) {
 		var oManifestJSON = {
 			"sap.app": {
-				"id": "sap.ui.test.other",
+				"id": "testdata.other",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -2104,7 +2104,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.other",
+			name: "testdata.other",
 			manifest: oManifestJSON
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
@@ -2116,7 +2116,7 @@ sap.ui.define([
 	QUnit.test("Hook is called when manifest is given in config object and there is one new library dependency (Hook modifies the manifest)", function(assert) {
 		var oManifestJSON = {
 			"sap.app": {
-				"id": "sap.ui.test.other",
+				"id": "testdata.other",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -2137,7 +2137,7 @@ sap.ui.define([
 		var oConfig = {
 			manifest: oManifestJSON,
 			async: true,
-			name: "sap.ui.test.other"
+			name: "testdata.other"
 		};
 
 		var oManifestJSONCopy;
@@ -2158,7 +2158,7 @@ sap.ui.define([
 		var oPreprocessManifestSpy = this.spy(Component, "_fnPreprocessManifest");
 
 		return Component.create({
-			name: "sap.ui.test.other",
+			name: "testdata.other",
 			manifest: oManifestJSON
 		}).then(function(oComponent) {
 			// check if the new dependency is correctly taken over
@@ -2184,7 +2184,7 @@ sap.ui.define([
 
 		// loading manifest from default location
 		return Component.create({
-			name: "sap.ui.test.v2asyncRootView"
+			name: "testdata.v2asyncRootView"
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
 			var oModel = oComponent.getModel("sfapi");
@@ -2216,7 +2216,7 @@ sap.ui.define([
 
 		// loading manifest from default location
 		return Component.create({
-			name: "sap.ui.test.v2"
+			name: "testdata.v2"
 		}).then(function(oComponent) {
 			// check if the new dependency is correctly taken over
 			var oSapUi5Property = oComponent.getManifestEntry("sap.ui5");
@@ -2230,7 +2230,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Hook is called when manifest is loaded from the given manifest URL", function(assert) {
-		var sManifestUrl = sap.ui.require.toUrl("sap/ui/test/v2/manifest.json");
+		var sManifestUrl = sap.ui.require.toUrl("testdata/v2/manifest.json");
 
 		// register hook and modify the manifest
 		Component._fnPreprocessManifest = function(oManifestJSON) {
@@ -2242,7 +2242,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2asyncRootView",
+			name: "testdata.v2asyncRootView",
 			manifest: sManifestUrl
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
@@ -2252,7 +2252,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Hook is called when manifest is loaded from the given manifest URL and and there is one new library dependency (Hook modifies the manifest)", function(assert) {
-		var sManifestUrl = sap.ui.require.toUrl("sap/ui/test/v2/manifest.json");
+		var sManifestUrl = sap.ui.require.toUrl("testdata/v2/manifest.json");
 		var oManifestJSONCopy;
 		var oManifestJSONClosure;
 
@@ -2276,7 +2276,7 @@ sap.ui.define([
 		var oPreprocessManifestSpy = this.spy(Component, "_fnPreprocessManifest");
 
 		return Component.create({
-			name: "sap.ui.test.v2asyncRootView",
+			name: "testdata.v2asyncRootView",
 			manifest: sManifestUrl
 		}).then(function(oComponent) {
 			// check if the new dependency is correctly taken over
@@ -2299,7 +2299,7 @@ sap.ui.define([
 		this.oPreprocessManifestSpy = this.spy(Component, "_fnPreprocessManifest");
 
 		return Component.create({
-			name: "sap.ui.test.v2empty"
+			name: "testdata.v2empty"
 		}).then(function() {
 			assert.ok(false, "shouldn't reach here");
 		}, function(sReason) {
@@ -2320,7 +2320,7 @@ sap.ui.define([
 		var oLogStub = this.stub(Log, "error");
 
 		return Component.create({
-			name: "sap.ui.test.v2empty"
+			name: "testdata.v2empty"
 		}).then(function() {
 			assert.ok(false, "shouldn't reach here");
 		}).catch(function(oError) {
@@ -2337,7 +2337,7 @@ sap.ui.define([
 		// create a legacy Component without a manifest.json
 		// Manifest-first loading fails with 404, but is ignored, since the component controller contains metadata.
 		return Component.create({
-			name: "sap.ui.test.other"
+			name: "testdata.other"
 		}).then(function(oComponent) {
 			assert.ok(oComponent, "Component was created.");
 		}).catch(function() {

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

@@ -11,14 +11,6 @@ sap.ui.define([
 
 	var ComponentLifecycle = sapUiCore.ComponentLifecycle;
 
-	sap.ui.loader.config({
-		paths:{
-			"sap/ui/test":"test-resources/sap/ui/core/qunit/component/testdata/",
-			"sap/ui/test/qunitPause": "resources/sap/ui/test/qunitPause",
-			"sap/ui/test/RecorderHotkeyListener": "resources/sap/ui/test/RecorderHotkeyListener"
-		}
-	});
-
 	/*
 	 * Helper to create a ComponentContainer with the given settings,
 	 * triggering component creation and waiting for it.
@@ -398,7 +390,7 @@ sap.ui.define([
 					this.oOwnerComponent = oComponent;
 				}.bind(this)),
 				Component.create({
-					name: "sap.ui.test.v2empty",
+					name: "testdata.v2empty",
 					manifest: false
 				}).then(function(oComponent) {
 					this.oNewComponent = oComponent;
@@ -559,7 +551,7 @@ sap.ui.define([
 			// setup fake server
 			var oManifest = this.oManifest = {
 				"sap.app" : {
-					"id" : "sap.ui.test.v2empty"
+					"id" : "testdata.v2empty"
 				}
 			};
 

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

@@ -10,14 +10,6 @@ sap.ui.define([
 
 	var ComponentLifecycle = sapUiCore.ComponentLifecycle;
 
-	sap.ui.loader.config({
-		paths:{
-			"sap/ui/test":"test-resources/sap/ui/core/qunit/component/testdata/",
-			"sap/ui/test/qunitPause": "resources/sap/ui/test/qunitPause",
-			"sap/ui/test/RecorderHotkeyListener": "resources/sap/ui/test/RecorderHotkeyListener"
-		}
-	});
-
 	/*
 	 * Helper to create a ComponentContainer with the given settings,
 	 * triggering component creation and waiting for it.
@@ -136,7 +128,7 @@ sap.ui.define([
 					this.oOwnerComponent = oComponent;
 				}.bind(this)),
 				Component.create({
-					name: "sap.ui.test.v2empty",
+					name: "testdata.v2empty",
 					manifest: false
 				}).then(function(oComponent) {
 					this.oNewComponent = oComponent;
@@ -236,7 +228,7 @@ sap.ui.define([
 			// setup fake server
 			var oManifest = this.oManifest = {
 				"sap.app" : {
-					"id" : "sap.ui.test.v2empty"
+					"id" : "testdata.v2empty"
 				}
 			};
 

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	var mSettings = {
 		"div1": {
 			id: "container1",
-			name: "sap.ui.test.v2empty",
+			name: "testdata.v2empty",
 			settings: {
 				id: "component1"
 			},
@@ -51,7 +51,7 @@ sap.ui.define([
 		},
 		"div2": {
 			id: "container2",
-			name: "sap.ui.test.v2empty",
+			name: "testdata.v2empty",
 			settings: {
 				id: "component2"
 			},
@@ -63,7 +63,7 @@ sap.ui.define([
 		},
 		"div3": {
 			id: "container3",
-			name: "sap.ui.test.v2empty",
+			name: "testdata.v2empty",
 			settings: {
 				id: "component3"
 			},
@@ -78,7 +78,7 @@ sap.ui.define([
 		 */
 		"div4": {
 			id: "container4",
-			name: "sap.ui.test.v2empty",
+			name: "testdata.v2empty",
 			settings: {
 				id: "component4"
 			},
@@ -251,7 +251,7 @@ sap.ui.define([
 				assert.ok(oComponent instanceof UIComponent, `UIComponent instance for Component ${i} found!`);
 
 				assert.equal(oComponent.getId(), `${oContainer.getId()}-component${i}`, `The id of Component ${i} is correct!`);
-				assert.equal(oComponent.getMetadata().getName(), "sap.ui.test.v2empty.Component", `The name of the Component ${i} is correct!`);
+				assert.equal(oComponent.getMetadata().getName(), "testdata.v2empty.Component", `The name of the Component ${i} is correct!`);
 			}
 
 			// Executing run again afterwards also shouldn't try to create the same containers again

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

@@ -33,8 +33,8 @@ sap.ui.define([
 				"gav": "<GAV>",
 				"libraries": [],
 				"components": {
-					"sap.ui.test.componentContainedInLibrary.Comp1": {
-						"library": "sap.ui.test.componentContainedInLibrary",
+					"testdata.componentContainedInLibrary.Comp1": {
+						"library": "testdata.componentContainedInLibrary",
 						"manifestHints": {
 							"dependencies": {
 								"libs": {
@@ -45,9 +45,9 @@ sap.ui.define([
 							}
 						}
 					},
-					"sap.ui.test.componentContainedInLibrary.Comp2": {
+					"testdata.componentContainedInLibrary.Comp2": {
 						"hasOwnPreload": true,
-						"library": "sap.ui.test.componentContainedInLibrary",
+						"library": "testdata.componentContainedInLibrary",
 						"manifestHints": {
 							"dependencies": {
 								"libs": {
@@ -75,14 +75,14 @@ sap.ui.define([
 		var loadPreload = this.stub(sap.ui.loader._, "loadJSResourceAsync").returns(success);
 
 		return Component.create({
-			name: "sap.ui.test.componentContainedInLibrary.Comp1",
+			name: "testdata.componentContainedInLibrary.Comp1",
 			manifest: false
 		}).catch(noop).finally(function() {
 			assert.ok(loadLibs.calledWith(
-				sinon.match.array.contains(["sap.m", "sap.ui.core", "sap.ui.layout", "sap.ui.test.componentContainedInLibrary"])),
+				sinon.match.array.contains(["sap.m", "sap.ui.core", "sap.ui.layout", "testdata.componentContainedInLibrary"])),
 				"...then that library should be implicitly loaded");
 			assert.ok(
-				loadPreload.neverCalledWith(sinon.match(/sap\/ui\/test\/componentContainedInLibrary\/Comp1\/Component-preload\.js$/)),
+				loadPreload.neverCalledWith(sinon.match(/testdata\/componentContainedInLibrary\/Comp1\/Component-preload\.js$/)),
 				"...then no Component-preload file should be requested for the component");
 		});
 	});
@@ -93,14 +93,14 @@ sap.ui.define([
 		var loadPreload = this.stub(sap.ui.loader._, "loadJSResourceAsync").returns(success);
 
 		return Component.create({
-			name: "sap.ui.test.componentContainedInLibrary.Comp2",
+			name: "testdata.componentContainedInLibrary.Comp2",
 			manifest: false
 		}).catch(noop).finally(function() {
 			assert.ok(
-				loadLibs.neverCalledWith(sinon.match.array.contains(["sap.ui.test.componentContainedInLibrary"])),
+				loadLibs.neverCalledWith(sinon.match.array.contains(["testdata.componentContainedInLibrary"])),
 				"...then the containing library should not be loaded");
 			assert.ok(
-				loadPreload.calledWith(sinon.match(/sap\/ui\/test\/componentContainedInLibrary\/Comp2\/Component-preload\.js$/)),
+				loadPreload.calledWith(sinon.match(/testdata\/componentContainedInLibrary\/Comp2\/Component-preload\.js$/)),
 				"...then a Component-preload file should be requested for the component");
 		});
 	});

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

@@ -22,12 +22,12 @@ sap.ui.define([
 
 	QUnit.test("Simple component", function (assert) {
 		return Component.create({
-			name: "sap.ui.test.dependencyLoading.component1",
+			name: "testdata.dependencyLoading.component1",
 			manifest: false
 		}).then(function (oComponent) {
 			// Check loading of dependencies and includes for each ComponentMetadata of the loaded component
 			assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.withArgs(sinon.match.truthy).callCount, 3,
-				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1) with parameter bAsync = true");
+				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and testdata.dependencyLoading.component1) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
 			assert.strictEqual(this.oLoadLibrarySpy.callCount, 3, "Library._load() called 3 times");
@@ -42,12 +42,12 @@ sap.ui.define([
 
 	QUnit.test("Component variant", function (assert) {
 		return Component.create({
-			name: "sap.ui.test.dependencyLoading.component1",
-			manifest: sap.ui.require.toUrl("sap/ui/test/dependencyLoading/componentVariant") + "/manifest.json"
+			name: "testdata.dependencyLoading.component1",
+			manifest: sap.ui.require.toUrl("testdata/dependencyLoading/componentVariant") + "/manifest.json"
 		}).then(function (oComponent) {
 			// Check loading of dependencies and includes for each ComponentMetadata of the loaded component
 			assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.withArgs(sinon.match.truthy).callCount, 3,
-				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1 with variant manifest) with parameter bAsync = true");
+				"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and testdata.dependencyLoading.component1 with variant manifest) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
 			assert.strictEqual(this.oLoadLibrarySpy.callCount, 4, "Library._load() called 4 times");
@@ -71,12 +71,12 @@ sap.ui.define([
 
 	QUnit.test("Extended component", function (assert) {
 		return Component.create({
-			name: "sap.ui.test.dependencyLoading.component4",
+			name: "testdata.dependencyLoading.component4",
 			manifest: false
 		}).then(function (oComponent) {
 			// Check loading of dependencies and includes for each ComponentMetadata of the loaded component
 			assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.withArgs(sinon.match.truthy).callCount, 5,
-				"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, sap.ui.test.dependencyLoading.component1, sap.ui.test.dependencyLoading.component3 and sap.ui.test.dependencyLoading.component4) with parameter bAsync = true");
+				"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, testdata.dependencyLoading.component1, testdata.dependencyLoading.component3 and testdata.dependencyLoading.component4) with parameter bAsync = true");
 
 			// Check for the expected libraries to be loaded
 			assert.strictEqual(this.oLoadLibrarySpy.callCount, 9, "Library._load() called nine times");

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

@@ -21,14 +21,14 @@ sap.ui.define([
 
 	QUnit.test("Simple component", function (assert) {
 		var oComponent = sap.ui.component({
-			name: "sap.ui.test.dependencyLoading.component1"
+			name: "testdata.dependencyLoading.component1"
 		});
 
 		// Check loading of dependencies and includes for each ComponentMetadata of the loaded component
 		assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.withArgs(sinon.match.truthy).callCount, 0,
-			"Function loadDependenciesAndIncludes never called (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1) with parameter bAsync = true");
+			"Function loadDependenciesAndIncludes never called (for sap.ui.core.Component, sap.ui.core.UIComponent and testdata.dependencyLoading.component1) with parameter bAsync = true");
 		assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.callCount, 3,
-			"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and sap.ui.test.dependencyLoading.component1) without parameter");
+			"Function loadDependenciesAndIncludes called three times (for sap.ui.core.Component, sap.ui.core.UIComponent and testdata.dependencyLoading.component1) without parameter");
 
 		// Check for the expected libraries to be loaded
 		assert.strictEqual(this.oLoadLibrarySpy.callCount, 3, "Library._load() called 3 times");
@@ -42,14 +42,14 @@ sap.ui.define([
 
 	QUnit.test("Extended component", function (assert) {
 		var oComponent = sap.ui.component({
-			name: "sap.ui.test.dependencyLoading.component6"
+			name: "testdata.dependencyLoading.component6"
 		});
 
 		// Check loading of dependencies and includes for each ComponentMetadata of the loaded component
 		assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.withArgs(sinon.match.truthy).callCount, 0,
-			"Function loadDependenciesAndIncludes never called (for sap.ui.core.Component, sap.ui.core.UIComponent, sap.ui.test.dependencyLoading.component1, sap.ui.test.dependencyLoading.component3 and sap.ui.test.dependencyLoading.component4) with parameter bAsync = true");
+			"Function loadDependenciesAndIncludes never called (for sap.ui.core.Component, sap.ui.core.UIComponent, testdata.dependencyLoading.component1, testdata.dependencyLoading.component3 and testdata.dependencyLoading.component4) with parameter bAsync = true");
 		assert.strictEqual(this.oLoadDependeciesAndIncludesSpy.callCount, 5,
-			"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, sap.ui.test.dependencyLoading.component1, sap.ui.test.dependencyLoading.component3 and sap.ui.test.dependencyLoading.component4) without parameter");
+			"Function loadDependenciesAndIncludes called five times (for sap.ui.core.Component, sap.ui.core.UIComponent, testdata.dependencyLoading.component1, testdata.dependencyLoading.component3 and testdata.dependencyLoading.component4) without parameter");
 
 		assert.strictEqual(this.oLoadLibrarySpy.callCount, 9, "Library._load() called nine times");
 		assert.ok(this.oLoadLibrarySpy.getCall(0).calledWithExactly("sap.m", { sync: true }), "First Library._load() call with arguments: 'sap.m', { sync: true }");

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

@@ -1,11 +1,11 @@
 sap.ui.define([
 	'sap/ui/qunit/utils/createAndAppendDiv',
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	'sap/ui/core/Component',
 	'sap/ui/core/ComponentContainer',
 	'sap/ui/core/UIComponent',
 	'sap/ui/core/UIComponentMetadata',
-	'sap/ui/test/routing/RouterExtension',
+	'testdata/routing/RouterExtension',
 	'sap/base/util/deepExtend'
 ], function (createAndAppendDiv, nextUIUpdate, Component, ComponentContainer, UIComponent, UIComponentMetadata, SamplesRouterExtension, deepExtend) {
 
@@ -55,7 +55,7 @@ sap.ui.define([
 				}
 			}).placeAt("comparea1");
 			this.oComp = sap.ui.getCore().createComponent({
-				name: "sap.ui.test.verticalLayout_legacyAPIs",
+				name: "testdata.verticalLayout_legacyAPIs",
 				id: "vLayout",
 				componentData: {
 					"foo": "bar"
@@ -130,7 +130,7 @@ sap.ui.define([
 		var oComponent = sap.ui.component(oComp.getId());
 		assert.equal(oComponent, oComp, "Factory function returns the same instance!");
 		oComponent = sap.ui.component({
-			name: "sap.ui.test.verticalLayout_legacyAPIs",
+			name: "testdata.verticalLayout_legacyAPIs",
 			id: "factoryVLayout"
 		});
 		assert.ok(!!oComponent, "Component has been created!");
@@ -174,7 +174,7 @@ sap.ui.define([
 	QUnit.module("Creation Context", {
 		beforeEach: function() {
 			this.oComp = sap.ui.getCore().createComponent({
-				name: "sap.ui.test.verticalLayout_legacyAPIs",
+				name: "testdata.verticalLayout_legacyAPIs",
 				id: "vLayout",
 				componentData: {
 					"foo": "bar"
@@ -205,7 +205,7 @@ sap.ui.define([
 		beforeEach : function () {
 			// System under test
 			this.oComponent = sap.ui.getCore().createComponent({
-				name: "sap.ui.test.routing_legacyAPIs"
+				name: "testdata.routing_legacyAPIs"
 			});
 		},
 		afterEach: function() {
@@ -248,7 +248,7 @@ sap.ui.define([
 			sap.ui.require(["sap/m/routing/Targets"], function() {
 				// System under test
 				that.oComponent = sap.ui.getCore().createComponent({
-					name: "sap.ui.test.routing_legacyAPIs.targets"
+					name: "testdata.routing_legacyAPIs.targets"
 				});
 				done();
 			});
@@ -280,7 +280,7 @@ sap.ui.define([
 		beforeEach : function () {
 			// System under test
 			this.oComponent = sap.ui.getCore().createComponent({
-				name: "sap.ui.test.routing_legacyAPIs"
+				name: "testdata.routing_legacyAPIs"
 			});
 		},
 		afterEach: function() {

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

@@ -6,7 +6,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/qunit/utils/createAndAppendDiv",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function(Event, Component, ComponentContainer, Element, Controller, View, createAndAppendDiv, nextUIUpdate) {
 
 	"use strict";