diff options
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp index 6d4783c..e3c6b20 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp @@ -25,20 +25,13 @@ #include "Test.h" +#include "JavaScriptTest.h" #include "PlatformUtilities.h" #include "PlatformWebView.h" #include <WebKit2/WKRetainPtr.h> namespace TestWebKitAPI { -struct JavaScriptCallbackContext { - JavaScriptCallbackContext(const char* expectedString) : didFinish(false), expectedString(expectedString), didMatchExpectedString(false) { } - - bool didFinish; - const char* expectedString; - bool didMatchExpectedString; -}; - static bool didFinishLoad; static bool didNotHandleKeyDownEvent; @@ -53,29 +46,6 @@ static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, cons didNotHandleKeyDownEvent = true; } -static void javaScriptCallback(WKStringRef string, WKErrorRef error, void* ctx) -{ - JavaScriptCallbackContext* context = static_cast<JavaScriptCallbackContext*>(ctx); - - context->didFinish = true; - context->didMatchExpectedString = WKStringIsEqualToUTF8CString(string, context->expectedString); - - TEST_ASSERT(!error); -} - -static WKRetainPtr<WKStringRef> wk(const char* utf8String) -{ - return WKRetainPtr<WKStringRef>(AdoptWK, WKStringCreateWithUTF8CString(utf8String)); -} - -static bool runJSTest(WKPageRef page, const char* script, const char* expectedResult) -{ - JavaScriptCallbackContext context(expectedResult); - WKPageRunJavaScriptInMainFrame(page, wk(script).get(), &context, javaScriptCallback); - Util::run(&context.didFinish); - return context.didMatchExpectedString; -} - TEST(WebKit2, SpacebarScrolling) { WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate()); |