Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 12 insertions, 36 deletions

diff --git a/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.h b/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.h
index ec7513297..0e22351cb 100644
--- a/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.h
+++ b/Source/WebKit/efl/tests/UnitTestUtils/EWKTestBase.h
@@ -19,49 +19,25 @@
 #ifndef EWKTestBase_h
 #define EWKTestBase_h
 
-#include <Evas.h>
+#include "EWKTestConfig.h"
+#include "EWKTestView.h"
 #include <gtest/gtest.h>
 
-#define RUN_TEST(args...)   \
-    do {    \
-        ASSERT_EQ(true, EWKTestBase::runTest(args));    \
-    } while (0)
-
-#define START_TEST()    \
-    do {    \
-        EWKTestBase::startTest();   \
-    } while (0)
-
-#define END_TEST()    \
-    do {    \
-        EWKTestBase::endTest(); \
-    } while (0)
-
-#define EFL_INIT_RET()  \
-    do {    \
-        if (!EWKTestBase::init())   \
-            return false;    \
-    } while (0)
-
-#define EFL_INIT()  \
-    do {    \
-        EWKTestBase::init();    \
-    } while (0)
-
 namespace EWKUnitTests {
 
-class EWKTestBase {
-    static bool createTest(const char* url, void (*event_callback)(void*, Evas_Object*, void*), const char* event_name, void* event_data);
+class EWKTestBase: public ::testing::Test {
 public:
-    static bool init();
-    static void shutdownAll();
-    static void startTest();
-    static void endTest();
+    static void onLoadFinished(void* data, Evas_Object* webView, void* eventInfo);
+
+    Evas_Object* webView();
+    virtual void SetUp();
+protected:
+    EWKTestBase();
 
-    static bool runTest(const char* url, void (*event_callback)(void*, Evas_Object*, void*), const char* event_name = "load,finished", void* event_data = 0);
-    static bool runTest(void (*event_callback)(void*, Evas_Object*, void*), const char* event_name = "load,finished", void* event_data = 0);
+    void loadUrl(const char* url = Config::defaultTestPage);
+    void waitUntilLoadFinished();
 
-    static int useX11Window;
+    EWKTestView m_ewkTestView;
 };
 
 }