From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 4 Nov 2010 12:00:17 -0700 Subject: Merge Webkit at r70949: Initial merge by git. Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e --- WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp') diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp index a0b4058..c3af543 100644 --- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp @@ -52,8 +52,13 @@ static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WK State* state = reinterpret_cast(const_cast(clientInfo)); TEST_ASSERT(state->didDecidePolicyForNavigationAction); TEST_ASSERT(!state->didCommitLoadForFrame); + + // The commited URL should be null. + TEST_ASSERT(!WKFrameCopyURL(frame)); + TEST_ASSERT(!state->didStartProvisionalLoadForFrame); + state->didStartProvisionalLoadForFrame = true; } @@ -63,6 +68,9 @@ static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us TEST_ASSERT(state->didDecidePolicyForNavigationAction); TEST_ASSERT(state->didStartProvisionalLoadForFrame); + // The provisional URL should be null. + TEST_ASSERT(!WKFrameCopyProvisionalURL(frame)); + state->didCommitLoadForFrame = true; } @@ -73,6 +81,9 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us TEST_ASSERT(state->didStartProvisionalLoadForFrame); TEST_ASSERT(state->didCommitLoadForFrame); + // The provisional URL should be null. + TEST_ASSERT(!WKFrameCopyProvisionalURL(frame)); + test1Done = true; } -- cgit v1.1