Fix elements quicktest groups to work with filtering

Change-Id: Iaa1b2bf9a3f810f9f3f5c599d2f5b85e30828bc0
Reviewed-by: Daron Andrew Edie

1 files changed, 45 insertions, 49 deletions

diff --git a/tests/system/sys_elements.qtt b/tests/system/sys_elements.qtt
index 296dd83cb8..2ffb83a91a 100644
--- a/tests/system/sys_elements.qtt
+++ b/tests/system/sys_elements.qtt
@@ -44,79 +44,75 @@
 testcase = {
 
     pre_existing_elements_data: {
-        // ElementName: [preconditions,[groups]]
-        Rectangle: ["",["QtQuick1.0","BAT"]],
-        Image: ["",["QtQuick1.0","BAT"]],
-        AnimatedImage: ["",["QtQuick1.0","BAT"]],
-        BorderImage: ["",["QtQuick1.0","BAT"]],
-        SystemPalette: ["",["QtQuick1.0","BAT"]],
-        Text: ["",["QtQuick1.0","BAT"]],
-        TextInput: ["",["QtQuick1.0","BAT"]],
-        TextEdit: ["",["QtQuick1.0","BAT"]],
-        FontLoader: ["",["QtQuick1.0","BAT"]],
-        Flipable: ["",["QtQuick1.0","BAT"]],
-        Flickable: ["",["QtQuick1.0","BAT"]],
-        IntValidator: ["",["QtQuick1.0","BAT"]],
-        DoubleValidator: ["",["QtQuick1.0","BAT"]],
-        RegExpValidator: ["",["QtQuick1.0","BAT"]],
-        Column: ["",["QtQuick1.0","BAT"]],
-        Row: ["",["QtQuick1.0","BAT"]],
-        Flow: ["",["QtQuick1.0","BAT"]],
-        Grid: ["",["QtQuick1.0","BAT"]],
-        Repeater: ["",["QtQuick1.0","BAT"]],
-        ListView: ["",["QtQuick1.0","BAT"]],
-        Keys: ["",["QtQuick1.0","BAT"]],
-        MouseArea: ["",["QtQuick1.0","BAT"]],
-        SequentialAnimation: ["",["QtQuick1.0","BAT"]],
-        ParallelAnimation: ["",["QtQuick1.0","BAT"]],
-        XmlListModel: ["",["QtQuick1.0","BAT"]],
-        Scale: ["",["QtQuick1.0","BAT"]]
+        Rectangle: ["Rectangle"],
+        Image: ["Image"],
+        AnimatedImage: ["AnimatedImage"],
+        BorderImage: ["BorderImage"],
+        SystemPalette: ["SystemPalette"],
+        Text: ["Text"],
+        TextInput: ["TextInput"],
+        TextEdit: ["TextEdit"],
+        FontLoader: ["FontLoader"],
+        Flipable: ["Flipable"],
+        Flickable: ["Flickable"],
+        IntValidator: ["IntValidator"],
+        DoubleValidator: ["DoubleValidator"],
+        RegExpValidator: ["RegExpValidator"],
+        Column: ["Column"],
+        Row: ["Row"],
+        Flow: ["Flow"],
+        Grid: ["Grid"],
+        Repeater: ["Repeater"],
+        ListView: ["ListView"],
+        Keys: ["Keys"],
+        MouseArea: ["MouseArea"],
+        SequentialAnimation: ["SequentialAnimation"],
+        ParallelAnimation: ["ParallelAnimation"],
+        XmlListModel: ["XmlListModel"],
+        Scale: ["Scale"]
     },
 
-    pre_existing_elements: function(prec,groups) {
+    pre_existing_elements: function(name) {
         // Test Meta-data
-        testTitle = currentDataTag()+ " Element";
+        testTitle = name+ " Element";
         testBinary = "qmlscene tests/testapplications/elements/elements.qml";
-        testGoal = "Verify the "+currentDataTag()+" element is shown correctly";
-        testPreconditions = prec;
-        testGroups = groups;
+        testGoal = "Verify the "+name+" element is shown correctly";
+        testPreconditions = "None";
+        testGroups = "BAT";
 
         // Test Steps
         prompt(twiki('---+++ ' + testTitle + '<br><br>
         *Goal:* ' + testGoal + '<br>
         *Pre-Requisites:* ' + testPreconditions + '<br>
         *Tested Binary:* ' + testBinary + '<br>
-    | Select the '+currentDataTag()+' list item | Verify that the '+currentDataTag()+' application is displayed |
+    | Select the '+name+' list item | Verify that the '+name+' application is displayed |
     | Follow the instructions in the in-app test | Verify all steps are completed successfully |'));
     },
 
     new_elements_data: {
-        // ElementName: [preconditions,[groups]]
-        ParticleSystem: ["",["QtQuick2.0","BAT"]],
-        ImageParticle: ["",["QtQuick2.0","BAT"]],
-        Emitter: ["",["QtQuick2.0","BAT"]],
-        Affector: ["",["QtQuick2.0","BAT"]],
-        Shape: ["",["QtQuick2.0","BAT"]],
-        TrailEmitter: ["",["QtQuick2.0","BAT"]],
-        Direction: ["",["QtQuick2.0","BAT"]]
+        ParticleSystem: ["ParticleSystem"],
+        ImageParticle: ["ImageParticle"],
+        Emitter: ["Emitter"],
+        Affector: ["Affector"],
+        Shape: ["Shape",],
+        TrailEmitter: ["TrailEmitter"],
+        Direction: ["Direction"]
     },
 
-    new_elements: function(prec,groups) {
+    new_elements: function(name) {
         // Test Meta-data
-        testTitle = currentDataTag()+ " Element";
+        testTitle = name+ " Element";
         testBinary = "qmlscene tests/testapplications/elements/elements.qml";
-        testGoal = "Verify the "+currentDataTag()+" element is shown correctly";
-        testPreconditions = prec;
-        testGroups = groups;
+        testGoal = "Verify the "+name+" element is shown correctly";
+        testPreconditions = "None";
+        testGroups = "BAT";
 
         // Test Steps
         prompt(twiki('---+++ ' + testTitle + '<br><br>
         *Goal:* ' + testGoal + '<br>
         *Pre-Requisites:* ' + testPreconditions + '<br>
         *Tested Binary:* ' + testBinary + '<br>
-    | Select the '+currentDataTag()+' list item | Verify that the '+currentDataTag()+' application is displayed |
+    | Select the '+name+' list item | Verify that the '+name+' application is displayed |
     | Follow the instructions in the in-app test | Verify all steps are completed successfully |'));
     }
 }
-
-