move wd_samples_setup() to Samples.h

Author: hekra

src/Test/Headers.h

@@ -234,63 +234,3 @@ int wd_setup(int argc, char *argv[])
 
     return startError;
 }
-
-#ifndef QT_NO_SAMPLES
-int wd_samples_setup(webdriver::ViewCreator* widgetCreator,
-    webdriver::ViewCreator* webCreator,
-    webdriver::ViewCreator* qmlCreator,
-    CommandLine &cmd_line)
-{
-    if(widgetCreator != NULL)
-    {
-        widgetCreator->RegisterViewClass<WindowTestWidget>("WindowTestWidget");
-        widgetCreator->RegisterViewClass<ClickTestWidget>("ClickTestWidget");
-        widgetCreator->RegisterViewClass<ElementAttributeTestWidget>("ElementAttributeTestWidget");
-        widgetCreator->RegisterViewClass<FindingTestWidget>("FindingTestWidget");
-        widgetCreator->RegisterViewClass<CoordinatesTestWidget>("CoordinatesTestWidget");
-        widgetCreator->RegisterViewClass<ClickScrollingTestWidget>("ClickScrollingTestWidget");
-        widgetCreator->RegisterViewClass<ElementSelectingTestWidget>("ElementSelectingTestWidget");
-        widgetCreator->RegisterViewClass<TypingTestWidget>("TypingTestWidget");
-        widgetCreator->RegisterViewClass<BasicKeyboardInterfaceTestWidget>("BasicKeyboardInterfaceTestWidget");
-        widgetCreator->RegisterViewClass<TextHandlingTestWidget>("TextHandlingTestWidget");
-        widgetCreator->RegisterViewClass<FormHandlingTestWidget>("FormHandlingTestWidget");
-        widgetCreator->RegisterViewClass<XPathElementFindingTestWidget>("XPathElementFindingTestWidget");
-        widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
-        widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
-        widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
-        widgetCreator->RegisterViewClass<TouchTestWidget>("TouchTestWidget");
-        widgetCreator->RegisterViewClass<MenuTestWidget>("MenuTestWidget");
-    #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-        widgetCreator->RegisterViewClass<WindowWithDeclarativeViewTestWidget>("WindowWithDeclarativeViewTestWidget");
-    #endif
-
-    #if (1 == WD_ENABLE_PLAYER) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-        widgetCreator->RegisterViewClass<VideoTestWidget>("VideoTestWidget");
-    #endif //WD_ENABLE_PLAYER
-
-    #if (WD_ENABLE_WEB_VIEW == 1)
-        /* Register som test classes */
-        widgetCreator->RegisterViewClass<GraphicsWebViewTestWindows>("GraphicsWebViewTestWindows");
-        widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
-        widgetCreator->RegisterViewClass<WidgetAndWebViewTestWindows>("WidgetAndWebViewTestWindows");
-
-    #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-        widgetCreator->RegisterViewClass<WindowWithSeparatedDeclarativeAndWebViewsTestWidget>("WindowWithSeparatedDeclarativeAndWebViewsTestWidget");
-    #endif // QT_VERSION
-    #endif // WD_ENABLE_WEB_VIEW
-    }
-#if (1 == WD_ENABLE_PLAYER) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    // check if --test_data_folder CL argument is present
-    std::string testDataFolderSwitch = "test_data_folder";
-
-    if (cmd_line.HasSwitch(testDataFolderSwitch)) {
-      testDataFolder = cmd_line.GetSwitchValueASCII(testDataFolderSwitch);
-    } else {
-      testDataFolder = "./";
-    }
-
-    std::cout << "Using "<< testDataFolder << " as test data folder" << std::endl;
-#endif // WD_ENABLE_PLAYER
-    return 0;
-}
-#endif // QT_NO_SAMPLES

src/Test/Samples.h

@@ -53,7 +53,60 @@ extern std::string testDataFolder;
 #endif //QT_VERSION
 #endif //WD_ENABLE_WEB_VIEW
 
-int wd_samples_setup(webdriver::ViewCreator* widgetCreator, 
-	webdriver::ViewCreator* webCreator, 
-	webdriver::ViewCreator* qmlCreator,
-	CommandLine &cmd_line);
+int wd_samples_setup(webdriver::ViewCreator* widgetCreator,
+    webdriver::ViewCreator* webCreator,
+    webdriver::ViewCreator* qmlCreator,
+    CommandLine &cmd_line)
+{
+    if(widgetCreator != NULL)
+    {
+        widgetCreator->RegisterViewClass<WindowTestWidget>("WindowTestWidget");
+        widgetCreator->RegisterViewClass<ClickTestWidget>("ClickTestWidget");
+        widgetCreator->RegisterViewClass<ElementAttributeTestWidget>("ElementAttributeTestWidget");
+        widgetCreator->RegisterViewClass<FindingTestWidget>("FindingTestWidget");
+        widgetCreator->RegisterViewClass<CoordinatesTestWidget>("CoordinatesTestWidget");
+        widgetCreator->RegisterViewClass<ClickScrollingTestWidget>("ClickScrollingTestWidget");
+        widgetCreator->RegisterViewClass<ElementSelectingTestWidget>("ElementSelectingTestWidget");
+        widgetCreator->RegisterViewClass<TypingTestWidget>("TypingTestWidget");
+        widgetCreator->RegisterViewClass<BasicKeyboardInterfaceTestWidget>("BasicKeyboardInterfaceTestWidget");
+        widgetCreator->RegisterViewClass<TextHandlingTestWidget>("TextHandlingTestWidget");
+        widgetCreator->RegisterViewClass<FormHandlingTestWidget>("FormHandlingTestWidget");
+        widgetCreator->RegisterViewClass<XPathElementFindingTestWidget>("XPathElementFindingTestWidget");
+        widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
+        widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
+        widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
+        widgetCreator->RegisterViewClass<TouchTestWidget>("TouchTestWidget");
+        widgetCreator->RegisterViewClass<MenuTestWidget>("MenuTestWidget");
+    #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+        widgetCreator->RegisterViewClass<WindowWithDeclarativeViewTestWidget>("WindowWithDeclarativeViewTestWidget");
+    #endif
+
+    #if (1 == WD_ENABLE_PLAYER) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+        widgetCreator->RegisterViewClass<VideoTestWidget>("VideoTestWidget");
+    #endif //WD_ENABLE_PLAYER
+
+    #if (WD_ENABLE_WEB_VIEW == 1)
+        /* Register som test classes */
+        widgetCreator->RegisterViewClass<GraphicsWebViewTestWindows>("GraphicsWebViewTestWindows");
+        widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
+        widgetCreator->RegisterViewClass<WidgetAndWebViewTestWindows>("WidgetAndWebViewTestWindows");
+
+    #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+        widgetCreator->RegisterViewClass<WindowWithSeparatedDeclarativeAndWebViewsTestWidget>("WindowWithSeparatedDeclarativeAndWebViewsTestWidget");
+    #endif // QT_VERSION
+    #endif // WD_ENABLE_WEB_VIEW
+    }
+#if (1 == WD_ENABLE_PLAYER) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    // check if --test_data_folder CL argument is present
+    std::string testDataFolderSwitch = "test_data_folder";
+
+    if (cmd_line.HasSwitch(testDataFolderSwitch)) {
+      testDataFolder = cmd_line.GetSwitchValueASCII(testDataFolderSwitch);
+    } else {
+      testDataFolder = "./";
+    }
+
+    std::cout << "Using "<< testDataFolder << " as test data folder" << std::endl;
+#endif // WD_ENABLE_PLAYER
+    return 0;
+}