1 files changed, 32 insertions, 22 deletions

diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml
index d40d5c0b..9268f765 100644
--- a/tests/auto/controls/data/tst_tabbar.qml
+++ b/tests/auto/controls/data/tst_tabbar.qml
@@ -40,7 +40,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 
 TestCase {
     id: testCase
@@ -85,19 +85,9 @@ TestCase {
         }
     }
 
-    SignalSpy {
-        id: contentChildrenSpy
-        signalName: "contentChildrenChanged"
-    }
-
-    function init() {
-        verify(!contentChildrenSpy.target)
-        compare(contentChildrenSpy.count, 0)
-    }
-
-    function cleanup() {
-        contentChildrenSpy.target = null
-        contentChildrenSpy.clear()
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     function test_defaults() {
@@ -176,7 +166,7 @@ TestCase {
         control.currentIndexChanged.connect(verifyCurrentIndexCountDiff)
         control.countChanged.connect(verifyCurrentIndexCountDiff)
 
-        contentChildrenSpy.target = control
+        var contentChildrenSpy = signalSpy.createObject(testCase, {target: control, signalName: "contentChildrenChanged"})
         verify(contentChildrenSpy.valid)
 
         compare(control.count, 0)
@@ -293,7 +283,7 @@ TestCase {
             return true
         }
 
-        contentChildrenSpy.target = control
+        var contentChildrenSpy = signalSpy.createObject(testCase, {target: control, signalName: "contentChildrenChanged"})
         verify(contentChildrenSpy.valid)
 
         verify(compareObjectNames(control.contentData, ["object", "button1", "timer", "button2", ""]))
@@ -504,17 +494,37 @@ TestCase {
         control.destroy()
     }
 
-    function test_layout() {
-        var control = tabBar.createObject(testCase, {spacing: 0, width: 200})
+    function test_layout_data() {
+        return [
+            { tag: "spacing:0", spacing: 0 },
+            { tag: "spacing:1", spacing: 1 },
+            { tag: "spacing:10", spacing: 10 },
+        ]
+    }
+
+    function test_layout(data) {
+        var control = tabBar.createObject(testCase, {spacing: data.spacing, width: 200})
 
-        var tab1 = tabButton.createObject(control)
+        var tab1 = tabButton.createObject(control, {text: "First"})
         control.addItem(tab1)
         tryCompare(tab1, "width", control.width)
 
-        var tab2 = tabButton.createObject(control)
+        var tab2 = tabButton.createObject(control, {text: "Second"})
         control.addItem(tab2)
-        tryCompare(tab1, "width", control.width / 2)
-        tryCompare(tab2, "width", control.width / 2)
+        tryCompare(tab1, "width", (control.width - data.spacing) / 2)
+        compare(tab2.width, (control.width - data.spacing) / 2)
+
+        var tab3 = tabButton.createObject(control, {width: 50, text: "Third"})
+        control.addItem(tab3)
+        tryCompare(tab1, "width", (control.width - 2 * data.spacing - 50) / 2)
+        compare(tab2.width, (control.width - 2 * data.spacing - 50) / 2)
+        compare(tab3.width, 50)
+
+        var expectedWidth = tab3.contentItem.implicitWidth + tab3.leftPadding + tab3.rightPadding
+        tab3.width = tab3.implicitWidth
+        tryCompare(tab1, "width", (control.width - 2 * data.spacing - expectedWidth) / 2)
+        tryCompare(tab2, "width", (control.width - 2 * data.spacing - expectedWidth) / 2)
+        compare(tab3.width, expectedWidth)
 
         control.destroy()
     }