@openui5/sap.ui.core 1.115.1 → 1.117.0

package/test/sap/ui/core/qunit/opa/matchers/_Busy.qunit.js

@@ -2,9 +2,12 @@
 sap.ui.define([
 	'sap/ui/test/matchers/_Busy',
 	'sap/m/Button',
+	'sap/m/Dialog',
 	'sap/m/Toolbar',
-	'sap/m/Page'
-], function (_Busy, Button, Toolbar, Page) {
+	'sap/m/Page',
+	'sap/m/VBox',
+	"sap/ui/core/mvc/XMLView"
+], function (_Busy, Button, Dialog, Toolbar, Page, VBox, XMLView) {
 	"use strict";
 
 	QUnit.module("_Busy", {
@@ -45,4 +48,128 @@ sap.ui.define([
 		assert.ok(!this.oBusyMatcher.isMatching(this.oPage));
 		sinon.assert.notCalled(this.oSpy);
 	});
+
+	QUnit.module("_Busy in ComponentContainer");
+
+	QUnit.test("Should match when parent is ComponentContainer", function (assert) {
+		// Arrange
+		var oButton = new Button({text: "Hello World"}),
+			oVBox = new VBox({
+				items: [oButton]
+			}),
+			oBusy = new _Busy(),
+			fnDone = assert.async();
+
+		sap.ui.define("my/Component", [
+			"sap/ui/core/UIComponent"
+		], function(UIComponent) {
+
+			return UIComponent.extend("my.Component", {
+
+				metadata: {
+					manifest: {}
+				},
+
+				createContent: function() {
+					return oVBox;
+				}
+
+			});
+
+		});
+
+		sap.ui.require([
+			"my/Component", "sap/ui/core/ComponentContainer"
+		], function(MyComponent, ComponentContainer) {
+
+			var oContainer = new ComponentContainer({
+				//name: "my"
+				component: new MyComponent()
+			});
+
+			oContainer.placeAt("qunit-fixture");
+			sap.ui.getCore().applyChanges();
+
+			// Assert
+			assert.strictEqual(oBusy.isMatching(oButton), false, "Button is not busy");
+
+			// Act
+			oContainer.setBusy(true);
+
+			// Assert
+			assert.strictEqual(oBusy.isMatching(oButton), true, "Button is busy");
+
+			// Clean up
+			oContainer.destroy();
+			fnDone();
+		});
+
+		QUnit.test("Should not block Dialog, when parent is ComponentContainer, placed in Busy control/view", function (assert) {
+			// Arrange
+			var oDialog = new Dialog(),
+				oVBox = new VBox(),
+				oBusy = new _Busy(),
+				fnDone = assert.async();
+
+			var oXmlString = [
+				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">',
+				'</mvc:View>'
+			];
+
+			XMLView.create({
+				id: "comp---view",
+				definition: oXmlString
+			}).then(function (oView) {
+
+				sap.ui.define("my2/Component", [
+					"sap/ui/core/UIComponent"
+				], function(UIComponent) {
+
+					return UIComponent.extend("my2.Component", {
+
+						metadata: {
+							manifest: {}
+						},
+
+						createContent: function() {
+							return oView;
+						}
+
+					});
+				});
+
+				sap.ui.require([
+					"my2/Component", "sap/ui/core/ComponentContainer"
+				], function(MyComponent, ComponentContainer) {
+
+					var oContainer = new ComponentContainer({
+						//name: "my"
+						component: new MyComponent()
+					});
+
+					oVBox.addItem(oContainer);
+					oVBox.placeAt("qunit-fixture");
+					oView.addDependent(oDialog);
+					sap.ui.getCore().applyChanges();
+
+					// Assert
+					assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
+
+					// Act
+					oVBox.setBusy(true);
+					oDialog.open();
+
+					// Assert
+					assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
+
+					// Clean up
+					oContainer.destroy();
+					fnDone();
+				});
+
+			});
+
+		});
+
+	});
 });

package/test/sap/ui/core/qunit/opa/matchers/_Editable.qunit.js

@@ -3,15 +3,19 @@ sap.ui.define([
 	'sap/ui/test/matchers/_Editable',
 	'sap/m/Input',
 	'sap/m/Text',
+	'sap/ui/layout/library',
 	'sap/ui/layout/form/SimpleForm'
-], function (_Editable, Input, Text, SimpleForm) {
+], function (_Editable, Input, Text, layoutLibrary, SimpleForm) {
 	"use strict";
 
+	var SimpleFormLayout = layoutLibrary.form.SimpleFormLayout;
+
 	QUnit.module("_Editable matcher", {
 		beforeEach: function () {
 			this.oInput = new Input("myInput");
 			this.oText = new Text("myText");
 			this.oForm = new SimpleForm("myForm", {
+				layout: SimpleFormLayout.ColumnLayout,
 				content: [this.oInput, this.oText]
 			});
 			this.oForm.placeAt("qunit-fixture");

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

@@ -82,6 +82,7 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 				// duration - end_to_end_time
 				return values[4] === "1000";
 			}
+			return false;
 		}), "Found the FESR header field values.");
 
 		assert.ok(oHeaderSpy.args.some(function(args) {
@@ -90,6 +91,7 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 				// application_name, step_name, application_name with 70 characters
 				return values[0] === "newAppNameShort" && values[1] === "newStepName" && values[15] === "1" && values[19] === "newAppNameLong";
 			}
+			return false;
 		}), "Found the optional FESR header field values.");
 
 		Interaction.end(true);
@@ -154,6 +156,7 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 				// duration - end_to_end_time
 				return values[4] === "1000";
 			}
+			return false;
 		}), "Found the FESR header field values.");
 
 		assert.ok(oHeaderSpy.args.some(function(args) {
@@ -162,6 +165,7 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 				// application_name, step_name, application_name with 70 characters
 				return values[0] === "newAppNameShort" && values[1] === "newStepName" && values[15] === "2" && values[19] === "newAppNameLong";
 			}
+			return false;
 		}), "Found the optional FESR header field values.");
 
 		Interaction.end(true);
@@ -203,6 +207,7 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 				assert.ok(bEquals, "action string matches");
 				return bEquals && bStepCountAvailable;
 			}
+			return false;
 		}), "Found the FESR header field values.");
 
 		assert.strictEqual(oHeaderSpy.args.filter(function(args) {

package/test/sap/ui/core/qunit/resource/ResourceModel.qunit.js

@@ -15,10 +15,7 @@ sap.ui.define([
 	"use strict";
 
 	var sClassname = "sap.ui.model.resource.ResourceModel",
-		sDefaultLanguage = Configuration.getLanguage(),
-		oContent = document.createElement("div"); //add divs for control tests
-	oContent.id = "target1";
-	document.body.appendChild(oContent);
+		sDefaultLanguage = Configuration.getLanguage();
 
 	var oModel, oLabel, oLabel2,
 		sCustomMessagesProperties
@@ -44,28 +41,22 @@ sap.ui.define([
 	//model created
 	QUnit.test("Model instantiated successful", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 
 		assert.ok(oModel, "model must exist after creation");
 		assert.ok(oModel instanceof ResourceModel, "model must be instanceof sap.ui.model.resource.ResourceModel");
 		oLabel.destroy();
 	});
 
-	//getProperty()
-	QUnit.test("test model getProperty", function(assert) {
-		var value = oModel.getProperty("TEST_TEXT");
-		assert.equal(value, "A text en");
-	});
-
 	//setProperty must not exist!
 	QUnit.test("set Property must have no effect", function(assert) {
 		assert.ok(!oModel.setProperty, "set Property method should not be defined");
 	});
 
 	//getProperty()/binding
-	QUnit.test("test model getProperty", function(assert) {
+	QUnit.test("test model getProperty and via binding", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 		var value = oModel.getProperty("TEST_TEXT");
 		assert.equal(value, "A text en");
 		assert.equal(oLabel.getText(), "A text en");
@@ -90,28 +81,22 @@ sap.ui.define([
 	//model created
 	QUnit.test("Model instantiated successful", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 
 		assert.ok(oModel, "model must exist after creation");
 		assert.ok(oModel instanceof ResourceModel, "model must be instanceof sap.ui.model.resource.ResourceModel");
 		oLabel.destroy();
 	});
 
-	//getProperty()
-	QUnit.test("test model getProperty", function(assert) {
-		var value = oModel.getProperty("TEST_TEXT");
-		assert.equal(value, "A text en");
-	});
-
 	//setProperty must not exist!
 	QUnit.test("set Property must have no effect", function(assert) {
 		assert.ok(!oModel.setProperty, "set Property method should not be defined");
 	});
 
 	//getProperty()/binding
-	QUnit.test("test model getProperty", function(assert) {
+	QUnit.test("test model getProperty and via binding", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 		var value = oModel.getProperty("TEST_TEXT");
 		assert.equal(value, "A text en");
 		assert.equal(oLabel.getText(), "A text en");
@@ -135,7 +120,7 @@ sap.ui.define([
 	//model created
 	QUnit.test("Model instantiated successful", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 
 		assert.ok(oModel, "model must exist after creation");
 		assert.ok(oModel instanceof ResourceModel, "model must be instanceof sap.ui.model.resource.ResourceModel");
@@ -146,19 +131,14 @@ sap.ui.define([
 
 		oLabel.destroy();
 	});
-	//getProperty()
-	QUnit.test("test model getProperty", function(assert) {
-		var value = oModel.getProperty("TEST_TEXT");
-		assert.equal(value, "A text en");
-	});
 	//setProperty must not exist!
 	QUnit.test("set Property must have no effect", function(assert) {
 		assert.ok(!oModel.setProperty, "set Property method should not be defined");
 	});
 	//getProperty()/binding
-	QUnit.test("test model getProperty", function(assert) {
+	QUnit.test("test model getProperty and via binding", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
-		oLabel.placeAt("target1");
+		oLabel.placeAt("qunit-fixture");
 		var value = oModel.getProperty("TEST_TEXT");
 		assert.equal(value, "A text en");
 		assert.equal(oLabel.getText(), "A text en");
@@ -167,7 +147,7 @@ sap.ui.define([
 	//CompositeBinding
 	QUnit.test("test composite bindings", function(assert) {
 		oLabel2 = new TestButton("myLabel2", {text: {parts: [{path: "i18n>TEST_TEXT"}, {path: "i18n>TEST_TEXT"}]}});
-		oLabel2.placeAt("target1");
+		oLabel2.placeAt("qunit-fixture");
 
 		assert.ok(oLabel2, "Label with composite binding must be created");
 		assert.equal(oLabel2.getText(), "A text en A text en", "Text msut be: 'A text en A text en'");
@@ -182,7 +162,7 @@ sap.ui.define([
 		assert.equal(info.key, "TEST_TEXT");
 	});
 
-	QUnit.test("Model instantiated successful", function(assert) {
+	QUnit.test("Model instantiated successfully, named model", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
 		oLabel.setModel(oModel, "i18n");
 		var oClone = oLabel.clone();
@@ -193,7 +173,7 @@ sap.ui.define([
 		oModel.destroy();
 	});
 
-	QUnit.test("Model instantiated successful", function(assert) {
+	QUnit.test("Model instantiated successfully, cloned before named model is set", function(assert) {
 		oLabel = new TestButton("myLabel", {text: "{i18n>TEST_TEXT}"});
 		var oClone = oLabel.clone();
 		oClone.setModel(oModel, "i18n");
@@ -959,9 +939,9 @@ sap.ui.define([
 		beforeEach: function() {
 			Configuration.setLanguage("en");
 			oLabel = new TestButton("myLabel", {text: "{async>TEST_TEXT}"});
-			oLabel.placeAt("target1");
+			oLabel.placeAt("qunit-fixture");
 			oLabel2 = new TestButton("myLabel2", {text: "{async>TEST_TEXT}"});
-			oLabel2.placeAt("target1");
+			oLabel2.placeAt("qunit-fixture");
 			oModel = new ResourceModel({bundleName: "testdata.messages", async: true});
 			Core.setModel(oModel, "async");
 		},
@@ -1085,7 +1065,7 @@ sap.ui.define([
 		var oBtn = new TestButton({
 			text: "{async5>TEST_TEXT}"
 		});
-		oBtn.placeAt("target1");
+		oBtn.placeAt("qunit-fixture");
 
 		var oAsyncModel = new ResourceModel({
 			bundleName: "testdata.messages",
@@ -1116,7 +1096,7 @@ sap.ui.define([
 		var oBtn = new TestButton({
 			text: "{sync5>TEST_TEXT}"
 		});
-		oBtn.placeAt("target1");
+		oBtn.placeAt("qunit-fixture");
 
 		var oSyncModel = new ResourceModel({
 			bundleName: "testdata.messages",

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

@@ -4,9 +4,8 @@ sap.ui.define([
 	"sap/ui/core/routing/HashChanger",
 	"sap/ui/core/routing/History",
 	"sap/ui/thirdparty/hasher",
-	"sap/ui/base/EventProvider",
 	"sap/ui/thirdparty/signals"
-], function (Log, HashChanger, History, hasher, EventProvider) {
+], function (Log, HashChanger, History, hasher) {
 	"use strict";
 
 
@@ -690,9 +689,6 @@ sap.ui.define([
 	QUnit.module("Integration: RouterHashChanger and HashChanger", {
 		beforeEach: function(assert) {
 			hasher.setHash("");
-			// overwrite the returnObject function of the eventPool in EventProvider
-			// to make the trace of event parameter easier
-			this.oReturnObjectStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 
 			this.oHashChanger = new HashChanger();
 			this.oRHC = this.oHashChanger.createRouterHashChanger();
@@ -707,7 +703,6 @@ sap.ui.define([
 		afterEach: function(assert) {
 			this.oRHC.destroy();
 			this.oHashChanger.destroy();
-			this.oReturnObjectStub.restore();
 		}
 	});
 

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

@@ -3,9 +3,8 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/routing/HashChanger",
 	"sap/ui/core/routing/RouterHashChanger",
-	"sap/ui/base/EventProvider",
 	"sap/ui/thirdparty/hasher"
-], function (Log, HashChanger, RouterHashChanger, EventProvider, hasher) {
+], function (Log, HashChanger, RouterHashChanger, hasher) {
 	"use strict";
 
 
@@ -89,16 +88,12 @@ sap.ui.define([
 
 	QUnit.module("RouterHashChanger API", {
 		beforeEach: function() {
-			// overwrite the returnObject function of the eventPool in EventProvider
-			// to make the trace of event parameter easier
-			this.oReturnObjectStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			this.oRHC = new RouterHashChanger({
 				parent: HashChanger.getInstance()
 			});
 		},
 		afterEach: function() {
 			this.oRHC.destroy();
-			this.oReturnObjectStub.restore();
 		}
 	});
 
@@ -304,9 +299,6 @@ sap.ui.define([
 	QUnit.module("RouterHashChanger SubHashChanger", {
 		beforeEach: function(assert) {
 			hasher.setHash("");
-			// overwrite the returnObject function of the eventPool in EventProvider
-			// to make the trace of event parameter easier
-			this.oReturnObjectStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 
 			this.oRHC = HashChanger.getInstance().createRouterHashChanger();
 			this.oChildRHC1 = this.oRHC.createSubHashChanger("foo");
@@ -355,7 +347,6 @@ sap.ui.define([
 			this.oChildRHC1.destroy();
 			this.oChildRHC2.destroy();
 			this.oRHC.destroy();
-			this.oReturnObjectStub.restore();
 		}
 	});
 

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

@@ -12,10 +12,9 @@ sap.ui.define([
 	"sap/m/NavContainer",
 	"sap/m/Panel",
 	"./AsyncViewModuleHook",
-	"sap/ui/base/EventProvider",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer"
-], function (Log, deepExtend, UIComponent, View, ViewType, HashChanger, Router, Views, App, NavContainer, Panel, ModuleHook, EventProvider, Component, ComponentContainer) {
+], function (Log, deepExtend, UIComponent, View, ViewType, HashChanger, Router, Views, App, NavContainer, Panel, ModuleHook, Component, ComponentContainer) {
 	"use strict";
 
 	// This global namespace is used for creating custom component classes.
@@ -1617,7 +1616,6 @@ sap.ui.define([
 
 	QUnit.module("titleChanged event", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			hasher.setHash("");
 			this.oApp = new App();
 			this.sPattern = "anything";
@@ -1637,7 +1635,6 @@ sap.ui.define([
 		},
 		afterEach: function() {
 			this.oRouter.destroy();
-			this.oEventProviderStub.restore();
 		}
 	});
 
@@ -1833,11 +1830,7 @@ sap.ui.define([
 
 	QUnit.module("titleChanged event with binding information", {
 		beforeEach: function(){
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			hasher.setHash("");
-		},
-		afterEach: function(){
-			this.oEventProviderStub.restore();
 		}
 	});
 
@@ -1944,7 +1937,6 @@ sap.ui.define([
 
 	QUnit.module("targets", {
 		beforeEach: function () {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			this.oShell = new ShellSubstitute();
 			this.oChildShell = new ShellSubstitute();
 			this.oSecondShell = new ShellSubstitute();
@@ -1970,7 +1962,6 @@ sap.ui.define([
 			}.bind(this));
 		},
 		afterEach: function () {
-			this.oEventProviderStub.restore();
 			this.oRouter.destroy();
 			this.oShell.destroy();
 			this.oChildShell.destroy();
@@ -2574,7 +2565,6 @@ sap.ui.define([
 
 	QUnit.module("Router in nested component", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			resetBrowserHash();
 
 			return Component.create({
@@ -2585,7 +2575,6 @@ sap.ui.define([
 		},
 		afterEach: function () {
 			this.oParentComponent.destroy();
-			this.oEventProviderStub.restore();
 		}
 	});
 
@@ -3149,7 +3138,6 @@ sap.ui.define([
 
 	QUnit.module("Router in IAsyncContentCreation with nested component", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			resetBrowserHash();
 			var that = this;
 
@@ -3161,7 +3149,6 @@ sap.ui.define([
 		},
 		afterEach: function () {
 			this.oParentComponent.destroy();
-			this.oEventProviderStub.restore();
 		}
 	});
 
@@ -3189,13 +3176,11 @@ sap.ui.define([
 
 	QUnit.module("navTo with nested components", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			hasher.setHash("");
 			HashChanger.getInstance().fireHashChanged("");
 		},
 		afterEach: function() {
 			this.oParentComponent.destroy();
-			this.oEventProviderStub.restore();
 		}
 	});
 
@@ -3666,7 +3651,6 @@ sap.ui.define([
 
 	QUnit.module("Routing Nested Components", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			this.oTitleChangedSpy = sinon.spy();
 			hasher.setHash("");
 
@@ -3679,7 +3663,6 @@ sap.ui.define([
 		},
 		afterEach: function() {
 			this.oParentComponent.destroy();
-			this.oEventProviderStub.restore();
 			this.oTitleChangedSpy.resetHistory();
 		}
 	});
@@ -3906,11 +3889,7 @@ sap.ui.define([
 
 	QUnit.module("Configuration of title propagation", {
 		beforeEach: function() {
-			this.oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 			hasher.setHash("");
-		},
-		afterEach: function() {
-			this.oEventProviderStub.restore();
 		}
 	});
 

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

@@ -1,6 +1,5 @@
 /*global QUnit, sinon */
 sap.ui.define([
-	"sap/ui/base/EventProvider",
 	"sap/base/strings/formatMessage",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/routing/Target",
@@ -12,7 +11,7 @@ sap.ui.define([
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/ComponentContainer",
 	"sap/ui/thirdparty/hasher"
-], function(EventProvider, formatMessage, XMLView, Target, Views, JSONModel, App, Panel, Component, UIComponent, ComponentContainer, hasher) {
+], function(formatMessage, XMLView, Target, Views, JSONModel, App, Panel, Component, UIComponent, ComponentContainer, hasher) {
 	"use strict";
 
 	// use sap.m.Panel as a lightweight drop-in replacement for the ux3.Shell
@@ -445,7 +444,6 @@ sap.ui.define([
 
 	QUnit.test("pass settings to component container", function(assert) {
 		this.oContainerOptions = undefined;
-		var oEventProviderStub = sinon.stub(EventProvider.prototype.oEventPool, "returnObject");
 		var oComponentContainerSettingsSpy = this.spy(ComponentContainer.prototype, "applySettings");
 		var oComponent = this.rootComponent;
 		var oRouter = oComponent.getRouter();
@@ -471,7 +469,6 @@ sap.ui.define([
 			assert.equal(oNestedComponent.getId(), "rootComponent---nestedComponent", "Nested component should have the correct id");
 			assert.equal(oComponentContainer.getId(), "rootComponent---nestedComponent-container", "Component container should have its component id as prefix");
 
-			oEventProviderStub.restore();
 			oComponent.destroy();
 		});
 	});

package/test/sap/ui/core/qunit/routing/fixture/Async1.view.xml

@@ -1,6 +1,6 @@
 <mvc:View xmlns="sap.m" xmlns:form="sap.ui.layout.form" xmlns:mvc="sap.ui.core.mvc">
 	<Image width="150px" height="110px" src="./testdata/images/screw.jpg"></Image>
-	<form:SimpleForm id="Layout" width="250px">
+	<form:SimpleForm id="Layout" width="250px" layout="ColumnLayout">
 		<Label text="Product:"/><Input id="Product" value="Deluxe Screw"/>
 		<Label text="Material:"/><Input id="Material" value="titanium"/>
 		<Label id="More1" text="Diameter:"/><Input id="TFMore1" value="1/4 inch"/>

package/test/sap/ui/core/qunit/rule/model/modelSupport.qunit.js

@@ -1,9 +1,11 @@
 /*global QUnit */
 
 sap.ui.define([
+	"sap/base/Log",
 	"sap/m/Button",
 	"sap/m/StandardListItem",
 	"sap/m/Table",
+	"sap/m/Text",
 	"sap/m/VBox",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/odata/CountMode",
@@ -12,7 +14,7 @@ sap.ui.define([
 	"sap/ui/support/library",
 	"sap/ui/support/RuleAnalyzer",
 	"sap/ui/test/TestUtils"
-], function(Button, StandardListItem, Table, VBox, JSONModel, CountMode, ODataV2Model, ODataV4Model,
+], function(Log, Button, StandardListItem, Table, Text, VBox, JSONModel, CountMode, ODataV2Model, ODataV4Model,
 		SupportLib, RuleAnalyzer, TestUtils) {
 	"use strict";
 
@@ -32,6 +34,10 @@ sap.ui.define([
 					: oEmptyV2Response,
 				"/sap/opu/odata/IWBEP/GWSAMPLE_BASIC/SalesOrderSet('42')"
 					: oEmptyV2Response,
+				"/sap/opu/odata/IWBEP/GWSAMPLE_BASIC/SalesOrderSet('42')/firstName"
+					: oEmptyV2Response,
+				"/sap/opu/odata/IWBEP/GWSAMPLE_BASIC/SalesOrderSet('42')/lastName"
+					: oEmptyV2Response,
 				"/sap/opu/odata4/IWBEP/TEA/default/IWBEP/TEA_BUSI/0001/$metadata"
 					: {source : "qunit/odata/v4/data/metadata.xml"},
 				"/sap/opu/odata4/IWBEP/TEA/default/IWBEP/TEA_BUSI/0001/EMPLOYEES?$select=ID&$skip=0&$top=100"
@@ -43,6 +49,10 @@ sap.ui.define([
 				"/sap/opu/odata4/IWBEP/TEA/default/IWBEP/TEA_BUSI/0001/EMPLOYEES('42')"
 					: oEmptyV4Response
 			});
+			this.oLogMock = this.mock(Log);
+			this.oLogMock.expects("warning").never();
+			this.oLogMock.expects("error").never();
+			this.oLogMock.expects("fatal").never();
 		}
 	});
 
@@ -177,6 +187,29 @@ sap.ui.define([
 		});
 	});
 
+	//**********************************************************************************************
+	QUnit.test("selectUsedInBoundAggregation: composite binding", function (assert) {
+		var oModel = new ODataV2Model({
+				defaultCountMode : CountMode.None,
+				serviceUrl : "/sap/opu/odata/IWBEP/GWSAMPLE_BASIC/",
+				useBatch : false
+			});
+		var oText = new Text();
+
+		oText.setModel(oModel);
+		oText.placeAt("qunit-fixture");
+		oText.bindText({parts: [{path: "/SalesOrderSet('42')/firstName"}, {path: "/SalesOrderSet('42')/lastName"}]});
+
+		return RuleAnalyzer.analyze({type: "global"},
+				[{libName: "sap.ui.core", ruleId: "selectUsedInBoundAggregation"}]).then(function () {
+			var aIssues = RuleAnalyzer.getLastAnalysisHistory().issues;
+
+			assert.strictEqual(aIssues.length, 0, "Correct number of issues");
+			oText.destroy();
+			oModel.destroy();
+		});
+	});
+
 	//**********************************************************************************************
 	QUnit.test("selectUsedInBoundAggregation: v4: use autoExpandSelect", function (assert) {
 		var oModel,