@openui5/sap.ui.core 1.124.2 → 1.126.0

package/test/sap/ui/core/InvisibleControls.html

@@ -7,6 +7,7 @@
 <script src="shared-config.js"></script>
 <script id="sap-ui-bootstrap"
 		src="../../../../resources/sap-ui-core.js"
+		data-sap-ui-libs="sap.ui.commons, sap.ui.ux3, sap.ui.unified, sap.m, sap.ui.table"
 		data-sap-ui-theme="sap_bluecrystal">
 </script>
 
@@ -64,24 +65,13 @@
 </style>
 
 <script>
-	try{
-		sap.ui.getCore().loadLibrary("sap.ui.commons");
-		sap.ui.getCore().loadLibrary("sap.ui.ux3");
-		sap.ui.getCore().loadLibrary("sap.ui.unified");
-		sap.ui.getCore().loadLibrary("sap.m");
-		sap.ui.getCore().loadLibrary("sap.ui.table");
-	}catch(e){
-		alert("This test page requires the library 'sap.ui.commons' which is not available.");
-		throw(e);
-	}
-
 	var aInvisibleControls = [];
 	var oLayout = new sap.ui.commons.layout.MatrixLayout({
 		width: "95%"
 	}).addStyleClass("displayTable").addDelegate({
 		onAfterRendering: function() {
 			var $Status = jQuery("#status_renderings");
-			$Status.text(parseInt($Status.text(), 10) + 1);
+			$Status.text(parseInt($Status.text()) + 1);
 		}
 	});
 
@@ -98,10 +88,10 @@
 		aInvisibleControls.push(oInvisibleControl);
 
 		oLayout.createRow(
-			new sap.ui.commons.Label({ text: sTitle }),
+			new sap.m.Label({ text: sTitle }),
 			oControl,
 			oInvisibleControl,
-			new sap.ui.commons.Button({
+			new sap.m.Button({
 				text: "toggle",
 				press: function() {
 					toggleVisible(0, oInvisibleControl);
@@ -116,7 +106,7 @@
 		for (var i = 0; i < arguments.length; i++) {
 			var oContent = arguments[i];
 			if (typeof oContent === "string") {
-				oContent = new sap.ui.commons.Label({text: oContent});
+				oContent = new sap.m.Label({text: oContent});
 			}
 			var oCell = new sap.ui.commons.layout.MatrixLayoutCell({content: oContent});
 			oCell.addStyleClass("heading");
@@ -137,9 +127,9 @@
 		"Control name",
 		"Visible",
 		"Invisible",
-		new sap.ui.commons.Button({ text: "Toggle All", press: toggleAllVisible })
+		new sap.m.Button({ text: "Toggle All", press: toggleAllVisible })
 	);
-	oLayout.getRows()[0].addStyleClass("firstRow")
+	oLayout.getRows()[0].addStyleClass("firstRow");
 
 	oLayout.placeAt("uiArea1");
 
@@ -147,49 +137,54 @@
 	addRow("core/Icon", new sap.ui.core.Icon({src: "sap-icon://menu"}));
 
 	addHeadingRow("sap.ui.layout");
-	addRow("layout/FixFlex", new sap.ui.layout.FixFlex({ fixContent: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-	addRow("layout/HorizontalLayout", new sap.ui.layout.HorizontalLayout({ content: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-	addRow("layout/VerticalLayout", new sap.ui.layout.VerticalLayout({ content: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-
-	addHeadingRow("sap.ui.commons");
-	addRow("commons/Button", new sap.ui.commons.Button({ text: "A" }));
-	addRow("commons/CheckBox", new sap.ui.commons.CheckBox());
-	addRow("commons/FormattedTextView", new sap.ui.commons.FormattedTextView({ htmlText: "Test<strong>Test</strong>Test" }));
-	addRow("commons/HorizontalDivider", new sap.ui.commons.HorizontalDivider());
-	addRow("commons/Image", new sap.ui.commons.Image({ src: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png" }));
-	addRow("commons/Label", new sap.ui.commons.Label({ text: "A" }));
-	addRow("commons/Link", new sap.ui.commons.Link({text: "Link", href: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png"}));
-	addRow("commons/ListBox", new sap.ui.commons.ListBox({ items: [new sap.ui.core.Item({ text: 'A'}),new sap.ui.core.Item({ text: 'B'}) ]}));
-	addRow("commons/MenuBar", new sap.ui.commons.MenuBar({ items: [new sap.ui.unified.MenuItem({text: "A"}), new sap.ui.unified.MenuItem({text: "B"})]}));
-	// addRow("commons/MessageBar", new sap.ui.commons.MessageBar()); // TODO: Not a standard rendered control. Talk to owner.
-	// addRow("commons/MessageList", new sap.ui.commons.MessageList()); // TODO: Not a standard rendered control. Talk to owner.
-	addRow("commons/Panel", new sap.ui.commons.Panel({ content: new sap.ui.commons.Button({text: "A"})}));
-	addRow("commons/ProgressIndicator", new sap.ui.commons.ProgressIndicator());
-	addRow("commons/RadioButton", new sap.ui.commons.RadioButton());
-	addRow("commons/RadioButtonGroup", new sap.ui.commons.RadioButtonGroup({ items: [new sap.ui.core.Item({ text: 'A'}),new sap.ui.core.Item({ text: 'B'}) ]}));
-	addRow("commons/RatingIndicator", new sap.ui.commons.RatingIndicator());
-	addRow("commons/RoadMap", new sap.ui.commons.RoadMap({ steps: [new sap.ui.commons.RoadMapStep({label: "A"}), new sap.ui.commons.RoadMapStep({label: "B"})] }));
-	addRow("commons/RowRepeater", new sap.ui.commons.RowRepeater({ rows: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-	addRow("commons/SearchField", new sap.ui.commons.SearchField());
-	addRow("commons/SegmentedButton", new sap.ui.commons.SegmentedButton({ buttons: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-	addRow("commons/Slider", new sap.ui.commons.Slider());
-	addRow("commons/Splitter", new sap.ui.commons.Splitter({ firstPaneContent: new sap.ui.commons.Button({ text: "A"}), secondPaneContent: new sap.ui.commons.Button({ text: "B"}) }));
-	addRow("commons/TextField", new sap.ui.commons.TextField());
-	addRow("commons/TriStateCheckBox", new sap.ui.commons.TriStateCheckBox());
-	addRow("commons/TextView", new sap.ui.commons.TextView({ text: "Test" }));
-	addRow("commons/Toolbar", new sap.ui.commons.Toolbar({ items: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
-
-	addHeadingRow("sap.ui.commons.layout");
-	addRow("commons.layout/AbsoluteLayout", new sap.ui.commons.layout.AbsoluteLayout({width: "100%", height: "30px", positions: [
-		new sap.ui.commons.layout.PositionContainer({top: "0", left: "0", control: new sap.ui.commons.Button({ text: "B"})})
-	]})); // TODO: Renderer had doBeforeRendring before returning when invisible.
-	addRow("commons.layout/MatrixLayout", new sap.ui.commons.layout.MatrixLayout({ rows: [
-		new sap.ui.commons.layout.MatrixLayoutRow({cells: [
-			new sap.ui.commons.layout.MatrixLayoutCell({content: [
-				new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})
+	addRow("layout/FixFlex", new sap.ui.layout.FixFlex({ fixContent: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})] }));
+	addRow("layout/HorizontalLayout", new sap.ui.layout.HorizontalLayout({ content: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})] }));
+	addRow("layout/VerticalLayout", new sap.ui.layout.VerticalLayout({ content: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})] }));
+
+	/**
+	 * @deprecated As of version 1.38, together with sap.ui.ux3
+	 */
+	(() => {
+		addHeadingRow("sap.ui.commons");
+		addRow("commons/Button", new sap.ui.commons.Button({ text: "A" }));
+		addRow("commons/CheckBox", new sap.ui.commons.CheckBox());
+		addRow("commons/FormattedTextView", new sap.ui.commons.FormattedTextView({ htmlText: "Test<strong>Test</strong>Test" }));
+		addRow("commons/HorizontalDivider", new sap.ui.commons.HorizontalDivider());
+		addRow("commons/Image", new sap.ui.commons.Image({ src: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png" }));
+		addRow("commons/Label", new sap.ui.commons.Label({ text: "A" }));
+		addRow("commons/Link", new sap.ui.commons.Link({text: "Link", href: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png"}));
+		addRow("commons/ListBox", new sap.ui.commons.ListBox({ items: [new sap.ui.core.Item({ text: 'A'}),new sap.ui.core.Item({ text: 'B'}) ]}));
+		addRow("commons/MenuBar", new sap.ui.commons.MenuBar({ items: [new sap.ui.unified.MenuItem({text: "A"}), new sap.ui.unified.MenuItem({text: "B"})]}));
+		// addRow("commons/MessageBar", new sap.ui.commons.MessageBar()); // TODO: Not a standard rendered control. Talk to owner.
+		// addRow("commons/MessageList", new sap.ui.commons.MessageList()); // TODO: Not a standard rendered control. Talk to owner.
+		addRow("commons/Panel", new sap.ui.commons.Panel({ content: new sap.ui.commons.Button({text: "A"})}));
+		addRow("commons/ProgressIndicator", new sap.ui.commons.ProgressIndicator());
+		addRow("commons/RadioButton", new sap.ui.commons.RadioButton());
+		addRow("commons/RadioButtonGroup", new sap.ui.commons.RadioButtonGroup({ items: [new sap.ui.core.Item({ text: 'A'}),new sap.ui.core.Item({ text: 'B'}) ]}));
+		addRow("commons/RatingIndicator", new sap.ui.commons.RatingIndicator());
+		addRow("commons/RoadMap", new sap.ui.commons.RoadMap({ steps: [new sap.ui.commons.RoadMapStep({label: "A"}), new sap.ui.commons.RoadMapStep({label: "B"})] }));
+		addRow("commons/RowRepeater", new sap.ui.commons.RowRepeater({ rows: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
+		addRow("commons/SearchField", new sap.ui.commons.SearchField());
+		addRow("commons/SegmentedButton", new sap.ui.commons.SegmentedButton({ buttons: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
+		addRow("commons/Slider", new sap.ui.commons.Slider());
+		addRow("commons/Splitter", new sap.ui.commons.Splitter({ firstPaneContent: new sap.ui.commons.Button({ text: "A"}), secondPaneContent: new sap.ui.commons.Button({ text: "B"}) }));
+		addRow("commons/TextField", new sap.ui.commons.TextField());
+		addRow("commons/TriStateCheckBox", new sap.ui.commons.TriStateCheckBox());
+		addRow("commons/TextView", new sap.ui.commons.TextView({ text: "Test" }));
+		addRow("commons/Toolbar", new sap.ui.commons.Toolbar({ items: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})] }));
+
+		addHeadingRow("sap.ui.commons.layout");
+		addRow("commons.layout/AbsoluteLayout", new sap.ui.commons.layout.AbsoluteLayout({width: "100%", height: "30px", positions: [
+			new sap.ui.commons.layout.PositionContainer({top: "0", left: "0", control: new sap.ui.commons.Button({ text: "B"})})
+		]})); // TODO: Renderer had doBeforeRendring before returning when invisible.
+		addRow("commons.layout/MatrixLayout", new sap.ui.commons.layout.MatrixLayout({ rows: [
+			new sap.ui.commons.layout.MatrixLayoutRow({cells: [
+				new sap.ui.commons.layout.MatrixLayoutCell({content: [
+					new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})
+				]})
 			]})
-		]})
-	]}));
+		]}));
+	})();
 
 	addHeadingRow("sap.ui.layout.form");
 	addRow("layout.form/Form", new sap.ui.layout.form.Form({
@@ -200,7 +195,7 @@
 				formElements: [
 					new sap.ui.layout.form.FormElement({
 						label: "A",
-						fields: [new sap.ui.commons.Button({ text: "A"})]
+						fields: [new sap.m.Button({ text: "A"})]
 					})
 				]
 			})
@@ -211,7 +206,7 @@
 	addRow("table/Table", new sap.ui.table.Table({
 		columns: [
 			new sap.ui.table.Column({
-				label: new sap.ui.commons.Label({text: "Test"})
+				label: new sap.m.Label({text: "Test"})
 			})
 		]
 	}));
@@ -220,30 +215,35 @@
 	addRow("unified/FileUploader", new sap.ui.unified.FileUploader());
 
 
-	addHeadingRow("sap.ui.ux3");
-	addRow("ux3/ExactArea", new sap.ui.ux3.ExactArea({ content: [new sap.ui.commons.Button({text: "A"})]}));
-	addRow("ux3/ExactBrowser", new sap.ui.ux3.ExactBrowser({ attributes: [new sap.ui.ux3.ExactAttribute({text: "A"}), new sap.ui.ux3.ExactAttribute({text: "B"})]}));
-	addRow("ux3/FacetFilter", new sap.ui.ux3.FacetFilter({ lists: [new sap.ui.ux3.FacetFilterList({ items: [new sap.ui.core.ListItem({text: "A"}), new sap.ui.core.ListItem({text: "B"})]}), new sap.ui.ux3.FacetFilterList({ items: [new sap.ui.core.ListItem({text: "A"}), new sap.ui.core.ListItem({text: "B"})]})]}));
-	addRow("ux3/NavigationBar", new sap.ui.ux3.NavigationBar({ items: [new sap.ui.ux3.NavigationItem({text: "A"}), new sap.ui.ux3.NavigationItem({text: "B"})]}));
+	/**
+	 * @deprecated As of version 1.38, together with sap.ui.ux3
+	 */
+	(() => {
+		addHeadingRow("sap.ui.ux3");
+		addRow("ux3/ExactArea", new sap.ui.ux3.ExactArea({ content: [new sap.ui.commons.Button({text: "A"})]}));
+		addRow("ux3/ExactBrowser", new sap.ui.ux3.ExactBrowser({ attributes: [new sap.ui.ux3.ExactAttribute({text: "A"}), new sap.ui.ux3.ExactAttribute({text: "B"})]}));
+		addRow("ux3/FacetFilter", new sap.ui.ux3.FacetFilter({ lists: [new sap.ui.ux3.FacetFilterList({ items: [new sap.ui.core.ListItem({text: "A"}), new sap.ui.core.ListItem({text: "B"})]}), new sap.ui.ux3.FacetFilterList({ items: [new sap.ui.core.ListItem({text: "A"}), new sap.ui.core.ListItem({text: "B"})]})]}));
+		addRow("ux3/NavigationBar", new sap.ui.ux3.NavigationBar({ items: [new sap.ui.ux3.NavigationItem({text: "A"}), new sap.ui.ux3.NavigationItem({text: "B"})]}));
+	})();
 
 	addHeadingRow("sap.m");
 	addRow("m/BusyIndicator", new sap.m.BusyIndicator());
-	addRow("m/Bar", new sap.m.Bar({contentLeft: new sap.ui.commons.Button({ text: "A"}), contentMiddle: new sap.ui.commons.Button({ text: "B"}), contentRight: new sap.ui.commons.Button({ text: "C"})}));
+	addRow("m/Bar", new sap.m.Bar({contentLeft: new sap.m.Button({ text: "A"}), contentMiddle: new sap.m.Button({ text: "B"}), contentRight: new sap.m.Button({ text: "C"})}));
 	addRow("m/Button", new sap.m.Button({text: "A"}));
 	addRow("m/CheckBox", new sap.m.CheckBox({text: "A"}));
-	addRow("m/Carousel", new sap.m.Carousel({pages: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})]}));
+	addRow("m/Carousel", new sap.m.Carousel({pages: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})]}));
 	addRow("[TODO: Leads to double rendering] m/FacetFilter", new sap.m.FacetFilter({lists: [new sap.m.FacetFilterList({title: "A"}), new sap.m.FacetFilterList({title: "B"})]}));
 	addRow("m/FacetFilterList", new sap.m.FacetFilterList({title: "A"}));
 	addRow("m/FeedInput", new sap.m.FeedInput({value: "A"}));
-	addRow("m/FlexBox", new sap.m.FlexBox({items: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})]}));
-	addRow("m/IconTabBar", new sap.m.IconTabBar({content: [new sap.ui.commons.Button({ text: "A"}), new sap.ui.commons.Button({ text: "B"})]}));
+	addRow("m/FlexBox", new sap.m.FlexBox({items: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})]}));
+	addRow("m/IconTabBar", new sap.m.IconTabBar({content: [new sap.m.Button({ text: "A"}), new sap.m.Button({ text: "B"})]}));
 	// addRow("m/IconTabHeader", new sap.m.IconTabHeader({items: [new sap.m.IconTabFilter({ text: "A"}), new sap.m.IconTabFilter({ text: "B"})]}));
 	addRow("m/Image", new sap.m.Image({src: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png"}));
 	addRow("m/Input(Base)", new sap.m.Input({value: "A"}));
 	addRow("m/Label", new sap.m.Label({text: "A"}));
 	addRow("m/Link", new sap.m.Link({text: "Link", href: "https://sdk.openui5.org/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png"}));
 	addRow("m/List(Base),ListItem(Base)", new sap.m.List({items: [new sap.m.StandardListItem({title: "A"}), new sap.m.StandardListItem({title: "B"})]}));
-	addRow("m/NavContainer", new sap.m.NavContainer({height: "20px", initialPage: "navpage1", pages: [new sap.ui.commons.Button("navpage1", { text: "A"}), new sap.ui.commons.Button({ text: "B"})]}));
+	addRow("m/NavContainer", new sap.m.NavContainer({height: "20px", initialPage: "navpage1", pages: [new sap.m.Button("navpage1", { text: "A"}), new sap.m.Button({ text: "B"})]}));
 	addRow("m/ObjectAttribute", new sap.m.ObjectAttribute({text: "A"}));
 	// addRow("m/ObjectHeader", new sap.m.ObjectHeader({title: "A"})); // TODO: Uses its own invisible logic in renderer, talk to owner..
 	addRow("m/ObjectIdentifier", new sap.m.ObjectIdentifier({text: "A"}));
@@ -263,7 +263,7 @@
 	addRow("m/RatingIndicator", new sap.m.RatingIndicator({text: "A"}));
 	addRow("m/ScrollContainer", new sap.m.ScrollContainer({content: [new sap.m.Button({text: "A"})]}));
 	addRow("m/SearchField", new sap.m.SearchField({value: "A"}));
-	addRow("m/SegmentedButton", new sap.m.SegmentedButton({buttons: [new sap.m.Button({text: "A"}), new sap.m.Button({text: "B"})]}));
+	addRow("m/SegmentedButton", new sap.m.SegmentedButton({items: [new sap.m.SegmentedButtonItem({text: "A"}), new sap.m.SegmentedButtonItem({text: "B"})]}));
 	addRow("m/Select", new sap.m.Select({items: [new sap.ui.core.Item({text: "A"}), new sap.ui.core.Item({text: "B"})]}));
 	addRow("m/SelectList", new sap.m.SelectList({items: [new sap.ui.core.Item({text: "A"}), new sap.ui.core.Item({text: "B"})]}));
 	addRow("m/Slider", new sap.m.Slider());

package/test/sap/ui/core/InvisibleText.html

@@ -38,14 +38,14 @@
 					rm.openStart("div", ctrl).openEnd();
 						var sLabelled = sap.ui.core.TestControl._STATIC_LABEL_TEXT.getId();
 						var aTexts = ctrl.getAggregation("_texts");
-						for(var i = 0; i < aTexts.length; i++){
+						for (var i = 0; i < aTexts.length; i++){
 							sLabelled += " " + aTexts[i].getId();
 							rm.renderControl(aTexts[i]);
 						}
 						rm.voidStart("input");
 						rm.accessibilityState(ctrl, {
 							labelledby : {value: sLabelled, append: true}
-						})
+						});
 						rm.voidEnd();
 					rm.close("div");
 				}

package/test/sap/ui/core/LRUPersistentCache.html

@@ -11,14 +11,14 @@
 	<script src="resources/large_cache_content.js"></script>
 
 	<script>
-		var oCache;
-		sap.ui.require(["sap/ui/core/cache/CacheManager"], function (classCacheManager) {
-			oCache = classCacheManager;
-		});
-		function addEntry(key, idValue) {
+	/*global m1 -- was defined on the (now missing) large_cache_content.js */
+	sap.ui.require(["sap/ui/core/cache/CacheManager"], function (oCache) {
+		"use strict";
+
+		globalThis.addEntry = function(key, idValue) {
 			var oValue = document.getElementById(idValue).value,
-					output = document.getElementById("output").innerHTML;
-			key = "key" + Date.now();
+				output = document.getElementById("output").innerHTML,
+				key = "key" + Date.now();
 			oCache.set(key, oValue).then(function () {
 				output += "<br/> Added new entry with key " + key;
 			}, function (eMsg) {
@@ -26,11 +26,11 @@
 			}).then(function () {
 				document.getElementById("output").innerHTML = output;
 			});
-		}
+		};
 
-		function getEntry(idKey) {
+		globalThis.getEntry = function(idKey) {
 			var key = document.getElementById(idKey).value,
-					output = document.getElementById("output").innerHTML;
+				output = document.getElementById("output").innerHTML;
 			oCache.get(key).then(function (v) {
 				output += "<br/> Got entry of type [" + typeof v + "] for key [" + key + "]";
 			}, function (eMsg) {
@@ -38,12 +38,12 @@
 			}).then(function () {
 				document.getElementById("output").innerHTML = output;
 			});
-		}
+		};
 
-		function addLargeEntry() {
+		globalThis.addLargeEntry = function() {
 			var oValue = m1;//came from the large script
-			output = document.getElementById("output").innerHTML;
-			key = "key" + Date.now();
+			var output = document.getElementById("output").innerHTML;
+			var key = "key" + Date.now();
 			oCache.set(key, oValue).then(function () {
 				output += "<br/> Added new entry with key " + key;
 			}, function (eMsg) {
@@ -51,15 +51,15 @@
 			}).then(function () {
 				document.getElementById("output").innerHTML = output;
 			});
-		}
+		};
 
-		function delFilters() {
+		globalThis.delFilters = function() {
 			var oOptions = {};
 			var oInputTimestamp = document.getElementById("timestamp");
 			var iTimestamp;
 
 			if (oInputTimestamp.value) {
-				iTimestamp = parseInt(oInputTimestamp.value, 10);
+				iTimestamp = parseInt(oInputTimestamp.value);
 
 				if (!isNaN(iTimestamp)) {
 					oOptions.olderThan = new Date(iTimestamp);
@@ -69,7 +69,8 @@
 			oOptions.prefix = document.getElementById("prefix").value;
 
 			oCache.delWithFilters(oOptions);
-		}
+		};
+	});
 	</script>
 </head>
 <body>

package/test/sap/ui/core/LabelEnablement.html

@@ -7,14 +7,16 @@
 	<script src="shared-config.js"></script>
 	<script id='sap-ui-bootstrap'
 		src='../../../../resources/sap-ui-core.js'
-		data-sap-ui-libs='sap.ui.core'></script>
+		data-sap-ui-libs='sap.ui.core'
+		data-sap-ui-libs="sap.m"
+	></script>
 
 	<script id="view1" type="sapui5/xmlview">
-		<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.ui.commons" xmlns:l="sap.ui.layout" xmlns:f="sap.ui.layout.form"
-				controllerName="my.own.controller" xmlns:html="http://www.w3.org/1999/xhtml">
+		<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m" xmlns:l="sap.ui.layout" xmlns:f="sap.ui.layout.form"
+				controllerName="my.own.controller">
 
 			<Label id="someFieldLabel" text="SomeLabel" labelFor="someField"/>
-			<TextField id="someField"/>
+			<Input id="someField"/>
 
 			<f:Form id="FormChange354" minWidth="1024" maxContainerCols="2" editable="true">
 				<f:title>
@@ -28,7 +30,7 @@
 						<f:formElements>
 							<f:FormElement label="Label via text">
 								<f:fields>
-									<TextField id="labelText"/>
+									<Input id="labelText"/>
 								</f:fields>
 							</f:FormElement>
 							<f:FormElement>
@@ -36,7 +38,7 @@
 									<Label id="labelControlNoForLabel" text="Label via control - no for"/>
 								</f:label>
 								<f:fields>
-									<TextField id="labelControlNoFor"/>
+									<Input id="labelControlNoFor"/>
 								</f:fields>
 							</f:FormElement>
 							<f:FormElement>
@@ -44,17 +46,17 @@
 									<Label id="labelControlWithForLabel" text="Label via control - with for" labelFor="labelControlWithFor"/>
 								</f:label>
 								<f:fields>
-									<TextField id="labelControlWithFor"/>
+									<Input id="labelControlWithFor"/>
 								</f:fields>
 							</f:FormElement>
 							<f:FormElement label="Label via text - multiple fields">
 								<f:fields>
-									<TextField id="labelTextMultiple1" />
-                  					<TextField id="labelTextMultiple2">
+									<Input id="labelTextMultiple1" />
+									<Input id="labelTextMultiple2">
 										<layoutData>
 											<l:GridData span="L2 M2 S4" />
 										</layoutData>
-									</TextField>
+									</Input>
 								</f:fields>
 							</f:FormElement>
 							<f:FormElement>
@@ -62,12 +64,12 @@
 									<Label id="labelControlMultipleNoForLabel" text="Label via control - multiple fields/no for"/>
 								</f:label>
 								<f:fields>
-									<TextField id="labelControlMultipleNoFor1" />
-                  					<TextField id="labelControlMultipleNoFor2">
+									<Input id="labelControlMultipleNoFor1" />
+									<Input id="labelControlMultipleNoFor2">
 										<layoutData>
 											<l:GridData span="L2 M2 S4" />
 										</layoutData>
-									</TextField>
+									</Input>
 								</f:fields>
 							</f:FormElement>
 							<f:FormElement>
@@ -75,12 +77,12 @@
 									<Label id="labelControlMultipleWithForLabel" text="Label via control - multiple fields/with for" labelFor="labelControlMultipleWithFor2"/>
 								</f:label>
 								<f:fields>
-									<TextField id="labelControlMultipleWithFor1" />
-                  					<TextField id="labelControlMultipleWithFor2">
+									<Input id="labelControlMultipleWithFor1" />
+									<Input id="labelControlMultipleWithFor2">
 										<layoutData>
 											<l:GridData span="L2 M2 S4" />
 										</layoutData>
-									</TextField>
+									</Input>
 								</f:fields>
 							</f:FormElement>
 						</f:formElements>
@@ -91,19 +93,6 @@
 	</script>
 
 	<script>
-		try {
-			sap.ui.getCore().loadLibrary("sap.ui.commons");
-		} catch (e) {
-			alert("This test page requires the library 'sap.ui.commons' which is not available.");
-			throw (e);
-		}
-		try {
-			sap.ui.getCore().loadLibrary("sap.ui.layout");
-		} catch (e) {
-			alert("This test page requires the library 'sap.ui.layout' which is not available.");
-			throw (e);
-		}
-
 		sap.ui.controller("my.own.controller", {});
 		var myView = sap.ui.xmlview({viewContent: jQuery('#view1').html()});
 		myView.placeAt("content");

package/test/sap/ui/core/Localization.html

@@ -9,20 +9,14 @@
 	<script src="shared-config.js"></script>
 	<script id="sap-ui-bootstrap"
 			src="../../../../resources/sap-ui-core.js"
+			data-sap-ui-libs="sap.m, sap.ui.layout"
 			data-sap-ui-theme="sap_bluecrystal"
 			data-sap-ui-originInfo="true"
 			>
 	</script>
 
 	<script>
-
-		try{
-			sap.ui.getCore().loadLibrary("sap.ui.commons");
-		}catch(e){
-			alert("This test page requires the library 'sap.ui.commons' which is not available.");
-			throw(e);
-		}
-
+		jQuery.sap.require("sap.m.MessageBox");
 		function showInfo() {
 			var mInfo = this.getOriginInfo("text"),
 				sText = "Info:\n";
@@ -34,7 +28,7 @@
 			} else {
 				sText += "Not available!";
 			}
-			alert(sText);
+			sap.m.MessageBox.show(sText);
 		}
 
 		jQuery.sap.require("jquery.sap.resources");
@@ -42,66 +36,47 @@
 		var sLocale = sap.ui.getCore().getConfiguration().getLanguage();
 		var oBundle = jQuery.sap.resources({url : "resources/i18n.properties", locale: sLocale, includeInfo: sap.ui.getCore().getConfiguration().getOriginInfo()});
 
-		var oMatrixLayout = new sap.ui.commons.layout.MatrixLayout();
-		oMatrixLayout.setLayoutFixed(false);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.TextView({text: oBundle.getText("welcome", ["Administrator"])}).attachBrowserEvent("click", showInfo)
-		);
-		oMatrixLayout.getRows()[0].getCells()[0].setColSpan(2);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: oBundle.getText("lastname"), tooltip: oBundle.getText("lastname")}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: oBundle.getText("firstname")}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: oBundle.getText("street")}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: oBundle.getText("zip")}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: oBundle.getText("city")}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.placeAt("resourcebundle");
+		var oSimpleForm = new sap.ui.layout.form.SimpleForm({
+			editable: true,
+			content: [
+				new sap.m.Title({text: oBundle.getText("welcome", ["Administrator"])}).attachBrowserEvent("click", showInfo),
+				new sap.m.Label({text: oBundle.getText("lastname"), tooltip: oBundle.getText("lastname")}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: oBundle.getText("firstname")}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: oBundle.getText("street")}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: oBundle.getText("zip")}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: oBundle.getText("city")}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input()
+			]
+		});
+		oSimpleForm.placeAt("resourcebundle");
 
 		var oResourceModel = new sap.ui.model.resource.ResourceModel({bundleUrl:"resources/i18n.properties"});
-		var oMatrixLayout = new sap.ui.commons.layout.MatrixLayout();
-		oMatrixLayout.setModel(oResourceModel, "i18n");
-		oMatrixLayout.setLayoutFixed(false);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.TextView({text: oResourceModel.getResourceBundle().getText("welcome", ["Administrator"])}).attachBrowserEvent("click", showInfo)
-		);
-		oMatrixLayout.getRows()[0].getCells()[0].setColSpan(2);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: "{i18n>lastname}", tooltip: "{i18n>lastname}"}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: "{i18n>firstname}"}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: "{i18n>street}"}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: "{i18n>zip}"}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.createRow(
-				new sap.ui.commons.Label({text: "{i18n>city}"}).attachBrowserEvent("click", showInfo) ,
-				new sap.ui.commons.TextField()
-		);
-		oMatrixLayout.placeAt("resourcemodel");
+		new sap.ui.layout.form.SimpleForm({
+			editable: true,
+			content: [
+				new sap.m.Title({text: oResourceModel.getResourceBundle().getText("welcome", ["Administrator"])}).attachBrowserEvent("click", showInfo),
+				new sap.m.Label({text: "{i18n>lastname}", tooltip: "{i18n>lastname}"}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: "{i18n>firstname}"}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: "{i18n>street}"}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: "{i18n>zip}"}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input(),
+				new sap.m.Label({text: "{i18n>city}"}).attachBrowserEvent("click", showInfo) ,
+				new sap.m.Input()
+			],
+			models: {
+				i18n: oResourceModel
+			}
+		}).placeAt("resourcemodel");
 
 		jQuery(function(){
-			var url = jQuery.sap.getModulePath("sap.ui.commons", '/') + "messagebundle.properties";
+			var url = sap.ui.require.toUrl("sap/m/messagebundle.properties");
 			var oBundle = jQuery.sap.resources({url:url});
 			jQuery("#locale").html(oBundle ? oBundle.sLocale : "--");
 		});