1 files changed, 35 insertions, 30 deletions

diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml
index b640a868..754e4f0b 100644
--- a/tests/auto/controls/data/tst_buttongroup.qml
+++ b/tests/auto/controls/data/tst_buttongroup.qml
@@ -40,8 +40,7 @@
 
 import QtQuick 2.2
 import QtTest 1.0
-import Qt.labs.controls 1.0
-import Qt.labs.templates 1.0 as T
+import QtQuick.Controls 2.0
 
 TestCase {
     id: testCase
@@ -56,30 +55,9 @@ TestCase {
         ButtonGroup { }
     }
 
-    SignalSpy {
-        id: checkedButtonSpy
-        signalName: "checkedButtonChanged"
-    }
-
-    SignalSpy {
-        id: buttonsSpy
-        signalName: "buttonsChanged"
-    }
-
-    function init() {
-        verify(!checkedButtonSpy.target)
-        compare(checkedButtonSpy.count, 0)
-
-        verify(!buttonsSpy.target)
-        compare(buttonsSpy.count, 0)
-    }
-
-    function cleanup() {
-        checkedButtonSpy.target = null
-        checkedButtonSpy.clear()
-
-        buttonsSpy.target = null
-        buttonsSpy.clear()
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     function test_null() {
@@ -106,7 +84,7 @@ TestCase {
         var group = buttonGroup.createObject(testCase)
         verify(group)
 
-        checkedButtonSpy.target = group
+        var checkedButtonSpy = signalSpy.createObject(testCase, {target: group, signalName: "checkedButtonChanged"})
         verify(checkedButtonSpy.valid)
         verify(!group.checkedButton)
 
@@ -177,7 +155,7 @@ TestCase {
         var group = buttonGroup.createObject(testCase)
         verify(group)
 
-        buttonsSpy.target = group
+        var buttonsSpy = signalSpy.createObject(testCase, {target: group, signalName: "buttonsChanged"})
         verify(buttonsSpy.valid)
 
         compare(group.buttons.length, 0)
@@ -212,7 +190,7 @@ TestCase {
 
         group.buttons = []
         compare(group.buttons.length, 0)
-        compare(group.checkedButton, null)
+        tryCompare(group, "checkedButton", null)
         compare(buttonsSpy.count, 5)
 
         group.destroy()
@@ -302,7 +280,7 @@ TestCase {
         var group = buttonGroup.createObject(testCase)
         verify(group)
 
-        buttonsSpy.target = group
+        var buttonsSpy = signalSpy.createObject(testCase, {target: group, signalName: "buttonsChanged"})
         verify(buttonsSpy.valid)
 
         var button1 = button.createObject(testCase, {objectName: "button1", checked: true})
@@ -321,4 +299,31 @@ TestCase {
 
         group.destroy()
     }
+
+    Component {
+        id: repeater
+        Column {
+            id: column
+            property ButtonGroup group: ButtonGroup { buttons: column.children }
+            property alias repeater: r
+            Repeater {
+                id: r
+                model: 3
+                delegate: RadioDelegate {
+                    checked: index == 0
+                    objectName: index
+                }
+            }
+        }
+    }
+
+    function test_repeater() {
+        var container = repeater.createObject(testCase)
+        verify(container)
+
+        verify(container.group.checkedButton)
+        compare(container.group.checkedButton.objectName, "0")
+
+        container.destroy()
+    }
 }