[GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jan 2014 21:14:30 +0000 (21:14 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jan 2014 21:14:30 +0000 (21:14 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126342

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2014-01-04
Reviewed by Gustavo Noronha Silva.

.:

* GNUmakefile.am: Remove unused variable.
* Source/PlatformGTK.cmake: No longer include the old unit tests directories.

Source/WebKit/gtk:

* tests/CMakeLists.txt: Removed.
* tests/GNUmakefile.am: Removed.

Source/WebKit2:

* UIProcess/API/gtk/tests/CMakeLists.txt: Removed.
* UIProcess/API/gtk/tests/GNUmakefile.am: Removed.

Tools:

* CMakeLists.txt: Include the new unit tests subdirectories.
* Scripts/run-gtk-tests: Update to refer to the new build locations.
* Scripts/webkitpy/style/checker.py: Update the style checker.
* Scripts/webkitpy/style/checker_unittest.py:
* TestWebKitAPI/GNUmakefile.am:
* TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Added.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp: Added.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h.
* TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp: Added.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestMain.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestMain.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h.
* TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h.
* TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h.
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h.
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h.
* TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp.
* TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml.
* TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Added.
* TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico: Renamed from Source/WebKit/gtk/tests/resources/blank.ico.
* TestWebKitAPI/Tests/WebKitGtk/resources/test.html: Renamed from Source/WebKit/gtk/tests/resources/test.html.
* TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg: Renamed from Source/WebKit/gtk/tests/resources/test.ogg.
* TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf: Renamed from Source/WebKit/gtk/tests/resources/test.pdf.
* TestWebKitAPI/Tests/WebKitGtk/resources/test.txt: Renamed from Source/WebKit/gtk/tests/resources/test.txt.
* TestWebKitAPI/Tests/WebKitGtk/test_utils.c: Renamed from Source/WebKit/gtk/tests/test_utils.c.
* TestWebKitAPI/Tests/WebKitGtk/test_utils.h: Renamed from Source/WebKit/gtk/tests/test_utils.h.
* TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c: Renamed from Source/WebKit/gtk/tests/testapplicationcache.c.
* TestWebKitAPI/Tests/WebKitGtk/testatk.c: Renamed from Source/WebKit/gtk/tests/testatk.c.
* TestWebKitAPI/Tests/WebKitGtk/testatkroles.c: Renamed from Source/WebKit/gtk/tests/testatkroles.c.
* TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c: Renamed from Source/WebKit/gtk/tests/testcontextmenu.c.
* TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c: Renamed from Source/WebKit/gtk/tests/testcopyandpaste.c.
* TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c: Renamed from Source/WebKit/gtk/tests/testdomdocument.c.
* TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c: Renamed from Source/WebKit/gtk/tests/testdomdomwindow.c.
* TestWebKitAPI/Tests/WebKitGtk/testdomnode.c: Renamed from Source/WebKit/gtk/tests/testdomnode.c.
* TestWebKitAPI/Tests/WebKitGtk/testdownload.c: Renamed from Source/WebKit/gtk/tests/testdownload.c.
* TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c: Renamed from Source/WebKit/gtk/tests/testfavicondatabase.c.
* TestWebKitAPI/Tests/WebKitGtk/testglobals.c: Renamed from Source/WebKit/gtk/tests/testglobals.c.
* TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c: Renamed from Source/WebKit/gtk/tests/testhittestresult.c.
* TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c: Renamed from Source/WebKit/gtk/tests/testhttpbackend.c.
* TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c: Renamed from Source/WebKit/gtk/tests/testkeyevents.c.
* TestWebKitAPI/Tests/WebKitGtk/testloading.c: Renamed from Source/WebKit/gtk/tests/testloading.c.
* TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c: Renamed from Source/WebKit/gtk/tests/testmimehandling.c.
* TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c: Renamed from Source/WebKit/gtk/tests/testnetworkrequest.c.
* TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c: Renamed from Source/WebKit/gtk/tests/testnetworkresponse.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c: Renamed from Source/WebKit/gtk/tests/testwebbackforwardlist.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c: Renamed from Source/WebKit/gtk/tests/testwebdatasource.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebframe.c: Renamed from Source/WebKit/gtk/tests/testwebframe.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c: Renamed from Source/WebKit/gtk/tests/testwebhistoryitem.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c: Renamed from Source/WebKit/gtk/tests/testwebinspector.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c: Renamed from Source/WebKit/gtk/tests/testwebplugindatabase.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebresource.c: Renamed from Source/WebKit/gtk/tests/testwebresource.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c: Renamed from Source/WebKit/gtk/tests/testwebsettings.c.
* TestWebKitAPI/Tests/WebKitGtk/testwebview.c: Renamed from Source/WebKit/gtk/tests/testwebview.c.
* TestWebKitAPI/Tests/WebKitGtk/testwindow.c: Renamed from Source/WebKit/gtk/tests/testwindow.c.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

100 files changed:
ChangeLog
GNUmakefile.am
Source/PlatformGTK.cmake
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/tests/GNUmakefile.am [deleted file]
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am [deleted file]
Tools/CMakeLists.txt
Tools/ChangeLog
Tools/Scripts/run-gtk-tests
Tools/Scripts/webkitpy/style/checker.py
Tools/Scripts/webkitpy/style/checker_unittest.py
Tools/TestWebKitAPI/GNUmakefile.am
Tools/TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp with 78% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt [moved from Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt with 77% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp [new file with mode: 0644]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp [new file with mode: 0644]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp with 97% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp with 97% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp with 96% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js [moved from Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem [moved from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem [moved from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml [moved from Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml with 56% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt [moved from Source/WebKit/gtk/tests/CMakeLists.txt with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico [moved from Source/WebKit/gtk/tests/resources/blank.ico with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html [moved from Source/WebKit/gtk/tests/resources/test.html with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg [moved from Source/WebKit/gtk/tests/resources/test.ogg with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf [moved from Source/WebKit/gtk/tests/resources/test.pdf with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.txt [moved from Source/WebKit/gtk/tests/resources/test.txt with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c [moved from Source/WebKit/gtk/tests/test_utils.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.h [moved from Source/WebKit/gtk/tests/test_utils.h with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c [moved from Source/WebKit/gtk/tests/testapplicationcache.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c [moved from Source/WebKit/gtk/tests/testatk.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testatkroles.c [moved from Source/WebKit/gtk/tests/testatkroles.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c [moved from Source/WebKit/gtk/tests/testcontextmenu.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c [moved from Source/WebKit/gtk/tests/testcopyandpaste.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c [moved from Source/WebKit/gtk/tests/testdomdocument.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c [moved from Source/WebKit/gtk/tests/testdomdomwindow.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testdomnode.c [moved from Source/WebKit/gtk/tests/testdomnode.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testdownload.c [moved from Source/WebKit/gtk/tests/testdownload.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c [moved from Source/WebKit/gtk/tests/testfavicondatabase.c with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testglobals.c [moved from Source/WebKit/gtk/tests/testglobals.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c [moved from Source/WebKit/gtk/tests/testhittestresult.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c [moved from Source/WebKit/gtk/tests/testhttpbackend.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c [moved from Source/WebKit/gtk/tests/testkeyevents.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testloading.c [moved from Source/WebKit/gtk/tests/testloading.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c [moved from Source/WebKit/gtk/tests/testmimehandling.c with 98% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c [moved from Source/WebKit/gtk/tests/testnetworkrequest.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c [moved from Source/WebKit/gtk/tests/testnetworkresponse.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c [moved from Source/WebKit/gtk/tests/testwebbackforwardlist.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c [moved from Source/WebKit/gtk/tests/testwebdatasource.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebframe.c [moved from Source/WebKit/gtk/tests/testwebframe.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c [moved from Source/WebKit/gtk/tests/testwebhistoryitem.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c [moved from Source/WebKit/gtk/tests/testwebinspector.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c [moved from Source/WebKit/gtk/tests/testwebplugindatabase.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebresource.c [moved from Source/WebKit/gtk/tests/testwebresource.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c [moved from Source/WebKit/gtk/tests/testwebsettings.c with 100% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwebview.c [moved from Source/WebKit/gtk/tests/testwebview.c with 99% similarity]
Tools/TestWebKitAPI/Tests/WebKitGtk/testwindow.c [moved from Source/WebKit/gtk/tests/testwindow.c with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp with 96% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h with 86% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp with 91% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h with 96% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h with 100% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp with 98% similarity]
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h [moved from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h with 90% similarity]

index fa03e8d..8eae0c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=126342
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * GNUmakefile.am: Remove unused variable.
+        * Source/PlatformGTK.cmake: No longer include the old unit tests directories.
+
 2014-01-06  Zan Dobersek  <zdobersek@igalia.com>
 
         [GTK] configure errors out when building with libc++
index 716a973..73fc492 100644 (file)
@@ -59,7 +59,6 @@ noinst_HEADERS :=
 noinst_LTLIBRARIES :=
 lib_LTLIBRARIES :=
 IDL_BINDINGS :=
-TEST_PROGS :=
 POFILES :=
 PO_LINGUAS :=
 USER_LINGUAS :=
@@ -214,8 +213,6 @@ include Source/ThirdParty/ANGLE/GNUmakefile.am
 include Source/ThirdParty/leveldb/GNUmakefile.am
 
 if ENABLE_DEVELOPER_MODE
-include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
-include Source/WebKit/gtk/tests/GNUmakefile.am
 include Source/ThirdParty/gtest/GNUmakefile.am
 include Tools/GNUmakefile.am
 include Tools/TestWebKitAPI/GNUmakefile.am
index 3f443b4..6d29e82 100644 (file)
@@ -3,15 +3,6 @@ add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
 # This allows exposing a 'gir' target which builds all GObject introspection files.
 add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
 
-if (ENABLE_API_TESTS)
-    if (ENABLE_WEBKIT)
-        add_subdirectory(${WEBKIT_DIR}/gtk/tests)
-    endif ()
-    if (ENABLE_WEBKIT2)
-        add_subdirectory(${WEBKIT2_DIR}/UIProcess/API/gtk/tests)
-    endif ()
-endif ()
-
 set(DocumentationDependencies
     "${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml"
 )
index 7bff0d3..89d6b0d 100644 (file)
@@ -1,3 +1,13 @@
+2014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=126342
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * tests/CMakeLists.txt: Removed.
+        * tests/GNUmakefile.am: Removed.
+
 2014-01-06  László Langó  <lango@inf.u-szeged.hu>
 
         Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
diff --git a/Source/WebKit/gtk/tests/GNUmakefile.am b/Source/WebKit/gtk/tests/GNUmakefile.am
deleted file mode 100644 (file)
index 8b86a73..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-# Build unit tests
-webkit_tests_cflags = \
-       -fno-strict-aliasing \
-       -I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
-       -I$(WebKit) \
-       -I$(GENSOURCES) \
-       -I$(top_builddir)/Source/WebKit/gtk \
-       -I$(top_srcdir)/Source/WebCore/bindings \
-       -I$(top_srcdir)/Source/WebCore/bindings/gobject \
-       $(global_cppflags) \
-       $(global_cflags) \
-       $(javascriptcore_cppflags) \
-       $(FREETYPE_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(LIBSOUP_CFLAGS) \
-       $(XRENDER_CFLAGS) \
-       $(XT_CFLAGS)
-
-webkit_tests_ldadd = \
-       libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       $(FREETYPE_LIBS) \
-       $(GTK_LIBS) \
-       $(GLIB_LIBS) \
-       $(LIBSOUP_LIBS) \
-       $(XRENDER_LIBS)
-
-webkit_tests_ldflags = \
-       -no-install
-
-if ENABLE_WEBKIT1
-noinst_PROGRAMS += \
-       Programs/WebKit1GObjectAPITests/testapplicationcache \
-       Programs/WebKit1GObjectAPITests/testcontextmenu \
-       Programs/WebKit1GObjectAPITests/testdomdocument \
-       Programs/WebKit1GObjectAPITests/testdomdomwindow \
-       Programs/WebKit1GObjectAPITests/testdomnode \
-       Programs/WebKit1GObjectAPITests/testhttpbackend \
-       Programs/WebKit1GObjectAPITests/testfavicondatabase \
-       Programs/WebKit1GObjectAPITests/testloading \
-       Programs/WebKit1GObjectAPITests/testglobals \
-       Programs/WebKit1GObjectAPITests/testmimehandling \
-       Programs/WebKit1GObjectAPITests/testnetworkrequest \
-       Programs/WebKit1GObjectAPITests/testnetworkresponse \
-       Programs/WebKit1GObjectAPITests/testwebframe \
-       Programs/WebKit1GObjectAPITests/testwebbackforwardlist \
-       Programs/WebKit1GObjectAPITests/testwebhistoryitem \
-       Programs/WebKit1GObjectAPITests/testwindow \
-       Programs/WebKit1GObjectAPITests/testdownload \
-       Programs/WebKit1GObjectAPITests/testatk \
-       Programs/WebKit1GObjectAPITests/testatkroles \
-       Programs/WebKit1GObjectAPITests/testhittestresult \
-       Programs/WebKit1GObjectAPITests/testwebinspector \
-       Programs/WebKit1GObjectAPITests/testwebsettings \
-       Programs/WebKit1GObjectAPITests/testwebresource \
-       Programs/WebKit1GObjectAPITests/testwebdatasource \
-       Programs/WebKit1GObjectAPITests/testwebplugindatabase \
-       Programs/WebKit1GObjectAPITests/testwebview \
-       Programs/WebKit1GObjectAPITests/testkeyevents \
-       Programs/WebKit1GObjectAPITests/testcopyandpaste
-endif
-
-# Add additional tests here
-Programs_WebKit1GObjectAPITests_testapplicationcache_SOURCES = Source/WebKit/gtk/tests/testapplicationcache.c
-Programs_WebKit1GObjectAPITests_testapplicationcache_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testapplicationcache_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testapplicationcache_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testcontextmenu_SOURCES = Source/WebKit/gtk/tests/testcontextmenu.c
-Programs_WebKit1GObjectAPITests_testcontextmenu_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testcontextmenu_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testcontextmenu_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testdomdocument_SOURCES = Source/WebKit/gtk/tests/testdomdocument.c
-Programs_WebKit1GObjectAPITests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testdomdocument_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testdomdomwindow_SOURCES = Source/WebKit/gtk/tests/testdomdomwindow.c
-Programs_WebKit1GObjectAPITests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testdomnode_SOURCES = Source/WebKit/gtk/tests/testdomnode.c
-Programs_WebKit1GObjectAPITests_testdomnode_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testdomnode_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testhttpbackend_SOURCES = Source/WebKit/gtk/tests/testhttpbackend.c
-Programs_WebKit1GObjectAPITests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testfavicondatabase_SOURCES = Source/WebKit/gtk/tests/testfavicondatabase.c Source/WebKit/gtk/tests/test_utils.c
-Programs_WebKit1GObjectAPITests_testfavicondatabase_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testfavicondatabase_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testfavicondatabase_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testglobals_SOURCES = Source/WebKit/gtk/tests/testglobals.c
-Programs_WebKit1GObjectAPITests_testglobals_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testglobals_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testloading_SOURCES = Source/WebKit/gtk/tests/testloading.c
-Programs_WebKit1GObjectAPITests_testloading_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testloading_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testloading_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testmimehandling_SOURCES = Source/WebKit/gtk/tests/testmimehandling.c Source/WebKit/gtk/tests/test_utils.c
-Programs_WebKit1GObjectAPITests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testmimehandling_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testnetworkrequest_SOURCES = Source/WebKit/gtk/tests/testnetworkrequest.c
-Programs_WebKit1GObjectAPITests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testnetworkresponse_SOURCES = Source/WebKit/gtk/tests/testnetworkresponse.c
-Programs_WebKit1GObjectAPITests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebframe_SOURCES = Source/WebKit/gtk/tests/testwebframe.c
-Programs_WebKit1GObjectAPITests_testwebframe_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebframe_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebplugindatabase_SOURCES = Source/WebKit/gtk/tests/testwebplugindatabase.c
-Programs_WebKit1GObjectAPITests_testwebplugindatabase_CFLAGS = -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebplugindatabase_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebbackforwardlist_SOURCES = Source/WebKit/gtk/tests/testwebbackforwardlist.c
-Programs_WebKit1GObjectAPITests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebhistoryitem_SOURCES = Source/WebKit/gtk/tests/testwebhistoryitem.c
-Programs_WebKit1GObjectAPITests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwindow_SOURCES = Source/WebKit/gtk/tests/testwindow.c
-Programs_WebKit1GObjectAPITests_testwindow_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwindow_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testdownload_SOURCES = Source/WebKit/gtk/tests/testdownload.c
-Programs_WebKit1GObjectAPITests_testdownload_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testdownload_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testatk_SOURCES = Source/WebKit/gtk/tests/testatk.c
-Programs_WebKit1GObjectAPITests_testatk_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testatk_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testatk_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testatkroles_SOURCES = Source/WebKit/gtk/tests/testatkroles.c
-Programs_WebKit1GObjectAPITests_testatkroles_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testatkroles_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebinspector_SOURCES = Source/WebKit/gtk/tests/testwebinspector.c Source/WebKit/gtk/tests/test_utils.c
-Programs_WebKit1GObjectAPITests_testwebinspector_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebinspector_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebinspector_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebsettings_SOURCES = Source/WebKit/gtk/tests/testwebsettings.c
-Programs_WebKit1GObjectAPITests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebsettings_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testwebresource_SOURCES = Source/WebKit/gtk/tests/testwebresource.c
-Programs_WebKit1GObjectAPITests_testwebresource_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebresource_LDADD = $(webkit_tests_ldadd)
-
-Programs_WebKit1GObjectAPITests_testwebdatasource_SOURCES = Source/WebKit/gtk/tests/testwebdatasource.c
-Programs_WebKit1GObjectAPITests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
-
-Programs_WebKit1GObjectAPITests_testwebview_SOURCES = Source/WebKit/gtk/tests/testwebview.c Source/WebKit/gtk/tests/test_utils.c
-Programs_WebKit1GObjectAPITests_testwebview_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testwebview_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testhittestresult_SOURCES = Source/WebKit/gtk/tests/testhittestresult.c
-Programs_WebKit1GObjectAPITests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testhittestresult_LDADD = $(webkit_tests_ldadd)
-
-Programs_WebKit1GObjectAPITests_testkeyevents_SOURCES = Source/WebKit/gtk/tests/testkeyevents.c
-Programs_WebKit1GObjectAPITests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
-Programs_WebKit1GObjectAPITests_testkeyevents_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_WebKit1GObjectAPITests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
-       Source/WebCore/platform/gtk/GtkVersioning.c
-Programs_WebKit1GObjectAPITests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
-       -I$(srcdir)/Source/WebCore/platform/gtk \
-       -I$(srcdir)/Source/WebCore
-Programs_WebKit1GObjectAPITests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
-Programs_WebKit1GObjectAPITests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
-
-EXTRA_DIST +=  \
-       $(WebKit)/tests/resources/* \
-       $(WebKit)/tests/test_utils.h
-
index e22e702..0ca05fb 100644 (file)
@@ -1,3 +1,13 @@
+2014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=126342
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * UIProcess/API/gtk/tests/CMakeLists.txt: Removed.
+        * UIProcess/API/gtk/tests/GNUmakefile.am: Removed.
+
 2014-01-06  Enrica Casucci  <enrica@apple.com>
 
         Add support to retrieve the autocorrection context.
diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
deleted file mode 100644 (file)
index 15ec7d1..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-if ENABLE_WEBKIT2
-
-TEST_PROGS += \
-       Programs/WebKit2GObjectAPITests/InspectorTestServer \
-       Programs/WebKit2GObjectAPITests/TestAuthentication \
-       Programs/WebKit2GObjectAPITests/TestBackForwardList \
-       Programs/WebKit2GObjectAPITests/TestContextMenu \
-       Programs/WebKit2GObjectAPITests/TestCookieManager \
-       Programs/WebKit2GObjectAPITests/TestDOMNode \
-       Programs/WebKit2GObjectAPITests/TestDownloads \
-       Programs/WebKit2GObjectAPITests/TestFrame \
-       Programs/WebKit2GObjectAPITests/TestInspector \
-       Programs/WebKit2GObjectAPITests/TestInspectorServer \
-       Programs/WebKit2GObjectAPITests/TestLoaderClient \
-       Programs/WebKit2GObjectAPITests/TestPrinting \
-       Programs/WebKit2GObjectAPITests/TestResources \
-       Programs/WebKit2GObjectAPITests/TestSSL \
-       Programs/WebKit2GObjectAPITests/TestUIClient \
-       Programs/WebKit2GObjectAPITests/TestWebExtensions \
-       Programs/WebKit2GObjectAPITests/TestWebKitVersion \
-       Programs/WebKit2GObjectAPITests/TestWebKitFaviconDatabase \
-       Programs/WebKit2GObjectAPITests/TestWebKitFindController \
-       Programs/WebKit2GObjectAPITests/TestWebKitPolicyClient \
-       Programs/WebKit2GObjectAPITests/TestWebKitSettings \
-       Programs/WebKit2GObjectAPITests/TestWebKitWebContext \
-       Programs/WebKit2GObjectAPITests/TestWebKitWebView \
-       Programs/WebKit2GObjectAPITests/TestWebKitWebViewGroup \
-       Programs/WebKit2GObjectAPITests/TestWebViewEditor
-
-noinst_PROGRAMS += $(TEST_PROGS)
-
-if HAVE_ATSPI2
-TEST_PROGS += Programs/WebKit2GObjectAPITests/TestWebKitAccessibility
-
-noinst_PROGRAMS += Programs/WebKit2GObjectAPITests/AccessibilityTestServer
-endif
-
-webkit2_tests_cppflags = \
-       -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs\" \
-       -DWEBKIT_SRC_DIR=\"${shell pwd}/${srcdir}\" \
-       -DWEBKIT_DERIVED_SRC_DIR=\"${shell pwd}/${top_builddir}/DerivedSources\" \
-       -DWEBKIT_TEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
-       -DWEBKIT_TEST_WEB_EXTENSIONS_DIR=\"${shell pwd}/${top_builddir}/Libraries/WebExtensions/.libs\" \
-       -DWEBKIT_INJECTED_BUNDLE_PATH=\"${shell pwd}/$(top_builddir)/.libs\" \
-       $(javascriptcore_cppflags) \
-       -I$(srcdir)/Source/JavaScriptCore \
-       -I$(srcdir)/Source \
-       -I$(srcdir)/Source/WebKit2 \
-       -I$(top_builddir)/DerivedSources/WebKit2/include \
-       -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk \
-       -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \
-       -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
-       $(global_cppflags) \
-       $(FREETYPE_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(LIBSOUP_CFLAGS)
-
-webkit2_tests_ldadd = \
-       Libraries/libWebKit2APITestCore.la \
-       libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       $(FREETYPE_LIBS) \
-       $(GEOCLUE_LIBS) \
-       $(GLIB_LIBS) \
-       $(GTK_LIBS) \
-       $(LIBSOUP_LIBS)
-
-webkit2_tests_ldflags = \
-       -no-install
-
-Programs/resources/webkit2gtk-tests-resources.gresource: Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml)
-       $(AM_V_at)mkdir -p ${GENPROGRAMS}/resources
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
-
-Programs/resources/inspector/inspectorPageIndex.html: Source/WebKit2/UIProcess/InspectorServer/front-end/inspectorPageIndex.html
-       $(AM_V_at)mkdir -p ${GENPROGRAMS}/resources/inspector
-       $(AM_V_GEN)cp $(srcdir)/Source/WebKit2/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${GENPROGRAMS}/resources/inspector
-
-DISTCLEANFILES += \
-       Programs/resources/webkit2gtk-tests-resources.gresource \
-       Programs/resources/inspector/inspectorPageIndex.html
-
-noinst_DATA += \
-       Programs/resources/webkit2gtk-tests-resources.gresource \
-       Programs/resources/inspector/inspectorPageIndex.html
-
-noinst_LTLIBRARIES += Libraries/libWebKit2APITestCore.la
-Libraries_libWebKit2APITestCore_la_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h
-Libraries_libWebKit2APITestCore_la_CPPFLAGS = $(webkit2_tests_cppflags)
-
-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
-Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp
-
-Libraries_WebExtensions_libWebExtensionTest_la_LDFLAGS = \
-       -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
-       $(no_undefined) \
-       -avoid-version \
-       -module
-
-Libraries_WebExtensions_libWebExtensionTest_la_CPPFLAGS = \
-       -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
-       -I$(top_builddir)/DerivedSources \
-       -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
-       -DWEBKIT2_COMPILATION \
-       $(webkit2_tests_cppflags)
-
-Libraries_WebExtensions_libWebExtensionTest_la_CXXFLAGS = \
-        $(global_cxxflags)
-
-Libraries_WebExtensions_libWebExtensionTest_la_CFLAGS = \
-        $(global_cflags)
-
-
-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
-Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp \
-       Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h
-
-Libraries_WebExtensions_libWebProcessTest_la_LDFLAGS = \
-       -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
-       $(no_undefined) \
-       -avoid-version \
-       -module
-
-Libraries_WebExtensions_libWebProcessTest_la_CPPFLAGS = \
-       -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
-       -I$(top_builddir)/DerivedSources \
-       -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
-       -DWEBKIT2_COMPILATION \
-       $(webkit2_tests_cppflags)
-
-Libraries_WebExtensions_libWebProcessTest_la_CXXFLAGS = \
-       $(global_cxxflags)
-
-Libraries_WebExtensions_libWebProcessTest_la_CFLAGS = \
-       $(global_cflags)
-
-
-EXTRA_DIST += \
-       Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem \
-       Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem \
-       Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml \
-       Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js
-
-Programs_WebKit2GObjectAPITests_TestWebKitWebContext_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitWebContext_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitWebContext_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitWebView_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitWebView_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitWebView_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestLoaderClient_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp
-Programs_WebKit2GObjectAPITests_TestLoaderClient_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestLoaderClient_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestLoaderClient_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitSettings_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitSettings_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitSettings_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_InspectorTestServer_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp
-Programs_WebKit2GObjectAPITests_InspectorTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_InspectorTestServer_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_InspectorTestServer_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestBackForwardList_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp
-Programs_WebKit2GObjectAPITests_TestBackForwardList_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestBackForwardList_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestBackForwardList_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitPolicyClient_LDFLAGS = $(webkit2_tests_ldflags)
-
-if HAVE_ATSPI2
-Programs_WebKit2GObjectAPITests_AccessibilityTestServer_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp
-Programs_WebKit2GObjectAPITests_AccessibilityTestServer_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_AccessibilityTestServer_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_CPPFLAGS = $(webkit2_tests_cppflags) $(ATSPI2_CFLAGS)
-Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDADD = $(webkit2_tests_ldadd) $(ATSPI2_LIBS)
-Programs_WebKit2GObjectAPITests_TestWebKitAccessibility_LDFLAGS = $(webkit2_tests_ldflags)
-endif
-
-Programs_WebKit2GObjectAPITests_TestDownloads_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp
-Programs_WebKit2GObjectAPITests_TestDownloads_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestDownloads_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestDownloads_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebViewEditor_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp
-Programs_WebKit2GObjectAPITests_TestWebViewEditor_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebViewEditor_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestPrinting_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp
-Programs_WebKit2GObjectAPITests_TestPrinting_CPPFLAGS = $(webkit2_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
-Programs_WebKit2GObjectAPITests_TestPrinting_LDADD = $(webkit2_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
-Programs_WebKit2GObjectAPITests_TestPrinting_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitFindController_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitFindController_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitFindController_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestResources_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp
-Programs_WebKit2GObjectAPITests_TestResources_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestResources_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestResources_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestCookieManager_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp
-Programs_WebKit2GObjectAPITests_TestCookieManager_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestCookieManager_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestCookieManager_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestInspector_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp
-Programs_WebKit2GObjectAPITests_TestInspector_CPPFLAGS = \
-       $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestInspector_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestInspectorServer_SOURCES = \
-       Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp
-Programs_WebKit2GObjectAPITests_TestInspectorServer_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestInspectorServer_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestInspectorServer_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitVersion_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestContextMenu_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp
-Programs_WebKit2GObjectAPITests_TestContextMenu_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestContextMenu_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestContextMenu_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestSSL_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp
-Programs_WebKit2GObjectAPITests_TestSSL_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestSSL_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestSSL_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebExtensions_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp
-Programs_WebKit2GObjectAPITests_TestWebExtensions_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebExtensions_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebExtensions_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp
-Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestWebKitWebViewGroup_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestDOMNode_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp
-Programs_WebKit2GObjectAPITests_TestDOMNode_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestDOMNode_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestDOMNode_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestFrame_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp
-Programs_WebKit2GObjectAPITests_TestFrame_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestFrame_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestFrame_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestAuthentication_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp
-Programs_WebKit2GObjectAPITests_TestAuthentication_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestAuthentication_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestAuthentication_LDFLAGS = $(webkit2_tests_ldflags)
-
-Programs_WebKit2GObjectAPITests_TestUIClient_SOURCES = \
-        Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp
-Programs_WebKit2GObjectAPITests_TestUIClient_CPPFLAGS = $(webkit2_tests_cppflags)
-Programs_WebKit2GObjectAPITests_TestUIClient_LDADD = $(webkit2_tests_ldadd)
-Programs_WebKit2GObjectAPITests_TestUIClient_LDFLAGS = $(webkit2_tests_ldflags)
-
-endif # ENABLE_WEBKIT2
index 41ff99a..f9945f3 100644 (file)
@@ -19,10 +19,12 @@ elseif ("${PORT}" STREQUAL "GTK")
     add_subdirectory(ImageDiff)
     if (ENABLE_WEBKIT2)
         add_subdirectory(MiniBrowser/gtk)
+        add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
     endif ()
     if (ENABLE_WEBKIT)
         add_subdirectory(GtkLauncher)
         add_subdirectory(DumpRenderTree)
+        add_subdirectory(TestWebKitAPI/Tests/WebKitGtk)
     endif ()
     add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
 elseif ("${PORT}" STREQUAL "WinCE")
index 03e91d3..8b8ddf9 100644 (file)
@@ -1,3 +1,103 @@
+2014-01-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move all GTK/GObject unit tests to Tools/TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=126342
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * CMakeLists.txt: Include the new unit tests subdirectories.
+        * Scripts/run-gtk-tests: Update to refer to the new build locations.
+        * Scripts/webkitpy/style/checker.py: Update the style checker.
+        * Scripts/webkitpy/style/checker_unittest.py:
+        * TestWebKitAPI/GNUmakefile.am:
+        * TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Added.
+        * TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp: Added.
+        * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/FrameTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/LoadTrackingTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/LoadTrackingTest.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestAuthentication.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestBackForwardList.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestContextMenu.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestCookieManager.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp: Added.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestFrame.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspector.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestMain.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestMain.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestUIClient.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitAccessibility.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitPolicyClient.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebViewGroup.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/TestWebViewEditor.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestBus.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebKitTestServer.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestServer.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTest.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTestRunner.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebProcessTestRunner.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp.
+        * TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h.
+        * TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js.
+        * TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem.
+        * TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem.
+        * TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Renamed from Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml.
+        * TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Added.
+        * TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico: Renamed from Source/WebKit/gtk/tests/resources/blank.ico.
+        * TestWebKitAPI/Tests/WebKitGtk/resources/test.html: Renamed from Source/WebKit/gtk/tests/resources/test.html.
+        * TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg: Renamed from Source/WebKit/gtk/tests/resources/test.ogg.
+        * TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf: Renamed from Source/WebKit/gtk/tests/resources/test.pdf.
+        * TestWebKitAPI/Tests/WebKitGtk/resources/test.txt: Renamed from Source/WebKit/gtk/tests/resources/test.txt.
+        * TestWebKitAPI/Tests/WebKitGtk/test_utils.c: Renamed from Source/WebKit/gtk/tests/test_utils.c.
+        * TestWebKitAPI/Tests/WebKitGtk/test_utils.h: Renamed from Source/WebKit/gtk/tests/test_utils.h.
+        * TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c: Renamed from Source/WebKit/gtk/tests/testapplicationcache.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testatk.c: Renamed from Source/WebKit/gtk/tests/testatk.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testatkroles.c: Renamed from Source/WebKit/gtk/tests/testatkroles.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c: Renamed from Source/WebKit/gtk/tests/testcontextmenu.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c: Renamed from Source/WebKit/gtk/tests/testcopyandpaste.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c: Renamed from Source/WebKit/gtk/tests/testdomdocument.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c: Renamed from Source/WebKit/gtk/tests/testdomdomwindow.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testdomnode.c: Renamed from Source/WebKit/gtk/tests/testdomnode.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testdownload.c: Renamed from Source/WebKit/gtk/tests/testdownload.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c: Renamed from Source/WebKit/gtk/tests/testfavicondatabase.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testglobals.c: Renamed from Source/WebKit/gtk/tests/testglobals.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c: Renamed from Source/WebKit/gtk/tests/testhittestresult.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c: Renamed from Source/WebKit/gtk/tests/testhttpbackend.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c: Renamed from Source/WebKit/gtk/tests/testkeyevents.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testloading.c: Renamed from Source/WebKit/gtk/tests/testloading.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c: Renamed from Source/WebKit/gtk/tests/testmimehandling.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c: Renamed from Source/WebKit/gtk/tests/testnetworkrequest.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c: Renamed from Source/WebKit/gtk/tests/testnetworkresponse.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c: Renamed from Source/WebKit/gtk/tests/testwebbackforwardlist.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c: Renamed from Source/WebKit/gtk/tests/testwebdatasource.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebframe.c: Renamed from Source/WebKit/gtk/tests/testwebframe.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c: Renamed from Source/WebKit/gtk/tests/testwebhistoryitem.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c: Renamed from Source/WebKit/gtk/tests/testwebinspector.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c: Renamed from Source/WebKit/gtk/tests/testwebplugindatabase.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebresource.c: Renamed from Source/WebKit/gtk/tests/testwebresource.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c: Renamed from Source/WebKit/gtk/tests/testwebsettings.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwebview.c: Renamed from Source/WebKit/gtk/tests/testwebview.c.
+        * TestWebKitAPI/Tests/WebKitGtk/testwindow.c: Renamed from Source/WebKit/gtk/tests/testwindow.c.
+
 2014-01-06  Alexey Proskuryakov  <ap@apple.com>
 
         Gtk and Efl API test results confuse the dashboard
index e6b406a..5daeaf0 100755 (executable)
@@ -58,35 +58,35 @@ class TestTimeout(Exception):
     pass
 
 class TestRunner:
-    TEST_DIRS = [ "WebKit1GObjectAPITests", "WebKit2GObjectAPITests", "TestWebKitAPI" ]
+    TEST_DIRS = [ "WebKit2Gtk", "WebKitGtk", "WebKit2", "JavaScriptCore", "WTF", "WebCore",  "WebCoreGtk" ]
 
     SKIPPED = [
-        SkippedTest("WebKit1GObjectAPITests/testdownload", "/webkit/download/not-found", "Test fails in GTK Linux 64-bit Release bot", 82329),
-        SkippedTest("WebKit1GObjectAPITests/testwebinspector", "/webkit/webinspector/close-and-inspect", "Test is flaky in GTK Linux 32-bit Release bot", 82869),
-        SkippedTest("WebKit1GObjectAPITests/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
-        SkippedTest("WebKit1GObjectAPITests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
-        SkippedTest("WebKit1GObjectAPITests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
-        SkippedTest("WebKit2GObjectAPITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
-        SkippedTest("WebKit2GObjectAPITests/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),
-        SkippedTest("WebKit2GObjectAPITests/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
-        SkippedTest("WebKit2GObjectAPITests/TestContextMenu", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutFrames", "Test fails", 85037),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.WKPageGetScaleFactorNotZero", "Test fails and times out", 88455),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ForceRepaint", "Test times out", 105532),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ReloadPageAfterCrash", "Test flakily times out", 110129),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.DidAssociateFormControls", "Test times out", 120302),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.InjectedBundleFrameHitTest", "Test times out", 120303),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ResizeReversePaginatedWebView", "Test fails", 120305),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.ScrollPinningBehaviors", "Test fails", 120306),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
-        SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
-        SkippedTest("WebKit2GObjectAPITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
+        SkippedTest("WebKitGtk/testdownload", "/webkit/download/not-found", "Test fails in GTK Linux 64-bit Release bot", 82329),
+        SkippedTest("WebKitGtk/testwebinspector", "/webkit/webinspector/close-and-inspect", "Test is flaky in GTK Linux 32-bit Release bot", 82869),
+        SkippedTest("WebKitGtk/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
+        SkippedTest("WebKitGtk/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
+        SkippedTest("WebKitGtk/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
+        SkippedTest("WebKit2Gtk/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
+        SkippedTest("WebKit2Gtk/TestUIClient", "/webkit2/WebKitWebView/mouse-target", "Test times out after r150890", 117689),
+        SkippedTest("WebKit2Gtk/TestAuthentication", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
+        SkippedTest("WebKit2Gtk/TestContextMenu", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutFrames", "Test fails", 85037),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKPageGetScaleFactorNotZero", "Test fails and times out", 88455),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ForceRepaint", "Test times out", 105532),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ReloadPageAfterCrash", "Test flakily times out", 110129),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.DidAssociateFormControls", "Test times out", 120302),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.InjectedBundleFrameHitTest", "Test times out", 120303),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ResizeReversePaginatedWebView", "Test fails", 120305),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.ScrollPinningBehaviors", "Test fails", 120306),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
+        SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
+        SkippedTest("WebKit2Gtk/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
     ]
 
     def __init__(self, options, tests=[]):
@@ -106,6 +106,9 @@ class TestRunner:
         self._spi_registryd = None
         self._spi_bus_launcher = None
 
+    def _test_programs_base_dir(self):
+        return os.path.join(self._programs_path, "TestWebKitAPI")
+
     def _get_tests_from_dir(self, test_dir):
         if not os.path.isdir(test_dir):
             return []
@@ -131,7 +134,7 @@ class TestRunner:
 
         tests = []
         for test_dir in self.TEST_DIRS:
-            absolute_test_dir = os.path.join(self._programs_path, test_dir)
+            absolute_test_dir = os.path.join(self._test_programs_base_dir(), test_dir)
             tests.extend(self._get_tests_from_dir(absolute_test_dir))
         return tests
 
@@ -361,17 +364,18 @@ class TestRunner:
         return 0
 
     def _run_test(self, test_program):
-        if "GObjectAPITest" in test_program:
+        basedir = os.path.basename(os.path.dirname(test_program))
+        if basedir in ["WebKit2Gtk", "WebKitGtk"]:
             return self._run_test_glib(test_program)
 
-        if "TestWebKitAPI" in test_program:
+        if basedir in ["WebKit2", "JavaScriptCore", "WTF", "WebCore",  "WebCoreGtk"]:
             return self._run_google_test_suite(test_program)
 
         return 1
 
     def run_tests(self):
         if not self._tests:
-            sys.stderr.write("ERROR: tests not found in %s.\n" % (self._programs_path))
+            sys.stderr.write("ERROR: tests not found in %s.\n" % (self._test_programs_base_dir()))
             sys.stderr.flush()
             return 1
 
@@ -405,17 +409,17 @@ class TestRunner:
             self._tear_down_testing_environment()
 
         if failed_tests:
-            names = [test.replace(self._programs_path, '', 1) for test in failed_tests]
+            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in failed_tests]
             sys.stdout.write("Tests failed (%d): %s\n" % (len(names), ", ".join(names)))
             sys.stdout.flush()
 
         if crashed_tests:
-            names = [test.replace(self._programs_path, '', 1) for test in crashed_tests]
+            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in crashed_tests]
             sys.stdout.write("Tests that crashed (%d): %s\n" % (len(names), ", ".join(names)))
             sys.stdout.flush()
 
         if timed_out_tests:
-            names = [test.replace(self._programs_path, '', 1) for test in timed_out_tests]
+            names = [test.replace(self._test_programs_base_dir(), '', 1) for test in timed_out_tests]
             sys.stdout.write("Tests that timed out (%d): %s\n" % (len(names), ", ".join(names)))
             sys.stdout.flush()
 
index 421ef27..cc3da25 100644 (file)
@@ -317,7 +317,7 @@ _CMAKE_FILE_EXTENSION = 'cmake'
 # WebKit maintains some files in Mozilla style on purpose to ease
 # future merges.
 _SKIPPED_FILES_WITH_WARNING = [
-    "Source/WebKit/gtk/tests/",
+    "Tools/TestWebKitAPI/Tests/WebKitGtk/",
     # All WebKit*.h files in Source/WebKit2/UIProcess/API/gtk,
     # except those ending in ...Private.h are GTK+ API headers,
     # which differ greatly from WebKit coding style.
index 945aff9..b954e6b 100644 (file)
@@ -280,7 +280,7 @@ class CheckerDispatcherSkipTest(unittest.TestCase):
         """Test should_skip_with_warning()."""
         # Check skipped files.
         paths_to_skip = [
-           "Source/WebKit/gtk/tests/testatk.c",
+           "Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c",
            "Source/WebKit2/UIProcess/API/gtk/webkit2.h",
            "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h",
            "Source/WebKit2/UIProcess/API/gtk/WebKitLoader.h",
@@ -297,8 +297,8 @@ class CheckerDispatcherSkipTest(unittest.TestCase):
            "Source/WebKit2/UIProcess/API/gtk/HelperClass.h",
            "Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp",
            "Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h",
-           "Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp",
-           "Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h",
+           "Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.cpp",
+           "Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebViewTest.h",
             ]
 
         for path in paths_not_to_skip:
index 2ea1040..049ac3e 100644 (file)
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES += \
        Libraries/libTestWebKitAPIMain.la
 
+if ENABLE_WEBKIT2
+noinst_LTLIBRARIES += \
+       Libraries/libTestWebKit2GtkAPI.la
+endif
+
 Libraries_libTestWebKitAPIMain_la_SOURCES = \
        Tools/TestWebKitAPI/Test.h \
        Tools/TestWebKitAPI/TestsController.cpp \
@@ -20,37 +25,184 @@ Libraries_libTestWebKitAPIMain_la_CPPFLAGS = \
        $(javascriptcore_cppflags) \
        $(GTK_CFLAGS)
 
+webkitgtk_tests_cflags = \
+       -fno-strict-aliasing \
+       -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
+       -I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
+       -I$(WebKit) \
+       -I$(GENSOURCES) \
+       -I$(top_builddir)/Source/WebKit/gtk \
+       -I$(top_srcdir)/Source/WebCore/bindings \
+       -I$(top_srcdir)/Source/WebCore/bindings/gobject \
+       $(global_cppflags) \
+       $(global_cflags) \
+       $(javascriptcore_cppflags) \
+       $(FREETYPE_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
+       $(XRENDER_CFLAGS) \
+       $(XT_CFLAGS)
+
+webkitgtk_tests_ldadd = \
+       libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+       libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+       $(FREETYPE_LIBS) \
+       $(GTK_LIBS) \
+       $(GLIB_LIBS) \
+       $(LIBSOUP_LIBS) \
+       $(XRENDER_LIBS)
+
+webkitgtk_tests_ldflags = \
+       -no-install
+
+
+webkit2gtk_tests_cppflags = \
+       -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs\" \
+       -DWEBKIT_SRC_DIR=\"${shell pwd}/${srcdir}\" \
+       -DWEBKIT_DERIVED_SRC_DIR=\"${shell pwd}/${top_builddir}/DerivedSources\" \
+       -DWEBKIT_TEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
+       -DWEBKIT_TEST_WEB_EXTENSIONS_DIR=\"${shell pwd}/${top_builddir}/Libraries/WebExtensions/.libs\" \
+       -DWEBKIT_INJECTED_BUNDLE_PATH=\"${shell pwd}/$(top_builddir)/.libs\" \
+       $(javascriptcore_cppflags) \
+       -I$(srcdir)/Source \
+       -I$(srcdir)/Source/WebKit2 \
+       -I$(srcdir)/Source/JavaScriptCore \
+       -I$(srcdir)/Tools/TestWebKitAPI/gtk/WebKit2Gtk \
+       -I$(top_builddir)/DerivedSources/WebKit2/include \
+       -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk \
+       -I$(top_builddir)/DerivedSources/WebKit2/webkit2gtk/include \
+       -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
+       $(global_cppflags) \
+       $(FREETYPE_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBSOUP_CFLAGS)
+
+webkit2gtk_tests_ldadd = \
+       Libraries/libTestWebKit2GtkAPI.la \
+       libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+       $(FREETYPE_LIBS) \
+       $(GEOCLUE_LIBS) \
+       $(GLIB_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBSOUP_LIBS)
+
+webkit2gtk_tests_ldflags = \
+       -no-install
+
+Libraries_libTestWebKit2GtkAPI_la_SOURCES = \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.h \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp \
+       Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
+
+Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+
+
 noinst_PROGRAMS += \
-       Programs/TestWebKitAPI/TestWTF \
-       Programs/TestWebKitAPI/TestJavaScriptCore \
-       Programs/TestWebKitAPI/TestWebCore \
-       Programs/TestWebKitAPI/TestGtk
+       Programs/TestWebKitAPI/WTF/TestWTF \
+       Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
+       Programs/TestWebKitAPI/WebCore/TestWebCore \
+       Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
+
+if ENABLE_WEBKIT1
+noinst_PROGRAMS += \
+       Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
+       Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
+       Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
+       Programs/TestWebKitAPI/WebKitGtk/testdomdomwindow \
+       Programs/TestWebKitAPI/WebKitGtk/testdomnode \
+       Programs/TestWebKitAPI/WebKitGtk/testhttpbackend \
+       Programs/TestWebKitAPI/WebKitGtk/testfavicondatabase \
+       Programs/TestWebKitAPI/WebKitGtk/testloading \
+       Programs/TestWebKitAPI/WebKitGtk/testglobals \
+       Programs/TestWebKitAPI/WebKitGtk/testmimehandling \
+       Programs/TestWebKitAPI/WebKitGtk/testnetworkrequest \
+       Programs/TestWebKitAPI/WebKitGtk/testnetworkresponse \
+       Programs/TestWebKitAPI/WebKitGtk/testwebframe \
+       Programs/TestWebKitAPI/WebKitGtk/testwebbackforwardlist \
+       Programs/TestWebKitAPI/WebKitGtk/testwebhistoryitem \
+       Programs/TestWebKitAPI/WebKitGtk/testwindow \
+       Programs/TestWebKitAPI/WebKitGtk/testdownload \
+       Programs/TestWebKitAPI/WebKitGtk/testatk \
+       Programs/TestWebKitAPI/WebKitGtk/testatkroles \
+       Programs/TestWebKitAPI/WebKitGtk/testhittestresult \
+       Programs/TestWebKitAPI/WebKitGtk/testwebinspector \
+       Programs/TestWebKitAPI/WebKitGtk/testwebsettings \
+       Programs/TestWebKitAPI/WebKitGtk/testwebresource \
+       Programs/TestWebKitAPI/WebKitGtk/testwebdatasource \
+       Programs/TestWebKitAPI/WebKitGtk/testwebplugindatabase \
+       Programs/TestWebKitAPI/WebKitGtk/testwebview \
+       Programs/TestWebKitAPI/WebKitGtk/testkeyevents \
+       Programs/TestWebKitAPI/WebKitGtk/testcopyandpaste
+endif
 
 if ENABLE_WEBKIT2
 noinst_PROGRAMS += \
-       Programs/TestWebKitAPI/TestWebKit2
+       Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
+       Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestBackForwardList \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestContextMenu \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestCookieManager \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestDOMNode \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestDownloads \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestFrame \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestInspector \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestInspectorServer \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestLoaderClient \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestPrinting \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestResources \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestSSL \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestUIClient \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebExtensions \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitVersion \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitFaviconDatabase \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitFindController \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitPolicyClient \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitSettings \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebContext \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebView \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitWebViewGroup \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
+
+if HAVE_ATSPI2
+noinst_PROGRAMS += \
+       Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
+       Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
+endif
 endif # ENABLE_WEBKIT2
 
-Programs_TestWebKitAPI_TestWTF_CPPFLAGS = \
+Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS = \
        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
        $(GLIB_LIBS) \
        $(CAIRO_CFLAGS)
 
-Programs_TestWebKitAPI_TestWTF_CXXFLAGS = \
+Programs_TestWebKitAPI_WTF_TestWTF_CXXFLAGS = \
        -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
-Programs_TestWebKitAPI_TestWTF_LDADD = \
+Programs_TestWebKitAPI_WTF_TestWTF_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
        libWTF.la \
        $(GTK_LIBS) \
        $(GLIB_LIBS)
 
-Programs_TestWebKitAPI_TestWTF_LDFLAGS = \
+Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS = \
        -no-install
 
-Programs_TestWebKitAPI_TestWTF_SOURCES = \
+Programs_TestWebKitAPI_WTF_TestWTF_SOURCES = \
        Tools/TestWebKitAPI/Tests/WTF/AtomicString.cpp \
        Tools/TestWebKitAPI/Tests/WTF/CString.cpp \
        Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp \
@@ -78,23 +230,23 @@ Programs_TestWebKitAPI_TestWTF_SOURCES = \
        Tools/TestWebKitAPI/Tests/WTF/Vector.cpp \
        Tools/TestWebKitAPI/WTFStringUtilities.h
 
-Programs_TestWebKitAPI_TestJavaScriptCore_CPPFLAGS = \
+Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_CPPFLAGS = \
        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS)
 
-Programs_TestWebKitAPI_TestJavaScriptCore_CXXFLAGS = \
+Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_CXXFLAGS = \
        -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
-Programs_TestWebKitAPI_TestJavaScriptCore_LDADD = \
+Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
        libWTF.la \
        $(GTK_LIBS)
 
-Programs_TestWebKitAPI_TestJavaScriptCore_LDFLAGS = \
+Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_LDFLAGS = \
        -no-install
 
-Programs_TestWebKitAPI_TestJavaScriptCore_SOURCES = \
+Programs_TestWebKitAPI_JavaScriptCore_TestJavaScriptCore_SOURCES = \
        Tools/TestWebKitAPI/Tests/JavaScriptCore/VMInspector.cpp
 
 webcore_layer_deps = \
@@ -129,15 +281,15 @@ libWebCoreLayer.a: $(webcore_layer_deps)
 DISTCLEANFILES += \
        $(top_builddir)/libWebCoreLayer.a
 
-Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
+Programs_TestWebKitAPI_WebCore_TestWebCore_CPPFLAGS = \
        $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
        -I$(top_builddir)/DerivedSources/WebCore/include
 
-Programs_TestWebKitAPI_TestWebCore_CXXFLAGS = \
+Programs_TestWebKitAPI_WebCore_TestWebCore_CXXFLAGS = \
        -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
-Programs_TestWebKitAPI_TestWebCore_LDADD = \
+Programs_TestWebKitAPI_WebCore_TestWebCore_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
@@ -164,15 +316,15 @@ Programs_TestWebKitAPI_TestWebCore_LDADD = \
        $(XT_LIBS) \
        $(ZLIB_LIBS)
 
-Programs_TestWebKitAPI_TestWebCore_LDFLAGS = \
+Programs_TestWebKitAPI_WebCore_TestWebCore_LDFLAGS = \
        -no-install
 
-Programs_TestWebKitAPI_TestWebCore_SOURCES = \
+Programs_TestWebKitAPI_WebCore_TestWebCore_SOURCES = \
        Tools/TestWebKitAPI/Tests/WebCore/URL.cpp \
        Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp
 
-Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
-       $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
+Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_CPPFLAGS = \
+       $(Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS) \
        $(platform_cppflags) \
        $(platformgtk_cppflags) \
        $(webcore_cppflags) \
@@ -182,11 +334,11 @@ Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS)
 
-Programs_TestWebKitAPI_TestGtk_CXXFLAGS = \
+Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_CXXFLAGS = \
        -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
-Programs_TestWebKitAPI_TestGtk_LDADD = \
+Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
@@ -198,10 +350,10 @@ Programs_TestWebKitAPI_TestGtk_LDADD = \
        $(GTK_LIBS) \
        $(LIBSOUP_LIBS)
 
-Programs_TestWebKitAPI_TestGtk_LDFLAGS = \
-       $(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
+Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_LDFLAGS = \
+       $(Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS)
 
-Programs_TestWebKitAPI_TestGtk_SOURCES = \
+Programs_TestWebKitAPI_WebCoreGtk_TestWebCoreGtk_SOURCES = \
        Source/WebCore/platform/graphics/IntPoint.cpp \
        Source/WebCore/platform/graphics/IntRect.cpp \
        Source/WebCore/platform/graphics/IntSize.cpp \
@@ -211,19 +363,192 @@ Programs_TestWebKitAPI_TestGtk_SOURCES = \
        Tools/TestWebKitAPI/config.h \
        Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp
 
-Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
-       $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
+Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testapplicationcache.c
+Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testapplicationcache_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testcontextmenu.c
+Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testcontextmenu_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testdomdocument_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdocument.c
+Programs_TestWebKitAPI_WebKitGtk_testdomdocument_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testdomdocument_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testdomdocument_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testdomdomwindow.c
+Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testdomdomwindow_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testdomnode_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testdomnode.c
+Programs_TestWebKitAPI_WebKitGtk_testdomnode_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testdomnode_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testdomnode_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testhttpbackend.c
+Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testhttpbackend_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testfavicondatabase.c \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
+Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testfavicondatabase_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testglobals_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testglobals.c
+Programs_TestWebKitAPI_WebKitGtk_testglobals_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testglobals_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testglobals_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testloading_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testloading.c
+Programs_TestWebKitAPI_WebKitGtk_testloading_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testloading_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testloading_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testmimehandling_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testmimehandling.c \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
+Programs_TestWebKitAPI_WebKitGtk_testmimehandling_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testmimehandling_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testmimehandling_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkrequest.c
+Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testnetworkrequest_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testnetworkresponse.c
+Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testnetworkresponse_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebframe_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebframe.c
+Programs_TestWebKitAPI_WebKitGtk_testwebframe_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebframe_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebframe_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebplugindatabase.c
+Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebplugindatabase_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebbackforwardlist.c
+Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebbackforwardlist_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebhistoryitem.c
+Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebhistoryitem_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwindow_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwindow.c
+Programs_TestWebKitAPI_WebKitGtk_testwindow_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwindow_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwindow_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testdownload_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testdownload.c
+Programs_TestWebKitAPI_WebKitGtk_testdownload_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testdownload_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testdownload_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testatk_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testatk.c
+Programs_TestWebKitAPI_WebKitGtk_testatk_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testatk_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testatk_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testatkroles_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testatkroles.c
+Programs_TestWebKitAPI_WebKitGtk_testatkroles_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testatkroles_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testatkroles_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebinspector_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebinspector.c \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
+Programs_TestWebKitAPI_WebKitGtk_testwebinspector_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebinspector_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebinspector_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebsettings_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebsettings.c
+Programs_TestWebKitAPI_WebKitGtk_testwebsettings_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebsettings_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebsettings_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebresource_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebresource.c
+Programs_TestWebKitAPI_WebKitGtk_testwebresource_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebresource_LDADD = $(webkitgtk_tests_ldadd)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebdatasource.c
+Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebdatasource_LDADD = $(webkitgtk_tests_ldadd)
+
+Programs_TestWebKitAPI_WebKitGtk_testwebview_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testwebview.c Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.c
+Programs_TestWebKitAPI_WebKitGtk_testwebview_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testwebview_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testwebview_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testhittestresult_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testhittestresult.c
+Programs_TestWebKitAPI_WebKitGtk_testhittestresult_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testhittestresult_LDADD = $(webkitgtk_tests_ldadd)
+
+Programs_TestWebKitAPI_WebKitGtk_testkeyevents_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testkeyevents.c
+Programs_TestWebKitAPI_WebKitGtk_testkeyevents_CFLAGS = $(webkitgtk_tests_cflags)
+Programs_TestWebKitAPI_WebKitGtk_testkeyevents_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testkeyevents_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/testcopyandpaste.c \
+       Source/WebCore/platform/gtk/GtkVersioning.c
+Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_CFLAGS = \
+       $(webkitgtk_tests_cflags) \
+       -I$(srcdir)/Source/WebCore/platform/gtk \
+       -I$(srcdir)/Source/WebCore
+Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_LDADD = $(webkitgtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKitGtk_testcopyandpaste_LDFLAGS = $(webkitgtk_tests_ldflags)
+
+
+Programs_TestWebKitAPI_WebKit2_TestWebKit2_CPPFLAGS = \
+       $(Programs_TestWebKitAPI_WTF_TestWTF_CPPFLAGS) \
        -I$(top_builddir)/DerivedSources/WebKit2/include \
        $(FREETYPE_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS)
 
-Programs_TestWebKitAPI_TestWebKit2_CXXFLAGS = \
+Programs_TestWebKitAPI_WebKit2_TestWebKit2_CXXFLAGS = \
        -DGTEST_HAS_RTTI=0 \
        $(global_cxxflags)
 
-Programs_TestWebKitAPI_TestWebKit2_LDADD = \
+Programs_TestWebKitAPI_WebKit2_TestWebKit2_LDADD = \
        Libraries/libTestWebKitAPIMain.la \
        Libraries/libgtest.la \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
@@ -233,10 +558,10 @@ Programs_TestWebKitAPI_TestWebKit2_LDADD = \
        $(GTK_LIBS) \
        $(LIBSOUP_LIBS)
 
-Programs_TestWebKitAPI_TestWebKit2_LDFLAGS = \
-       $(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
+Programs_TestWebKitAPI_WebKit2_TestWebKit2_LDFLAGS = \
+       $(Programs_TestWebKitAPI_WTF_TestWTF_LDFLAGS)
 
-Programs_TestWebKitAPI_TestWebKit2_SOURCES = \
+Programs_TestWebKitAPI_WebKit2_TestWebKit2_SOURCES = \
        Tools/TestWebKitAPI/config.h \
        Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp \
        Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp \
@@ -357,11 +682,245 @@ Libraries_libTestWebKitAPIInjectedBundle_la_CFLAGS = \
        $(global_cflags)
 
 
-stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebCore_SOURCES)
+if ENABLE_WEBKIT2
+noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
+endif
+
+Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp
+
+Libraries_WebExtensions_libWebExtensionTest_la_LDFLAGS = \
+       -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
+       $(no_undefined) \
+       -avoid-version \
+       -module
+
+Libraries_WebExtensions_libWebExtensionTest_la_CPPFLAGS = \
+       -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
+       -I$(top_builddir)/DerivedSources \
+       -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
+       -DWEBKIT2_COMPILATION \
+       $(webkit2gtk_tests_cppflags)
+
+Libraries_WebExtensions_libWebExtensionTest_la_CXXFLAGS = \
+        $(global_cxxflags)
+
+Libraries_WebExtensions_libWebExtensionTest_la_CFLAGS = \
+        $(global_cflags)
+
+
+if ENABLE_WEBKIT2
+noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
+endif
+
+Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/FrameTest.cpp \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h
+
+Libraries_WebExtensions_libWebProcessTest_la_LDFLAGS = \
+       -rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \
+       $(no_undefined) \
+       -avoid-version \
+       -module
+
+Libraries_WebExtensions_libWebProcessTest_la_CPPFLAGS = \
+       -I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
+       -I$(top_builddir)/DerivedSources \
+       -I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \
+       -DWEBKIT2_COMPILATION \
+       $(webkit2gtk_tests_cppflags)
+
+Libraries_WebExtensions_libWebProcessTest_la_CXXFLAGS = \
+       $(global_cxxflags)
+
+Libraries_WebExtensions_libWebProcessTest_la_CFLAGS = \
+       $(global_cflags)
+
+
+Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource: Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml)
+       $(AM_V_at)mkdir -p ${GENPROGRAMS}/TestWebKitAPI/WebKit2Gtk/resources
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+
+DISTCLEANFILES += \
+       Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
+
+noinst_DATA += \
+       Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
+
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebContext_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebView_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestLoaderClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitSettings_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/InspectorTestServer.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_InspectorTestServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestBackForwardList_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitPolicyClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+if HAVE_ATSPI2
+Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/AccessibilityTestServer.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_AccessibilityTestServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_CPPFLAGS = $(webkit2gtk_tests_cppflags) $(ATSPI2_CFLAGS)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_LDADD = $(webkit2gtk_tests_ldadd) $(ATSPI2_LIBS)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitAccessibility_LDFLAGS = $(webkit2gtk_tests_ldflags)
+endif
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestDownloads_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebViewEditor_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_CPPFLAGS = $(webkit2gtk_tests_cppflags) $(GTK_UNIX_PRINTING_CFLAGS)
+Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_LDADD = $(webkit2gtk_tests_ldadd) $(GTK_UNIX_PRINTING_LIBS)
+Programs_TestWebKitAPI_WebKit2Gtk_TestPrinting_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFaviconDatabase_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitFindController_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestResources_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestResources_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestResources_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestResources_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestCookieManager_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_CPPFLAGS = \
+       $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspector_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_SOURCES = \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestInspectorServer_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitVersion.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitVersion_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestContextMenu_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestSSL_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebExtensions_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestWebKitWebViewGroup_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestDOMNode_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestFrame.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestFrame_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestAuthentication_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_SOURCES = \
+        Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp
+Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_LDADD = $(webkit2gtk_tests_ldadd)
+Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_LDFLAGS = $(webkit2gtk_tests_ldflags)
+
+
+stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_WebCore_TestWebCore_SOURCES)
        $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI/Tests/WebCore $(GENSOURCES_WEBCORE)/include gtk \
        && echo timestamp > $(@F)
 
-stamp-testwebkitapi-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
+stamp-testwebkitapi-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_WebKit2_TestWebKit2_SOURCES) $(Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES)
        $(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk \
        && echo timestamp > $(@F)
 
@@ -386,4 +945,14 @@ EXTRA_DIST += \
        Tools/TestWebKitAPI/Tests/WebKit2/simple.html \
        Tools/TestWebKitAPI/Tests/WebKit2/simple-iframe.html \
        Tools/TestWebKitAPI/Tests/WebKit2/simple-tall.html \
-       Tools/TestWebKitAPI/Tests/WebKit2/spacebar-scrolling.html
+       Tools/TestWebKitAPI/Tests/WebKit2/spacebar-scrolling.html \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-cert.pem \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/test-key.pem \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml \
+       Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/test_utils.h \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/resources/blank.ico \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.ogg \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.pdf \
+       Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.txt
@@ -38,14 +38,14 @@ int main(int argc, char** argv)
 
     WebKitWebView* webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
     webkit_web_view_load_html(webView,
-                              "<html>"
-                              "  <body>"
-                              "   <h1>This is a test</h1>"
-                              "   <p>This is a paragraph with some plain text.</p>"
-                              "   <p>This paragraph contains <a href=\"http://www.webkitgtk.org\">a link</a> in the middle.</p>"
-                              "  </body>"
-                              "</html>",
-                              0);
+        "<html>"
+        "  <body>"
+        "   <h1>This is a test</h1>"
+        "   <p>This is a paragraph with some plain text.</p>"
+        "   <p>This paragraph contains <a href=\"http://www.webkitgtk.org\">a link</a> in the middle.</p>"
+        "  </body>"
+        "</html>",
+        0);
 
     GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(webView));
@@ -1,5 +1,6 @@
-set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
-set(TEST_RESOURCES_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources)
+set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GtkAPITests)
+set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/WebKit2Gtk)
+set(TEST_RESOURCES_DIR ${TEST_BINARY_DIR}/resources)
 file(MAKE_DIRECTORY ${TEST_RESOURCES_DIR})
 
 add_definitions(
@@ -19,6 +20,7 @@ include_directories(
     ${FORWARDING_HEADERS_DIR}
     ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
     ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk
     ${ATSPI_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${GTK3_INCLUDE_DIRS}
@@ -26,20 +28,22 @@ include_directories(
 )
 
 add_library(WebKit2APITestCore STATIC
-    LoadTrackingTest.cpp
-    WebKitTestBus.cpp
-    WebKitTestServer.cpp
-    WebProcessTestRunner.cpp
-    TestMain.cpp
-    WebViewTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp
+    ${TOOLS_DIR}/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp
 )
-
 target_link_libraries(WebKit2APITestCore WebKit2)
 
 add_custom_target(test-gresource-bundle
     DEPENDS resources/webkit2gtk-tests.gresource.xml
             resources/link-title.js
-    COMMAND glib-compile-resources --target=${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource --sourcedir=${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml
+    COMMAND glib-compile-resources
+            --target=${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource
+            --sourcedir=${CMAKE_SOURCE_DIR}
+            ${CMAKE_CURRENT_LIST_DIR}/resources/webkit2gtk-tests.gresource.xml
 )
 
 macro(ADD_WK2_TEST_WEB_EXTENSION extension_name)
@@ -71,7 +75,7 @@ macro(ADD_WK2_TEST test_name)
         ${LIBSOUP_LIBRARIES}
     )
     set_target_properties(${test_name} PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests
+        RUNTIME_OUTPUT_DIRECTORY ${TEST_BINARY_DIR}
     )
 endmacro()
 
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMDOMWindowTest.cpp
new file mode 100644 (file)
index 0000000..7caad54
--- /dev/null
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#include "WebProcessTest.h"
+#include <gio/gio.h>
+#include <webkit2/webkit-web-extension.h>
+#include <wtf/RunLoop.h>
+
+class WebKitDOMDOMWindowTest;
+static gboolean loadedCallback(WebKitDOMDOMWindow*, WebKitDOMEvent*, WebKitDOMDOMWindowTest*);
+static gboolean clickedCallback(WebKitDOMDOMWindow*, WebKitDOMEvent*, WebKitDOMDOMWindowTest*);
+
+class WebKitDOMDOMWindowTest : public WebProcessTest {
+public:
+    static PassOwnPtr<WebProcessTest> create() { return adoptPtr(new WebKitDOMDOMWindowTest()); }
+
+private:
+    guint64 webPageFromArgs(GVariant* args)
+    {
+        GVariantIter iter;
+        g_variant_iter_init(&iter, args);
+
+        const char* key;
+        GVariant* value;
+        while (g_variant_iter_loop(&iter, "{&sv}", &key, &value)) {
+            if (!strcmp(key, "pageID") && g_variant_classify(value) == G_VARIANT_CLASS_UINT64)
+                return g_variant_get_uint64(value);
+        }
+
+        g_assert_not_reached();
+        return 0;
+    }
+
+    bool testSignals(WebKitWebExtension* extension, GVariant* args)
+    {
+        notify("ready", "");
+
+        WebKitWebPage* page = webkit_web_extension_get_page(extension, webPageFromArgs(args));
+        g_assert(WEBKIT_IS_WEB_PAGE(page));
+        WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
+        g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+
+        WebKitDOMDOMWindow* domWindow = webkit_dom_document_get_default_view(document);
+        g_assert(domWindow);
+
+        // The "load" WebKitDOMDOMWindow signal is issued before this test is
+        // called. There's no way to capture it here. We simply assume that
+        // the document is loaded and notify the uiprocess accordingly
+        // notify("loaded", "");
+
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(domWindow),
+            "load",
+            G_CALLBACK(loadedCallback),
+            false,
+            this);
+
+        // loadedCallback() will stop this loop
+        RunLoop::run();
+
+        document = webkit_web_page_get_dom_document(page);
+        g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+
+        WebKitDOMElement* element = webkit_dom_document_get_element_by_id(document, "test");
+        g_assert(element);
+
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(element),
+            "click",
+            G_CALLBACK(clickedCallback),
+            false,
+            this);
+
+        // The "click" action will be issued in the uiprocess and that will
+        // trigger the dom event here.
+        // clickedCallback() will stop this loop
+        RunLoop::run();
+
+        return true;
+    }
+
+    bool testDispatchEvent(WebKitWebExtension* extension, GVariant* args)
+    {
+        notify("ready", "");
+
+        WebKitWebPage* page = webkit_web_extension_get_page(extension, webPageFromArgs(args));
+        g_assert(WEBKIT_IS_WEB_PAGE(page));
+        WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
+        g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+
+        WebKitDOMDOMWindow* domWindow = webkit_dom_document_get_default_view(document);
+        g_assert(domWindow);
+
+        // The "load" WebKitDOMDOMWindow signal is issued before this test is
+        // called. There's no way to capture it here. We simply assume that
+        // the document is loaded and notify the uiprocess accordingly
+        // notify("loaded", "");
+
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(domWindow),
+            "load",
+            G_CALLBACK(loadedCallback),
+            false,
+            this);
+
+        // loadedCallback() will stop this loop
+        RunLoop::run();
+
+        document = webkit_web_page_get_dom_document(page);
+        g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+
+        WebKitDOMElement* element = webkit_dom_document_get_element_by_id(document, "test");
+        g_assert(element);
+
+        WebKitDOMEvent* event = webkit_dom_document_create_event(document, "MouseEvent", 0);
+        g_assert(event);
+        g_assert(WEBKIT_DOM_IS_EVENT(event));
+        g_assert(WEBKIT_DOM_IS_MOUSE_EVENT(event));
+
+        glong clientX, clientY;
+        clientX = webkit_dom_element_get_client_left(element);
+        clientY = webkit_dom_element_get_client_top(element);
+
+        webkit_dom_event_target_add_event_listener(
+            WEBKIT_DOM_EVENT_TARGET(element),
+            "click",
+            G_CALLBACK(clickedCallback),
+            false,
+            this);
+
+        webkit_dom_mouse_event_init_mouse_event(WEBKIT_DOM_MOUSE_EVENT(event),
+            "click", TRUE, TRUE,
+            domWindow, 0, 0, 0, clientX, clientY,
+            FALSE, FALSE, FALSE, FALSE,
+            1, WEBKIT_DOM_EVENT_TARGET(element));
+
+        webkit_dom_event_target_dispatch_event(WEBKIT_DOM_EVENT_TARGET(element), event, 0);
+
+        // clickedCallback() will stop this loop
+        RunLoop::run();
+
+        return true;
+    }
+
+    bool testGetComputedStyle(WebKitWebExtension* extension, GVariant* args)
+    {
+        WebKitWebPage* page = webkit_web_extension_get_page(extension, webPageFromArgs(args));
+        g_assert(WEBKIT_IS_WEB_PAGE(page));
+        WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
+        g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+        WebKitDOMDOMWindow* domWindow = webkit_dom_document_get_default_view(document);
+        g_assert(domWindow);
+        WebKitDOMElement* element = webkit_dom_document_get_element_by_id(document, "test");
+        g_assert(element);
+        g_assert(WEBKIT_DOM_IS_ELEMENT(element));
+        WebKitDOMCSSStyleDeclaration* cssStyle = webkit_dom_dom_window_get_computed_style(domWindow, element, 0);
+        gchar* fontSize = webkit_dom_css_style_declaration_get_property_value(cssStyle, "font-size");
+        g_assert_cmpstr(fontSize, ==, "16px");
+
+        return true;
+    }
+
+    virtual bool runTest(const char* testName, WebKitWebExtension* extension, GVariant* args)
+    {
+        if (!strcmp(testName, "signals"))
+            return testSignals(extension, args);
+        if (!strcmp(testName, "dispatch-event"))
+            return testDispatchEvent(extension, args);
+        if (!strcmp(testName, "get-computed-style"))
+            return testGetComputedStyle(extension, args);
+
+        g_assert_not_reached();
+        return false;
+    }
+};
+
+static void __attribute__((constructor)) registerTests()
+{
+    REGISTER_TEST(WebKitDOMDOMWindowTest, "WebKitDOMDOMWindow/signals");
+    REGISTER_TEST(WebKitDOMDOMWindowTest, "WebKitDOMDOMWindow/dispatch-event");
+    REGISTER_TEST(WebKitDOMDOMWindowTest, "WebKitDOMDOMWindow/get-computed-style");
+}
+
+static gboolean loadedCallback(WebKitDOMDOMWindow* view, WebKitDOMEvent* event, WebKitDOMDOMWindowTest* test)
+{
+    test->notify("loaded", "");
+
+    // Stop the loop and let testSignals() or testDispatchEvent() continue its course
+    RunLoop::current()->stop();
+
+    return FALSE;
+}
+
+static gboolean clickedCallback(WebKitDOMDOMWindow* view, WebKitDOMEvent* event, WebKitDOMDOMWindowTest* test)
+{
+    test->notify("clicked", "");
+    test->notify("finish", "");
+
+    // Stop the loop and let testSignals() or testDispatchEvent() continue its course
+    RunLoop::current()->stop();
+
+    return FALSE;
+}
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMDOMWindow.cpp
new file mode 100644 (file)
index 0000000..98c6e10
--- /dev/null
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2,1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#include "WebProcessTestRunner.h"
+#include "WebViewTest.h"
+#include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
+
+#define HTML_DOCUMENT "<html><head><title></title></head><style type='text/css'>#test { font-size: 16px; }</style><body><p id='test'>test</p></body></html>"
+
+typedef struct {
+    gboolean loaded;
+    gboolean clicked;
+    WebProcessTestRunner* testRunner;
+    WebViewTest* test;
+} DomDomWindowTestStatus;
+
+static DomDomWindowTestStatus status;
+
+static void signalsNotifyCallback(const gchar *key, const gchar *value, gconstpointer)
+{
+    if (g_str_equal(key, "ready")) {
+        // The document was already loaded in the webprocess, and its "load"
+        // signal couldn't be captured on time (was issued before the test
+        // started). We load it again to force a new "load" signal in the
+        // webprocess, which will be captured this time
+        status.test->loadHtml(HTML_DOCUMENT, 0);
+    }
+
+    if (g_str_equal(key, "loaded")) {
+        status.loaded = TRUE;
+        status.test->showInWindowAndWaitUntilMapped();
+
+        // Click in a known location where the text is
+        status.test->clickMouseButton(20, 18, 1, 0);
+    }
+
+    if (g_str_equal(key, "clicked"))
+        status.clicked = TRUE;
+
+    if (g_str_equal(key, "finish")) {
+        status.test = 0;
+        status.testRunner->finishTest(status.loaded && status.clicked);
+    }
+}
+
+static void dispatchEventNotifyCallback(const gchar *key, const gchar *value, gconstpointer)
+{
+    if (g_str_equal(key, "ready")) {
+        // The document was already loaded in the webprocess, and its "load"
+        // signal couldn't be captured on time (was issued before the test
+        // started). We load it again to force a new "load" signal in the
+        // webprocess, which will be captured this time
+        status.test->loadHtml(HTML_DOCUMENT, 0);
+    }
+
+    if (g_str_equal(key, "loaded"))
+        status.loaded = TRUE;
+
+    if (g_str_equal(key, "clicked"))
+        status.clicked = TRUE;
+
+    if (g_str_equal(key, "finish")) {
+        status.test = 0;
+        status.testRunner->finishTest(status.loaded && status.clicked);
+    }
+}
+
+static void testWebKitDOMDOMWindowSignals(WebViewTest* test, gconstpointer)
+{
+    status.loaded = FALSE;
+    status.clicked = FALSE;
+    status.test = test;
+
+    status.testRunner->setNotifyCallback(G_CALLBACK(signalsNotifyCallback), 0);
+
+    // The HTML document will we loaded later, when the test is "ready" because
+    // we want to test the "load" signal
+
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add(&builder, "{sv}", "pageID", g_variant_new_uint64(webkit_web_view_get_page_id(status.test->m_webView)));
+    status.testRunner->runTestAndWait("WebKitDOMDOMWindow", "signals", g_variant_builder_end(&builder));
+    g_assert(status.testRunner->getTestResult());
+}
+
+static void testWebKitDOMDOMWindowDispatchEvent(WebViewTest* test, gconstpointer)
+{
+    status.loaded = FALSE;
+    status.clicked = FALSE;
+    status.test = test;
+
+    status.testRunner->setNotifyCallback(G_CALLBACK(dispatchEventNotifyCallback), 0);
+
+    // The HTML document will we loaded later, when the test is "ready" because
+    // we want to test the "load" signal
+
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add(&builder, "{sv}", "pageID", g_variant_new_uint64(webkit_web_view_get_page_id(status.test->m_webView)));
+    status.testRunner->runTestAndWait("WebKitDOMDOMWindow", "dispatch-event", g_variant_builder_end(&builder));
+    g_assert(status.testRunner->getTestResult());
+}
+
+static void testWebKitDOMDOMWindowGetComputedStyle(WebViewTest* test, gconstpointer)
+{
+    status.loaded = FALSE;
+    status.clicked = FALSE;
+    status.test = test;
+
+    static const char* testHTML = HTML_DOCUMENT;
+    status.test->loadHtml(testHTML, 0);
+    status.test->waitUntilLoadFinished();
+
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add(&builder, "{sv}", "pageID", g_variant_new_uint64(webkit_web_view_get_page_id(status.test->m_webView)));
+    g_assert(status.testRunner->runTest("WebKitDOMDOMWindow", "get-computed-style", g_variant_builder_end(&builder)));
+}
+
+void beforeAll()
+{
+    status.testRunner = new WebProcessTestRunner();
+    webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(), WEBKIT_TEST_WEB_EXTENSIONS_DIR);
+
+    WebViewTest::add("WebKitDOMDOMWindow", "signals", testWebKitDOMDOMWindowSignals);
+    WebViewTest::add("WebKitDOMDOMWindow", "dispatch-event", testWebKitDOMDOMWindowDispatchEvent);
+    WebViewTest::add("WebKitDOMDOMWindow", "get-computed-style", testWebKitDOMDOMWindowGetComputedStyle);
+}
+
+void afterAll()
+{
+    delete status.testRunner;
+}
@@ -79,7 +79,7 @@ static void startTestServerMonitor()
 static void startTestServer()
 {
     // Prepare argv[] for spawning the server process.
-    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", gTestServerAppName, NULL));
+    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", gTestServerAppName, NULL));
 
     // We install a handler to ensure that we kill the child process
     // if the parent dies because of whatever the reason is.
@@ -120,7 +120,7 @@ public:
     }
 
     GRefPtr<WebKitPrintOperation> m_printOperation;
-    unsigned int m_expectedError;
+    unsigned m_expectedError;
 };
 
 static void testPrintOperationPrint(PrintTest* test, gconstpointer)
@@ -146,8 +146,9 @@ static void testPrintOperationPrint(PrintTest* test, gconstpointer)
     webkit_print_operation_print(test->m_printOperation.get());
     test->waitUntilPrintFinished();
 
-    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                                              static_cast<GFileQueryInfoFlags>(0), 0, 0));
+    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(),
+        G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+        static_cast<GFileQueryInfoFlags>(0), 0, 0));
     g_assert(fileInfo.get());
     g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);
     g_assert_cmpstr(g_file_info_get_content_type(fileInfo.get()), ==, "application/pdf");
@@ -256,7 +256,7 @@ public:
         : ResourcesTest()
         , m_resourceDataReceived(0)
     {
-         m_resourcesToLoad = 2;
+        m_resourcesToLoad = 2;
     }
 
     void resourceLoadStarted(WebKitWebResource* resource, WebKitURIRequest* request)
@@ -135,7 +135,7 @@ static void testWebExtensionIsolatedWorld(WebViewTest* test, gconstpointer)
     GOwnPtr<char> result;
     gulong scriptDialogID = g_signal_connect(test->m_webView, "script-dialog", G_CALLBACK(scriptDialogCallback), &result.outPtr());
 
-    static const char *mainWorldScript =
+    static const charmainWorldScript =
         "top.foo = 'Foo';\n"
         "document.getElementById('console').innerHTML = top.foo;\n"
         "window.open = function () { alert('Main World'); }\n"
@@ -149,7 +149,7 @@ static void testWebExtensionIsolatedWorld(WebViewTest* test, gconstpointer)
     GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
     g_assert_cmpstr(valueString.get(), ==, "Foo");
 
-    static const char *isolatedWorldScript =
+    static const charisolatedWorldScript =
         "document.getElementById('console').innerHTML = top.foo;\n"
         "window.open = function () { alert('Isolated World'); }\n"
         "document.open(1, 2, 3);";
@@ -87,7 +87,7 @@ static void startTestServerMonitor()
 static void startTestServer()
 {
     // Prepare argv[] for spawning the server process.
-    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "WebKit2GObjectAPITests", kTestServerAppName, NULL));
+    GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", kTestServerAppName, NULL));
 
     char* testServerArgv[2];
     testServerArgv[0] = testServerPath.get();
@@ -96,8 +96,7 @@ static void startTestServer()
     // Spawn the server, getting its stdout file descriptor to set a
     // communication channel, so we know when it's ready.
     int childStdout = 0;
-    if (!g_spawn_async_with_pipes(0, testServerArgv, 0, static_cast<GSpawnFlags>(0), 0, 0,
-                                  &kChildProcessPid, 0, &childStdout, 0, 0)) {
+    if (!g_spawn_async_with_pipes(0, testServerArgv, 0, static_cast<GSpawnFlags>(0), 0, 0, &kChildProcessPid, 0, &childStdout, 0, 0)) {
         close(childStdout);
         return;
     }
@@ -278,10 +278,11 @@ static void testWebKitSettings(Test*, gconstpointer)
 
 void testWebKitSettingsNewWithSettings(Test* test, gconstpointer)
 {
-    GRefPtr<WebKitSettings> settings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE,
-                                                                                   "auto-load-images", FALSE,
-                                                                                   "load-icons-ignoring-image-load-setting", TRUE,
-                                                                                   NULL));
+    GRefPtr<WebKitSettings> settings = adoptGRef(webkit_settings_new_with_settings(
+        "enable-javascript", FALSE,
+        "auto-load-images", FALSE,
+        "load-icons-ignoring-image-load-setting", TRUE,
+        nullptr));
     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(settings.get()));
     g_assert(!webkit_settings_get_enable_javascript(settings.get()));
     g_assert(!webkit_settings_get_auto_load_images(settings.get()));
@@ -400,10 +400,10 @@ static void testWebContextSecurityPolicy(SecurityPolicyTest* test, gconstpointer
     test->verifyThatSchemeMatchesPolicy("foo", SecurityPolicyTest::Local | SecurityPolicyTest::NoAccess | SecurityPolicyTest::DisplayIsolated | SecurityPolicyTest::Secure);
     webkit_security_manager_register_uri_scheme_as_cors_enabled(test->m_manager, "foo");
     test->verifyThatSchemeMatchesPolicy("foo", SecurityPolicyTest::Local | SecurityPolicyTest::NoAccess | SecurityPolicyTest::DisplayIsolated | SecurityPolicyTest::Secure
-                | SecurityPolicyTest::CORSEnabled);
+        | SecurityPolicyTest::CORSEnabled);
     webkit_security_manager_register_uri_scheme_as_empty_document(test->m_manager, "foo");
     test->verifyThatSchemeMatchesPolicy("foo", SecurityPolicyTest::Local | SecurityPolicyTest::NoAccess | SecurityPolicyTest::DisplayIsolated | SecurityPolicyTest::Secure
-                | SecurityPolicyTest::CORSEnabled | SecurityPolicyTest::EmptyDocument);
+        | SecurityPolicyTest::CORSEnabled | SecurityPolicyTest::EmptyDocument);
 }
 
 void beforeAll()
@@ -386,14 +386,14 @@ public:
 static void testWebViewSave(SaveWebViewTest* test, gconstpointer)
 {
     test->loadHtml("<html>"
-                   "<body>"
-                   "  <p>A paragraph with plain text</p>"
-                   "  <p>"
-                   "    A red box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMVwnSZnwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12P8z8DAwMDAxMDAwMDAAAANHQEDK+mmyAAAAABJRU5ErkJggg=='></br>"
-                   "    A blue box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMvBHhALQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12Nk4PnPwMDAxMDAwMDAAAALrwEPPIs1pgAAAABJRU5ErkJggg=='>"
-                   "  </p>"
-                   "</body>"
-                   "</html>", 0);
+        "<body>"
+        "  <p>A paragraph with plain text</p>"
+        "  <p>"
+        "    A red box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMVwnSZnwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12P8z8DAwMDAxMDAwMDAAAANHQEDK+mmyAAAAABJRU5ErkJggg=='></br>"
+        "    A blue box: <img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AYWDTMvBHhALQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFklEQVQI12Nk4PnPwMDAxMDAwMDAAAALrwEPPIs1pgAAAABJRU5ErkJggg=='>"
+        "  </p>"
+        "</body>"
+        "</html>", 0);
     test->waitUntilLoadFinished();
 
     // Write to a file and to an input stream.
@@ -81,7 +81,7 @@ static void testWebViewGroupSettings(Test* test, gconstpointer)
 {
     GRefPtr<WebKitWebViewGroup> viewGroup1 = adoptGRef(webkit_web_view_group_new("TestGroup1"));
     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(viewGroup1.get()));
-    GRefPtr<WebKitSettings> newSettings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE, NULL));
+    GRefPtr<WebKitSettings> newSettings = adoptGRef(webkit_settings_new_with_settings("enable-javascript", FALSE, nullptr));
     test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(newSettings.get()));
     webkit_web_view_group_set_settings(viewGroup1.get(), newSettings.get());
     g_assert(webkit_web_view_group_get_settings(viewGroup1.get()) == newSettings.get());
@@ -25,8 +25,8 @@ class EditorTest: public WebViewTest {
 public:
     MAKE_GLIB_TEST_FIXTURE(EditorTest);
 
-    static const unsigned int kClipboardWaitTimeout = 50;
-    static const unsigned int kClipboardWaitMaxTries = 2;
+    static const unsigned kClipboardWaitTimeout = 50;
+    static const unsigned kClipboardWaitMaxTries = 2;
 
     EditorTest()
         : m_clipboard(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD))
@@ -210,9 +210,8 @@ static void methodCallCallback(GDBusConnection* connection, const char* sender,
         JSRetainPtr<JSStringRef> jsScript(Adopt, JSStringCreateWithUTF8CString(script));
         JSEvaluateScript(jsContext, jsScript.get(), 0, 0, 0, 0);
         g_dbus_method_invocation_return_value(invocation, 0);
-    } else if (!g_strcmp0(methodName, "AbortProcess")) {
+    } else if (!g_strcmp0(methodName, "AbortProcess"))
         abort();
-    }
 }
 
 static const GDBusInterfaceVTable interfaceVirtualTable = {
@@ -221,7 +220,7 @@ static const GDBusInterfaceVTable interfaceVirtualTable = {
 
 static void busAcquiredCallback(GDBusConnection* connection, const char* name, gpointer userData)
 {
-    static GDBusNodeInfo *introspectionData = 0;
+    static GDBusNodeInfointrospectionData = 0;
     if (!introspectionData)
         introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
 
@@ -76,7 +76,7 @@ static const GDBusInterfaceVTable interfaceVirtualTable = {
 
 static void busAcquiredCallback(GDBusConnection* connection, const char* name, gpointer userData)
 {
-    static GDBusNodeInfo *introspectionData = 0;
+    static GDBusNodeInfointrospectionData = 0;
     if (!introspectionData)
         introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
 
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/webkit/webkit2gtk/tests/">
-    <file alias="link-title.js">Source/WebKit2/UIProcess/API/gtk/tests/resources/link-title.js</file>
+    <file alias="link-title.js">Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js</file>
   </gresource>
 </gresources>
similarity index 98%
rename from Source/WebKit/gtk/tests/CMakeLists.txt
rename to Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt
index 951a99f..bfbfed8 100644 (file)
@@ -24,7 +24,7 @@ macro(ADD_WK1_TEST test_name)
         ${LIBSOUP_LIBRARIES}
     )
     set_target_properties(${test_name} PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit1GObjectAPITests
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/WebKitGtk
     )
 endmacro()
 
@@ -246,7 +246,7 @@ int main(int argc, char **argv)
     gtk_test_init(&argc, &argv, NULL);
 
     /* This hopefully makes the test independent of the path it's called from. */
-    testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
+    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
 
     SoupServer *server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
     soup_server_run_async(server);
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
     gtk_test_init(&argc, &argv, NULL);
 
     /* Hopefully make test independent of the path it's called from. */
-    testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
+    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
 
     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
     soup_server_run_async(server);
similarity index 99%
rename from Source/WebKit/gtk/tests/testwebview.c
rename to Tools/TestWebKitAPI/Tests/WebKitGtk/testwebview.c
index 170372c..64d92a2 100644 (file)
@@ -716,7 +716,7 @@ int main(int argc, char** argv)
     gtk_test_init(&argc, &argv, NULL);
 
     /* Hopefully make test independent of the path it's called from. */
-    testutils_relative_chdir("Source/WebKit/gtk/tests/resources/test.html", argv[0]);
+    testutils_relative_chdir("Tools/TestWebKitAPI/Tests/WebKitGtk/resources/test.html", argv[0]);
 
     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
     soup_server_run_async(server);
@@ -30,7 +30,7 @@ void afterAll();
 
 static void registerGResource(void)
 {
-    GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "resources", "webkit2gtk-tests-resources.gresource", NULL));
+    GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", NULL));
     GResource* resource = g_resource_load(resourcesPath.get(), 0);
     g_assert(resource);
 
     }
 
 #define ASSERT_CMP_CSTRING(s1, cmp, s2) \
-    do { CString __s1 = (s1); CString __s2 = (s2); \
-        if (g_strcmp0(__s1.data(), __s2.data()) cmp 0) ; else \
-            g_assertion_message_cmpstr(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
-                #s1 " " #cmp " " #s2, __s1.data(), #cmp, __s2.data()); } while (0)
+    do {                                                                 \
+        CString __s1 = (s1);                                             \
+        CString __s2 = (s2);                                             \
+        if (g_strcmp0(__s1.data(), __s2.data()) cmp 0) ;                 \
+        else                                                             \
+            g_assertion_message_cmpstr(G_LOG_DOMAIN, __FILE__, __LINE__, \
+                G_STRFUNC, #s1 " " #cmp " " #s2, __s1.data(), #cmp, __s2.data()); \
+    } while (0)
+
 
 class Test {
 public:
@@ -78,13 +83,13 @@ public:
 
     static CString getWebKit1TestResoucesDir()
     {
-        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit", "gtk", "tests", "resources", NULL));
+        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKitGtk", "resources", NULL));
         return resourcesDir.get();
     }
 
     static CString getResourcesDir()
     {
-        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit2", "UIProcess", "API", "gtk", "tests", "resources", NULL));
+        GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit2Gtk", "resources", NULL));
         return resourcesDir.get();
     }
 
@@ -37,8 +37,8 @@ WebKitTestServer::WebKitTestServer(ServerType type)
     soup_address_resolve_sync(address.get(), 0);
 
     m_soupServer = adoptGRef(soup_server_new(SOUP_SERVER_INTERFACE, address.get(),
-                                             SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
-                                             SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), NULL));
+        SOUP_SERVER_SSL_CERT_FILE, sslCertificateFile.get(),
+        SOUP_SERVER_SSL_KEY_FILE, sslKeyFile.get(), nullptr));
     m_baseURI = type == ServerHTTPS ? soup_uri_new("https://127.0.0.1/") : soup_uri_new("http://127.0.0.1/");
     soup_uri_set_port(m_baseURI, soup_server_get_port(m_soupServer.get()));
 }
@@ -33,7 +33,7 @@ public:
         ServerHTTPS
     };
 
-    WebKitTestServer(ServerType type = ServerHTTP);
+    WebKitTestServer(ServerType = ServerHTTP);
     virtual ~WebKitTestServer();
 
     SoupURI* baseURI() { return m_baseURI; }
@@ -242,7 +242,7 @@ const char* WebViewTest::mainResourceData(size_t& mainResourceDataSize)
     return m_resourceData.get();
 }
 
-void WebViewTest::mouseMoveTo(int x, int y, unsigned int mouseModifiers)
+void WebViewTest::mouseMoveTo(int x, int y, unsigned mouseModifiers)
 {
     g_assert(m_parentWindow);
     GtkWidget* viewWidget = GTK_WIDGET(m_webView);
@@ -266,13 +266,13 @@ void WebViewTest::mouseMoveTo(int x, int y, unsigned int mouseModifiers)
     gtk_main_do_event(event.get());
 }
 
-void WebViewTest::clickMouseButton(int x, int y, unsigned int button, unsigned int mouseModifiers)
+void WebViewTest::clickMouseButton(int x, int y, unsigned button, unsigned mouseModifiers)
 {
     doMouseButtonEvent(GDK_BUTTON_PRESS, x, y, button, mouseModifiers);
     doMouseButtonEvent(GDK_BUTTON_RELEASE, x, y, button, mouseModifiers);
 }
 
-void WebViewTest::keyStroke(unsigned int keyVal, unsigned int keyModifiers)
+void WebViewTest::keyStroke(unsigned keyVal, unsigned keyModifiers)
 {
     g_assert(m_parentWindow);
     GtkWidget* viewWidget = GTK_WIDGET(m_webView);
@@ -298,7 +298,7 @@ void WebViewTest::keyStroke(unsigned int keyVal, unsigned int keyModifiers)
     gtk_main_do_event(event.get());
 }
 
-void WebViewTest::doMouseButtonEvent(GdkEventType eventType, int x, int y, unsigned int button, unsigned int mouseModifiers)
+void WebViewTest::doMouseButtonEvent(GdkEventType eventType, int x, int y, unsigned button, unsigned mouseModifiers)
 {
     g_assert(m_parentWindow);
     GtkWidget* viewWidget = GTK_WIDGET(m_webView);
@@ -52,9 +52,9 @@ public:
     void selectAll();
     const char* mainResourceData(size_t& mainResourceDataSize);
 
-    void mouseMoveTo(int x, int y, unsigned int mouseModifiers = 0);
-    void clickMouseButton(int x, int y, unsigned int button = 1, unsigned int mouseModifiers = 0);
-    void keyStroke(unsigned int keyVal, unsigned int keyModifiers = 0);
+    void mouseMoveTo(int x, int y, unsigned mouseModifiers = 0);
+    void clickMouseButton(int x, int y, unsigned button = 1, unsigned mouseModifiers = 0);
+    void keyStroke(unsigned keyVal, unsigned keyModifiers = 0);
 
     WebKitJavascriptResult* runJavaScriptAndWaitUntilFinished(const char* javascript, GError**);
     WebKitJavascriptResult* runJavaScriptFromGResourceAndWaitUntilFinished(const char* resource, GError**);
@@ -80,7 +80,7 @@ public:
     cairo_surface_t* m_surface;
 
 private:
-    void doMouseButtonEvent(GdkEventType, int, int, unsigned int, unsigned int);
+    void doMouseButtonEvent(GdkEventType, int, int, unsigned, unsigned);
 };
 
 #endif // WebViewTest_h