Bladeren bron

Adapt test data to changes in b1d23d8b.

Sascha Zelzer 12 jaren geleden
bovenliggende
commit
3a9a67944a

+ 86 - 74
Libs/CommandLineModules/Frontend/QtGui/Testing/Cpp/ctkCmdLineModuleQtXslTransformTest.cpp

@@ -108,12 +108,24 @@ QString parametersWidgetHeader =
   ;
 
 QString parametersWidgetEmptyLayout =
-  "                    <layout class=\"QGridLayout\"/>\n";
+  "                    <layout class=\"QVBoxLayout\" name=\"paramContainerLayout:Parameters\">\n"
+  "                        <item>\n"
+  "                            <widget class=\"QWidget\" name=\"paramContainer:Parameters\">\n"
+  "                                <layout class=\"QGridLayout\"/>\n"
+  "                            </widget>\n"
+  "                        </item>\n"
+  "                    </layout>\n";
 
 QString parametersLayoutHeader =
-  "                    <layout class=\"QGridLayout\">\n";
+  "                    <layout class=\"QVBoxLayout\" name=\"paramContainerLayout:Parameters\">\n"
+  "                        <item>\n"
+  "                            <widget class=\"QWidget\" name=\"paramContainer:Parameters\">\n"
+  "                                <layout class=\"QGridLayout\">\n";
 
 QString parametersLayoutFooter =
+  "                                </layout>\n"
+  "                            </widget>\n"
+  "                        </item>\n"
   "                    </layout>\n";
 
 QString parametersWidgetFooter =
@@ -132,44 +144,44 @@ QString integer =
   ;
 
 QString integerWidgetLabel =
-  "                        <item row=\"0\" column=\"0\">\n"
-  "                            <widget class=\"QLabel\">\n"
-  "                                <property name=\"sizePolicy\">\n"
-  "                                    <sizepolicy hsizetype=\"Fixed\" vsizetype=\"Preferred\">\n"
-  "                                        <horstretch>0</horstretch>\n"
-  "                                        <verstretch>0</verstretch>\n"
-  "                                    </sizepolicy>\n"
-  "                                </property>\n"
-  "                                <property name=\"text\">\n"
-  "                                    <string>Integer</string>\n"
-  "                                </property>\n"
-  "                            </widget>\n"
-  "                        </item>\n"
+  "                                    <item row=\"0\" column=\"0\">\n"
+  "                                        <widget class=\"QLabel\">\n"
+  "                                            <property name=\"sizePolicy\">\n"
+  "                                                <sizepolicy hsizetype=\"Fixed\" vsizetype=\"Preferred\">\n"
+  "                                                    <horstretch>0</horstretch>\n"
+  "                                                    <verstretch>0</verstretch>\n"
+  "                                                </sizepolicy>\n"
+  "                                            </property>\n"
+  "                                            <property name=\"text\">\n"
+  "                                                <string>Integer</string>\n"
+  "                                            </property>\n"
+  "                                        </widget>\n"
+  "                                    </item>\n"
   ;
 QString integerWidgetSpinBoxHeader =
-  "                        <item row=\"0\" column=\"1\">\n"
+  "                                    <item row=\"0\" column=\"1\">\n"
   ;
 QString integerWidgetSpinBox =
-  "                            <widget class=\"QSpinBox\" name=\"parameter:integer\">\n"
-  "                                <property name=\"minimum\">\n"
-  "                                    <number>-999999999</number>\n"
-  "                                </property>\n"
-  "                                <property name=\"maximum\">\n"
-  "                                    <number>999999999</number>\n"
-  "                                </property>\n"
-  "                                <property name=\"toolTip\">\n"
-  "                                    <string>Integer description</string>\n"
-  "                                </property>\n"
-  "                                <property name=\"parameter:valueProperty\">\n"
-  "                                    <string>value</string>\n"
-  "                                </property>\n"
-  "                                <property name=\"value\">\n"
-  "                                    <number>1</number>\n"
-  "                                </property>\n"
-  "                            </widget>\n"
+  "                                        <widget class=\"QSpinBox\" name=\"parameter:integer\">\n"
+  "                                            <property name=\"minimum\">\n"
+  "                                                <number>-999999999</number>\n"
+  "                                            </property>\n"
+  "                                            <property name=\"maximum\">\n"
+  "                                                <number>999999999</number>\n"
+  "                                            </property>\n"
+  "                                            <property name=\"toolTip\">\n"
+  "                                                <string>Integer description</string>\n"
+  "                                            </property>\n"
+  "                                            <property name=\"parameter:valueProperty\">\n"
+  "                                                <string>value</string>\n"
+  "                                            </property>\n"
+  "                                            <property name=\"value\">\n"
+  "                                                <number>1</number>\n"
+  "                                            </property>\n"
+  "                                        </widget>\n"
   ;
 QString integerWidgetSpinBoxFooter =
-  "                        </item>\n"
+  "                                    </item>\n"
   ;
 
 
@@ -394,46 +406,46 @@ void ctkCmdLineModuleQtXslTransformTester::testXslExtraTransformation_data()
     "</xsl:template>\n"
     ;
   QString integerWidgetSliderSpinBox =
-    "                            <layout class=\"QHBoxLayout\">\n"
-    "                                <item>\n"
-    "                                    <widget class=\"QSlider\" name=\"parameter:integerSlider\">\n"
-    "                                        <property name=\"minimum\">\n"
-    "                                            <number>-999999999</number>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"maximum\">\n"
-    "                                            <number>999999999</number>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"toolTip\">\n"
-    "                                            <string>Integer description</string>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"parameter:valueProperty\">\n"
-    "                                            <string>value</string>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"value\">\n"
-    "                                            <number>1</number>\n"
-    "                                        </property>\n"
-    "                                    </widget>\n"
-    "                                </item>\n"
-    "                                <item>\n"
-    "                                    <widget class=\"QSpinBox\" name=\"parameter:integer\">\n"
-    "                                        <property name=\"minimum\">\n"
-    "                                            <number>-999999999</number>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"maximum\">\n"
-    "                                            <number>999999999</number>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"toolTip\">\n"
-    "                                            <string>Integer description</string>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"parameter:valueProperty\">\n"
-    "                                            <string>value</string>\n"
-    "                                        </property>\n"
-    "                                        <property name=\"value\">\n"
-    "                                            <number>1</number>\n"
-    "                                        </property>\n"
-    "                                    </widget>\n"
-    "                                </item>\n"
-    "                            </layout>\n"
+    "                                        <layout class=\"QHBoxLayout\">\n"
+    "                                            <item>\n"
+    "                                                <widget class=\"QSlider\" name=\"parameter:integerSlider\">\n"
+    "                                                    <property name=\"minimum\">\n"
+    "                                                        <number>-999999999</number>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"maximum\">\n"
+    "                                                        <number>999999999</number>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"toolTip\">\n"
+    "                                                        <string>Integer description</string>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"parameter:valueProperty\">\n"
+    "                                                        <string>value</string>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"value\">\n"
+    "                                                        <number>1</number>\n"
+    "                                                    </property>\n"
+    "                                                </widget>\n"
+    "                                            </item>\n"
+    "                                            <item>\n"
+    "                                                <widget class=\"QSpinBox\" name=\"parameter:integer\">\n"
+    "                                                    <property name=\"minimum\">\n"
+    "                                                        <number>-999999999</number>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"maximum\">\n"
+    "                                                        <number>999999999</number>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"toolTip\">\n"
+    "                                                        <string>Integer description</string>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"parameter:valueProperty\">\n"
+    "                                                        <string>value</string>\n"
+    "                                                    </property>\n"
+    "                                                    <property name=\"value\">\n"
+    "                                                        <number>1</number>\n"
+    "                                                    </property>\n"
+    "                                                </widget>\n"
+    "                                            </item>\n"
+    "                                        </layout>\n"
     ;
   QTest::addColumn<QString>("input");
   QTest::addColumn<QString>("extra");