@openui5/sap.ui.core 1.126.0 → 1.127.0

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

@@ -1,3 +1,4 @@
+/*global testdata */
 sap.ui.define([
 	"sap/base/config",
 	"sap/base/future",
@@ -38,7 +39,7 @@ sap.ui.define([
 	sap.ui.loader.config({
 		paths: {
 			"sap/ui/originalmodel": sap.ui.require.toUrl("sap/ui/model/"),
-			"sap/ui/test/originalv2models": sap.ui.require.toUrl("sap/ui/test/v2models/")
+			"testdata/originalv2models": sap.ui.require.toUrl("testdata/v2models/")
 		}
 	});
 	sap.ui.define("sap/ui/model/json/JSONModel", ["sap/ui/originalmodel/json/JSONModel"], function(OrigJSONModel) {
@@ -62,7 +63,7 @@ sap.ui.define([
 	sap.ui.define("sap/ui/model/xml/XMLModel", ["sap/ui/originalmodel/xml/XMLModel"], function(OrigXMLModel) {
 		return sinon.spy(OrigXMLModel);
 	});
-	sap.ui.define("sap/ui/test/v2models/parent/CustomModel", ["sap/ui/test/originalv2models/parent/CustomModel"], function(OrigCustomModel) {
+	sap.ui.define("testdata/v2models/parent/CustomModel", ["testdata/originalv2models/parent/CustomModel"], function(OrigCustomModel) {
 		return sinon.spy(OrigCustomModel);
 	});
 
@@ -74,7 +75,7 @@ sap.ui.define([
 				"sap/ui/model/odata/v4/ODataModel",
 				"sap/ui/model/resource/ResourceModel",
 				"sap/ui/model/xml/XMLModel",
-				"sap/ui/test/v2models/parent/CustomModel",
+				"testdata/v2models/parent/CustomModel",
 				/**
 				 * @deprecated As of version 1.48
 				 */
@@ -116,7 +117,7 @@ sap.ui.define([
 					sap.ui.model.json.JSONModel = JSONModel;
 					sap.ui.model.xml.XMLModel = XMLModel;
 					sap.ui.model.resource.ResourceModel = ResourceModel;
-					sap.ui.test.v2models.parent.CustomModel = CustomModel;
+					testdata.v2models.parent.CustomModel = CustomModel;
 				})();
 
 				for (const name in spies) {
@@ -282,7 +283,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: false
 		}).then(function(oComponent) {
 
@@ -408,7 +409,7 @@ sap.ui.define([
 
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// model: "resourceBundle-legacy-uri"
@@ -417,7 +418,7 @@ sap.ui.define([
 			});
 
 
-			// sap.ui.test.v2models.parent.CustomModel
+			// testdata.v2models.parent.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 7);
 
 			// model: "custom-uri-string"
@@ -454,7 +455,7 @@ sap.ui.define([
 			// Log.error
 			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
 			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"testdata.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
 			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
 			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
 			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
@@ -510,7 +511,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parentValid",
+			name: "testdata.v2models.parentValid",
 			manifest: false
 		}).then(function (oComponent) {
 
@@ -605,7 +606,7 @@ sap.ui.define([
 
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// model: "resourceBundle-legacy-uri"
@@ -614,7 +615,7 @@ sap.ui.define([
 			});
 
 
-			// sap.ui.test.v2models.parent.CustomModel
+			// testdata.v2models.parent.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 7);
 
 			// model: "custom-uri-string"
@@ -692,7 +693,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent",
+				"id": "testdata.v2models.parent",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -737,7 +738,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
 			assert.ok(error.message.includes(`Component Manifest: ODataAnnotation "undefined" for dataSource "odata-invalid-annotations" could not be found in manifest`),
@@ -755,7 +756,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent",
+				"id": "testdata.v2models.parent",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -795,7 +796,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
 			assert.ok(error.message.includes(`Component Manifest: dataSource "invalid" for model "dataSource-invalid" not found or invalid`),
@@ -813,7 +814,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent",
+				"id": "testdata.v2models.parent",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -852,7 +853,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
 			assert.ok(error.message.includes(`Component Manifest: dataSource "does-not-exist" for model "dataSource-not-found" not found or invalid`),
@@ -870,7 +871,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent",
+				"id": "testdata.v2models.parent",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -901,17 +902,17 @@ sap.ui.define([
 				"models": {
 					"": "default",
 					"model-not-found": {
-						"type": "sap.ui.test.v2models.parent.ModelNotDefined"
+						"type": "testdata.v2models.parent.ModelNotDefined"
 					}
 				}
 			}
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
-			assert.ok(error.message.includes(`Component Manifest: Class "sap.ui.test.v2models.parent.ModelNotDefined" for model "model-not-found" could not be found`),
+			assert.ok(error.message.includes(`Component Manifest: Class "testdata.v2models.parent.ModelNotDefined" for model "model-not-found" could not be found`),
 				"Error thrown because model is not found.");
 
 			future.active = undefined;
@@ -926,7 +927,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent",
+				"id": "testdata.v2models.parent",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -964,7 +965,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
 			assert.ok(error.message.includes(`Cannot load module 'sap/ui/not/defined/Model'.`),
@@ -983,7 +984,7 @@ sap.ui.define([
 
 			"sap.app": {
 				"_version": "1.0.0",
-				"id": "sap.ui.test.v2models.parent1",
+				"id": "testdata.v2models.parent1",
 				"type": "application",
 				"applicationVersion": {
 					"version": "1.0.0"
@@ -1033,7 +1034,7 @@ sap.ui.define([
 		};
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parent",
+			name: "testdata.v2models.parent",
 			manifest: oManifestJson
 		}).catch((error) => {
 			assert.ok(error.message.includes(`Component Manifest: Provided OData version "3.0" in dataSource "unknown-odataVersion" for model "v2-ODataModel-unknown-odataVersion" is unknown.`),
@@ -1047,7 +1048,7 @@ sap.ui.define([
 		this.stubGetUriParameters({ sapSystem: "BLA_123" });
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parentValid",
+			name: "testdata.v2models.parentValid",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -1089,7 +1090,7 @@ sap.ui.define([
 			//ResourceModel should also not have an origin attached
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// destroy the component
@@ -1108,7 +1109,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parentValid",
+			name: "testdata.v2models.parentValid",
 			manifest: false,
 			componentData: {
 				startupParameters: {
@@ -1155,7 +1156,7 @@ sap.ui.define([
 			//ResourceModel should also not have an origin attached
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// destroy the component
@@ -1173,7 +1174,7 @@ sap.ui.define([
 	QUnit.test("metadata v2 with cacheTokens", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parentValid",
+			name: "testdata.v2models.parentValid",
 			manifest: false,
 			asyncHints: {
 				cacheTokens: {
@@ -1225,7 +1226,7 @@ sap.ui.define([
 			//ResourceModel should also not have an origin attached
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// destroy the component
@@ -1244,7 +1245,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.parentValid",
+			name: "testdata.v2models.parentValid",
 			manifest: false,
 			asyncHints: {
 				cacheTokens: {
@@ -1289,7 +1290,7 @@ sap.ui.define([
 			//ResourceModel should also not have an origin attached
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// destroy the component
@@ -1309,7 +1310,7 @@ sap.ui.define([
 			"sapClient": "200"
 		});
 		return Component.create({
-			name: "sap.ui.test.v4models.cacheTokens",
+			name: "testdata.v4models.cacheTokens",
 			manifest: false,
 			asyncHints: {
 				cacheTokens: {
@@ -1355,7 +1356,7 @@ sap.ui.define([
 		this.stubGetUriParameters({ sapSystem: "URL_123" });
 
 		this.oComponent = await Component.create({
-			name: "sap.ui.test.v4models.sapSystem"
+			name: "testdata.v4models.sapSystem"
 		});
 
 		this.assertModelInstances({
@@ -1401,7 +1402,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		this.oComponent = await Component.create({
-			name: "sap.ui.test.v4models.sapSystem",
+			name: "testdata.v4models.sapSystem",
 			componentData: {
 				startupParameters: {
 					"sap-system": "STARTUP123"
@@ -1452,7 +1453,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v2models.extension",
+			name: "testdata.v2models.extension",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -1533,7 +1534,7 @@ sap.ui.define([
 
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// model: "resourceBundle-legacy-uri"
@@ -1541,7 +1542,7 @@ sap.ui.define([
 				bundleUrl: "test-resources/sap/ui/core/qunit/component/testdata/v2models/parentValid/i18n.properties"
 			});
 
-			// sap.ui.test.v2models.parent.CustomModel
+			// testdata.v2models.parent.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 7);
 
 			// model: "custom-uri-string"
@@ -1611,7 +1612,7 @@ sap.ui.define([
 	QUnit.test("metadata v2 without models", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v2empty"
+			name: "testdata.v2empty"
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 
@@ -1623,7 +1624,7 @@ sap.ui.define([
 			sinon.assert.callCount(this.modelSpy.xml, 0);
 			// sap.ui.model.resource.ResourceModel
 			sinon.assert.callCount(this.modelSpy.resource, 0);
-			// sap.ui.test.v2models.CustomModel
+			// testdata.v2models.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 0);
 
 			assert.ok(!this.oComponent.getModel(), "Component should not have a model");
@@ -1638,13 +1639,13 @@ sap.ui.define([
 	QUnit.test("dynamic enhance of models and datasources", function(assert) {
 		this.stubGetUriParameters();
 
-		sap.ui.define("sap/ui/test/v2local/Component", ["sap/ui/core/UIComponent"], function(UIComponent) {
+		sap.ui.define("testdata/v2local/Component", ["sap/ui/core/UIComponent"], function(UIComponent) {
 
-			var LocalComponent = UIComponent.extend("sap.ui.test.v2local.Component", {
+			var LocalComponent = UIComponent.extend("testdata.v2local.Component", {
 				metadata : {
 					manifest : {
 						"sap.app": {
-							"id": "sap.ui.test.v2local"
+							"id": "testdata.v2local"
 						}
 					}
 				}
@@ -1692,7 +1693,7 @@ sap.ui.define([
 		});
 
 		return Component.create({
-			name: "sap.ui.test.v2local",
+			name: "testdata.v2local",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -1723,7 +1724,7 @@ sap.ui.define([
 	QUnit.test("consume V2 service with V4 model", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v4models",
+			name: "testdata.v4models",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -1751,7 +1752,7 @@ sap.ui.define([
 
 	QUnit.test("pass unsupported service version to V4 model", function(assert) {
 		return Component.create({
-			name: "sap.ui.test.v4models.unsupportedVersion",
+			name: "testdata.v4models.unsupportedVersion",
 			manifest: false
 		}).then(function(oComponent) {
 			assert.ok(false, "creating a component that uses an unupported OData version must not succeed");
@@ -1776,7 +1777,7 @@ sap.ui.define([
 		// The modelsMisc Component is intended to hold tests for additional parameters that just need
 		// to be passed onwards to the models.
 		return Component.create({
-			name: "sap.ui.test.modelsMisc"
+			name: "testdata.modelsMisc"
 		}).then(function(oComponent) {
 
 			// check if models exist
@@ -1908,7 +1909,7 @@ sap.ui.define([
 
 			// model: "resourceBundle-name"
 			sinon.assert.calledWithExactly(this.modelSpy.resource, {
-				bundleName: "sap.ui.test.v2models.parent.i18n"
+				bundleName: "testdata.v2models.parent.i18n"
 			});
 
 			// model: "resourceBundle-legacy-uri"
@@ -1917,7 +1918,7 @@ sap.ui.define([
 			});
 
 
-			// sap.ui.test.v2models.parent.CustomModel
+			// testdata.v2models.parent.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 7);
 
 			// model: "custom-uri-string"
@@ -1986,7 +1987,7 @@ sap.ui.define([
 	QUnit.test("Init component via name", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v2models.empty",
+			name: "testdata.v2models.empty",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -1998,7 +1999,7 @@ sap.ui.define([
 	QUnit.test("Init component via name and manifestFirst", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v2models.empty",
+			name: "testdata.v2models.empty",
 			manifest: true
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -4318,7 +4319,6 @@ sap.ui.define([
 			sap.ui.loader.config({
 				paths: {
 					"path/to/odata/service": "https://remote.system:9000/odata/service",
-					"sap/ui/test/v2models/ui5urls": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls",
 					"another/name/space": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls/another/name/space",
 					"cool.name.space": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls/cool/name/space"
 				}
@@ -4335,11 +4335,11 @@ sap.ui.define([
 			// To keep reusing the same component for async and sync path tests,
 			// we need to unload the Component and remove the leftovers from the ComponentMetadata.
 			// This way all tests start fresh and actually load the Component again.
-			var TestComponent = sap.ui.require("sap/ui/test/v2models/ui5urls/Component");
+			var TestComponent = sap.ui.require("testdata/v2models/ui5Urls/Component");
 			if ( TestComponent ) {
 				delete TestComponent.getMetadata()._oManifest;
 			}
-			privateLoaderAPI.unloadResources('sap/ui/test/v2models/ui5urls/Component.js', true, true, true);
+			privateLoaderAPI.unloadResources('testdata/v2models/ui5Urls/Component.js', true, true, true);
 
 			// remove the previous path-configs/resource-roots
 			sap.ui.loader.config({
@@ -4397,7 +4397,7 @@ sap.ui.define([
 		assert.equal(sap.ui.require.toUrl("this/is/a/resourceRoot"), "resources/this/is/a/resourceRoot", "Resource-roots not defined yet.");
 
 		return Component.create({
-			name: "sap.ui.test.v2models.ui5urls"
+			name: "testdata.v2models.ui5Urls"
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
 			fnAssert.call(this, assert);
@@ -4414,7 +4414,7 @@ sap.ui.define([
 		// url resolution triggered during manifest init
 		// Manifest model init is triggered afterwards during Component constructor, at this time all URLs have been resolved
 		return Component.create({
-			name: "sap.ui.test.v2models.ui5urls",
+			name: "testdata.v2models.ui5Urls",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;

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

@@ -1,5 +1,5 @@
+/*global testdata */
 sap.ui.define([
-	"jquery.sap.global",
 	"sap/base/i18n/Localization",
 	"sap/ui/base/config/URLConfigurationProvider",
 	"sap/base/Log",
@@ -11,8 +11,8 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/xml/XMLModel",
 	"sap/ui/model/resource/ResourceModel",
-	"sap/ui/test/v2models/parent/CustomModel"
-], function(jQuery, Localization, URLConfigurationProvider, Log, Component) {
+	"testdata/v2models/parent/CustomModel"
+], function(Localization, URLConfigurationProvider, Log, Component) {
 
 
 	"use strict";
@@ -33,7 +33,7 @@ sap.ui.define([
 				json: sinon.spy(sap.ui.model.json, "JSONModel"),
 				xml: sinon.spy(sap.ui.model.xml, "XMLModel"),
 				resource: sinon.spy(sap.ui.model.resource, "ResourceModel"),
-				custom: sinon.spy(sap.ui.test.v2models.parent, "CustomModel")
+				custom: sinon.spy(testdata.v2models.parent, "CustomModel")
 			};
 		},
 		restoreModels: function() {
@@ -117,7 +117,7 @@ sap.ui.define([
 			sap.ui.loader.config({
 				paths: {
 					"path/to/odata/service": "https://remote.system:9000/odata/service",
-					"sap/ui/test/v2models/ui5urls": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls",
+					"testdata/v2models/ui5urls": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls",
 					"another/name/space": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls/another/name/space",
 					"cool.name.space": "test-resources/sap/ui/core/qunit/component/testdata/v2models/ui5Urls/cool/name/space"
 				}
@@ -134,8 +134,8 @@ sap.ui.define([
 			// To keep reusing the same component for async and sync path tests,
 			// we need to unload the Component and remove the leftovers from the ComponentMetadata.
 			// This way all tests start fresh and actually load the Component again.
-			sap.ui.loader._.unloadResources('sap/ui/test/v2models/ui5urls/Component.js', true, true, true);
-			delete sap.ui.test.v2models.ui5Urls.Component.getMetadata()._oManifest;
+			sap.ui.loader._.unloadResources('testdata/v2models/ui5urls/Component.js', true, true, true);
+			delete testdata.v2models.ui5Urls.Component.getMetadata()._oManifest;
 
 			// remove the previous path-configs/resource-roots
 			sap.ui.loader.config({
@@ -190,7 +190,7 @@ sap.ui.define([
 		assert.equal(sap.ui.require.toUrl("this/is/a/resourceRoot"), "resources/this/is/a/resourceRoot", "Resource-roots not defined yet.");
 
 		this.oComponent = sap.ui.component({
-			name: "sap.ui.test.v2models.ui5urls",
+			name: "testdata.v2models.ui5urls",
 			manifest: true,
 			async: false
 		});
@@ -205,7 +205,7 @@ sap.ui.define([
 		assert.equal(sap.ui.require.toUrl("this/is/a/resourceRoot"), "resources/this/is/a/resourceRoot", "Resource-roots not defined yet.");
 
 		this.oComponent = sap.ui.component({
-			name: "sap.ui.test.v2models.ui5urls"
+			name: "testdata.v2models.ui5urls"
 		});
 
 		fnAssert.call(this, assert);
@@ -215,7 +215,7 @@ sap.ui.define([
 		this.stubGetUriParameters();
 
 		return Component.create({
-			name: "sap.ui.test.v1",
+			name: "testdata.v1",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -249,7 +249,7 @@ sap.ui.define([
 	QUnit.test("metadata v1 without models", function(assert) {
 
 		return Component.create({
-			name: "sap.ui.test.v1empty",
+			name: "testdata.v1empty",
 			manifest: false
 		}).then(function(oComponent) {
 			this.oComponent = oComponent;
@@ -268,7 +268,7 @@ sap.ui.define([
 			sinon.assert.callCount(this.modelSpy.xml, 0);
 			// sap.ui.model.resource.ResourceModel
 			sinon.assert.callCount(this.modelSpy.resource, 0);
-			// sap.ui.test.v2models.CustomModel
+			// testdata.v2models.CustomModel
 			sinon.assert.callCount(this.modelSpy.custom, 0);
 
 			assert.ok(!this.oComponent.getModel(), "Component should not have a model");

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

@@ -8,7 +8,7 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/mvc/View",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function(future, Log, Button, ManagedObject, Component, ComponentContainer, Element, UIComponent, View, nextUIUpdate) {
 
 	"use strict";
@@ -1845,7 +1845,7 @@ sap.ui.define([
 			window._oHookSpy = this.hookSpy;
 
 			this.requireSpy = this.spy(sap.ui, "require");
-			this.componentName = "sap.ui.test.routerClass";
+			this.componentName = "testdata.routerClass";
 		},
 		afterEach() {
 			this.component.destroy();

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

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

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

@@ -1,7 +1,7 @@
-sap.ui.define(['sap/ui/core/UIComponent'], function (UIComponent) {
+sap.ui.define([	"sap/ui/core/UIComponent"], function (UIComponent) {
 	"use strict";
 
-	return UIComponent.extend("sap.ui.test.dependencyLoading.component1.Component", {
+	return UIComponent.extend("testdata.dependencyLoading.component1.Component", {
 		metadata: {
 			manifest: "json"
 		}

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

@@ -1,9 +1,9 @@
 {
 	"sap.app": {
-		"id": "sap.ui.test.dependencyLoading.component1"
+		"id": "testdata.dependencyLoading.component1"
 	},
 	"sap.ui5": {
-		"componentName": "sap.ui.test.dependencyLoading.component1",
+		"componentName": "testdata.dependencyLoading.component1",
 		"dependencies": {
 			"libs": {
 				"sap.m": {},
@@ -11,7 +11,7 @@
 				"sap.ui.core": {}
 			},
 			"components": {
-				"sap.ui.test.dependencyLoading.component2": {}
+				"testdata.dependencyLoading.component2": {}
 			}
 		}
 	}

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

@@ -1,7 +1,7 @@
-sap.ui.define(['sap/ui/core/UIComponent'], function (UIComponent) {
+sap.ui.define(["sap/ui/core/UIComponent"], function (UIComponent) {
 	"use strict";
 
-	return UIComponent.extend("sap.ui.test.dependencyLoading.component2.Component", {
+	return UIComponent.extend("testdata.dependencyLoading.component2.Component", {
 		metadata: {
 			manifest: "json"
 		}

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

@@ -1,6 +1,6 @@
 {
 	"sap.app": {
-		"id": "sap.ui.test.dependencyLoading.component2"
+		"id": "testdata.dependencyLoading.component2"
 	},
 	"sap.ui5": {
 		"dependencies": {

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

@@ -1,7 +1,7 @@
-sap.ui.define(['sap/ui/test/dependencyLoading/component1/Component'], function (Component1) {
+sap.ui.define(["../component1/Component"], function (Component1) {
 	"use strict";
 
-	return Component1.extend("sap.ui.test.dependencyLoading.component3.Component", {
+	return Component1.extend("testdata.dependencyLoading.component3.Component", {
 		metadata: {
 			manifest: "json"
 		}