1 files changed, 56 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index 99eef833..f5e57e2d 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.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
@@ -136,6 +136,61 @@ TestCase {
         compare(horizontal.size, container.visibleArea.widthRatio)
         compare(horizontal.position, container.visibleArea.xPosition)
 
+        var oldY = vertical.y
+        var oldHeight = vertical.height
+        vertical.parent = testCase
+        vertical.y -= 10
+        container.height += 10
+        compare(vertical.y, oldY - 10)
+        compare(vertical.height, oldHeight)
+
+        var oldX = horizontal.x
+        var oldWidth = horizontal.width
+        horizontal.parent = testCase
+        horizontal.x -= 10
+        container.width += 10
+        compare(horizontal.x, oldX - 10)
+        compare(horizontal.width, oldWidth)
+
+        container.destroy()
+    }
+
+    function test_warning() {
+        ignoreWarning(Qt.resolvedUrl("tst_scrollindicator.qml") + ":45:1: QML TestCase: ScrollIndicator must be attached to a Flickable")
+        testCase.ScrollIndicator.vertical = null
+    }
+
+    function test_overshoot() {
+        var container = flickable.createObject(testCase)
+        verify(container)
+        waitForRendering(container)
+
+        var vertical = scrollIndicator.createObject(container, {size: 0.5})
+        container.ScrollIndicator.vertical = vertical
+
+        var horizontal = scrollIndicator.createObject(container, {size: 0.5})
+        container.ScrollIndicator.horizontal = horizontal
+
+        // negative vertical overshoot (pos < 0)
+        vertical.position = -0.1
+        compare(vertical.contentItem.y, vertical.topPadding)
+        compare(vertical.contentItem.height, 0.4 * vertical.availableHeight)
+
+        // positive vertical overshoot (pos + size > 1)
+        vertical.position = 0.8
+        compare(vertical.contentItem.y, vertical.topPadding + 0.8 * vertical.availableHeight)
+        compare(vertical.contentItem.height, 0.2 * vertical.availableHeight)
+
+        // negative horizontal overshoot (pos < 0)
+        horizontal.position = -0.1
+        compare(horizontal.contentItem.x, horizontal.leftPadding)
+        compare(horizontal.contentItem.width, 0.4 * horizontal.availableWidth)
+
+        // positive horizontal overshoot (pos + size > 1)
+        horizontal.position = 0.8
+        compare(horizontal.contentItem.x, horizontal.leftPadding + 0.8 * horizontal.availableWidth)
+        compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth)
+
         container.destroy()
     }
 }