1 files changed, 100 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml
index 3cd6b7b8..a1cdbf8e 100644
--- a/tests/auto/controls/data/tst_page.qml
+++ b/tests/auto/controls/data/tst_page.qml
@@ -56,6 +56,40 @@ TestCase {
     }
 
     Component {
+        id: oneChildPage
+        Page {
+            Item {
+                implicitWidth: 100
+                implicitHeight: 30
+            }
+        }
+    }
+
+    Component {
+        id: twoChildrenPage
+        Page {
+            Item {
+                implicitWidth: 100
+                implicitHeight: 30
+            }
+            Item {
+                implicitWidth: 200
+                implicitHeight: 60
+            }
+        }
+    }
+
+    Component {
+        id: contentPage
+        Page {
+            contentItem: Item {
+                implicitWidth: 100
+                implicitHeight: 30
+            }
+        }
+    }
+
+    Component {
         id: toolBar
         ToolBar { }
     }
@@ -71,6 +105,53 @@ TestCase {
         control.destroy()
     }
 
+    function test_empty() {
+        var control = page.createObject(testCase)
+        verify(control)
+
+        verify(control.contentItem)
+        compare(control.contentWidth, 0)
+        compare(control.contentHeight, 0)
+
+        control.destroy()
+    }
+
+    function test_oneChild() {
+        var control = oneChildPage.createObject(testCase)
+        verify(control)
+
+        compare(control.contentWidth, 100)
+        compare(control.contentHeight, 30)
+        compare(control.implicitWidth, 100 + control.leftPadding + control.rightPadding)
+        compare(control.implicitHeight, 30 + control.topPadding + control.bottomPadding)
+
+        control.destroy()
+    }
+
+    function test_twoChildren() {
+        var control = twoChildrenPage.createObject(testCase)
+        verify(control)
+
+        compare(control.contentWidth, 0)
+        compare(control.contentHeight, 0)
+        compare(control.implicitWidth, control.leftPadding + control.rightPadding)
+        compare(control.implicitHeight, control.topPadding + control.bottomPadding)
+
+        control.destroy()
+    }
+
+    function test_contentItem() {
+        var control = contentPage.createObject(testCase)
+        verify(control)
+
+        compare(control.contentWidth, 100)
+        compare(control.contentHeight, 30)
+        compare(control.implicitWidth, 100 + control.leftPadding + control.rightPadding)
+        compare(control.implicitHeight, 30 + control.topPadding + control.bottomPadding)
+
+        control.destroy()
+    }
+
     function test_layout() {
         var control = page.createObject(testCase, {width: 100, height: 100})
         verify(control)
@@ -124,6 +205,25 @@ TestCase {
         compare(control.contentItem.width, control.availableWidth)
         compare(control.contentItem.height, control.availableHeight)
 
+        control.contentItem.implicitWidth = 50
+        control.contentItem.implicitHeight = 60
+        compare(control.implicitWidth, control.contentItem.implicitWidth + control.leftPadding + control.rightPadding)
+        compare(control.implicitHeight, control.contentItem.implicitHeight + control.topPadding + control.bottomPadding)
+
+        control.header.visible = true
+        compare(control.implicitHeight, control.contentItem.implicitHeight + control.topPadding + control.bottomPadding
+                                      + control.header.implicitHeight + control.spacing)
+
+        control.footer.visible = true
+        compare(control.implicitHeight, control.contentItem.implicitHeight + control.topPadding + control.bottomPadding
+                                      + control.header.implicitHeight + control.footer.implicitHeight + 2 * control.spacing)
+
+        control.header.implicitWidth = 150
+        compare(control.implicitWidth, control.header.implicitWidth + control.leftPadding + control.rightPadding)
+
+        control.footer.implicitWidth = 160
+        compare(control.implicitWidth, control.footer.implicitWidth + control.leftPadding + control.rightPadding)
+
         control.destroy()
     }
 }