Rename WebKit2 API tests after directory rename
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 22:56:15 +0000 (22:56 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Sep 2017 22:56:15 +0000 (22:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=176250

Reviewed by Tim Horton.

* TestWebKitAPI/Tests/Lots of files...
Renamed WebKit2 to WebKit and WebKit1 to WebKitLegacy.

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

193 files changed:
Tools/ChangeLog
Tools/Scripts/run-api-tests
Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm
Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit/CanHandleRequest.cpp
Tools/TestWebKitAPI/Tests/WebKit/CloseFromWithinCreatePage.cpp
Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp
Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp
Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionNoCache.cpp
Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm
Tools/TestWebKitAPI/Tests/WebKit/DidAssociateFormControls.cpp
Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp
Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp
Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/EnumerateMediaDevices.cpp
Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp
Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit/EvaluateJavaScript.cpp
Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp
Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit/Find.cpp
Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm
Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp
Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp
Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp
Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp
Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp
Tools/TestWebKitAPI/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit/GetUserMediaNavigation.mm
Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp
Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleFrameHitTest.cpp
Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp
Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp
Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp
Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/MediaStreamTrackDetached.mm
Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp
Tools/TestWebKitAPI/Tests/WebKit/ModalAlertsSPI.cpp
Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/NavigationClientDefaultCrypto.cpp
Tools/TestWebKitAPI/Tests/WebKit/NetworkProcessCrashWithPendingConnection.mm
Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp
Tools/TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit/ParentFrame.cpp
Tools/TestWebKitAPI/Tests/WebKit/PasteboardNotifications.mm
Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp
Tools/TestWebKitAPI/Tests/WebKit/PreventEmptyUserAgent.cpp
Tools/TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp
Tools/TestWebKitAPI/Tests/WebKit/ProcessDidTerminate.cpp
Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp
Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/ResponsivenessTimer.cpp
Tools/TestWebKitAPI/Tests/WebKit/ResponsivenessTimerDoesntFireEarly.cpp
Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp
Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateWithoutNavigation.cpp
Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp
Tools/TestWebKitAPI/Tests/WebKit/ShouldGoToBackForwardListItem.cpp
Tools/TestWebKitAPI/Tests/WebKit/ShouldKeepCurrentBackForwardListItemInList.cpp
Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp
Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp
Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp
Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp
Tools/TestWebKitAPI/Tests/WebKit/ViewportSizeForViewportUnits.mm
Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKImageCreateCGImageCrash.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKRetainPtr.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKString.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKStringJSString.cpp
Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm
Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp
Tools/TestWebKitAPI/Tests/WebKit/WebCoreStatisticsWithNoWebProcess.cpp
Tools/TestWebKitAPI/Tests/WebKit/WillSendSubmitEvent.cpp
Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm
Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm
Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm
Tools/TestWebKitAPI/Tests/WebKit/mac/GetBackingScaleFactor.mm
Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp
Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp
Tools/TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/AdditionalReadAccessAllowedURLs.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/AlwaysRevalidatedURLSchemes.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/AnimatedResize.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleEditingDelegate.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleParameters.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleRangeHandle.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/CookieAcceptPolicy.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/DoAfterNextPresentationUpdateAfterCrash.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/FixedLayoutSize.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/Geolocation.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadDataWithNilMIMEType.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/ModalAlerts.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/NSFileManagerExtras.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/ObservedRenderingProgressEventsAfterCrash.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/Preferences.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/RenderedImageWithOptions.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/RunOpenPanel.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/ShouldOpenExternalURLsInNewWindowActions.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/ShrinkToFit.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/VisibleContentRect.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentViewEditingActions.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentViewTargetForAction.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSNumber.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKObject.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFViewResizeCrash.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFViewStablePresentationUpdateCallback.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WebGLPolicy.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm
Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm
Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm
Tools/TestWebKitAPI/Tests/WebKitObjC/PreventImageLoadWithAutoResizing.mm
Tools/TestWebKitAPI/Tests/ios/MemoryCacheAddImageToCacheIOS.mm
Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm
Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm
Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm
Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm
Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm
Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm
Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm
Tools/TestWebKitAPI/Tests/mac/DOMHTMLVideoElementWrapper.mm
Tools/TestWebKitAPI/Tests/mac/DOMNode.mm
Tools/TestWebKitAPI/Tests/mac/DOMNodeFromJSObject.mm
Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm
Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm
Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm
Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm
Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm
Tools/TestWebKitAPI/Tests/mac/FirstResponderSuppression.mm
Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm
Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm
Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm
Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm
Tools/TestWebKitAPI/Tests/mac/IsNavigationActionTrusted.mm
Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm
Tools/TestWebKitAPI/Tests/mac/LimitTitleSize.mm
Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm
Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm
Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm
Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm
Tools/TestWebKitAPI/Tests/mac/MemoryPressureHandler.mm
Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm
Tools/TestWebKitAPI/Tests/mac/NavigatorLanguage.mm
Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm
Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm
Tools/TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm
Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm
Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm
Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm
Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm
Tools/TestWebKitAPI/Tests/mac/StringByEvaluatingJavaScriptFromString.mm
Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm
Tools/TestWebKitAPI/Tests/mac/SubresourceErrorCrash.mm
Tools/TestWebKitAPI/Tests/mac/TypingStyleCrash.mm
Tools/TestWebKitAPI/Tests/mac/WebScriptObjectDescription.mm
Tools/TestWebKitAPI/Tests/mac/WebViewCanPasteURL.mm
Tools/TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm
Tools/TestWebKitAPI/Tests/mac/WebViewCloseInsideDidFinishLoadForFrame.mm
Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm
Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm
Tools/TestWebKitAPI/Tests/mac/WebViewIconLoading.mm
Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm
Tools/TestWebKitAPI/Tests/mac/WillSendSubmitEvent.mm
Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm
Tools/TestWebKitAPI/Tests/mac/WordBoundaryTypingAttributes.mm

index a210a2122a3f7db49b4ff0e4caa8418759734746..f2425438d8b7cc2836680ed8b9e33bec151771f7 100644 (file)
@@ -1,3 +1,13 @@
+2017-09-01  Alex Christensen  <achristensen@webkit.org>
+
+        Rename WebKit2 API tests after directory rename
+        https://bugs.webkit.org/show_bug.cgi?id=176250
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/Lots of files...
+        Renamed WebKit2 to WebKit and WebKit1 to WebKitLegacy.
+
 2017-09-01  Alex Christensen  <achristensen@webkit.org>
 
         Add WKUIDelegatePrivate equivalent of WKPageUIClient's toolbarsAreVisible
index 2e818c1a2e2ff03d957057f4112b98a7f176d434..7fe503bed69fbf8af0b59412a2e7ea3af96c7fbd 100755 (executable)
@@ -90,10 +90,10 @@ Platform options:
 Examples
 
 The following command will run a single test:
-    $programName WebKit2.AboutBlank
+    $programName WebKit.AboutBlank
 
-The following command will run all tests in suites that begin with 'WebKit2':
-    $programName WebKit2
+The following command will run all tests in suites that begin with 'WebKit':
+    $programName WebKit
 
 EOF
 
@@ -327,8 +327,6 @@ sub listAllTests()
            if ($line =~ m/\.$/) {
               $suite = $line; # "SuiteName."
            } else {
-              # Disabling WebKit2 API test on Windows since we will be disabling WebKit2 on Windows.
-              next if (isAppleWinWebKit() && $suite =~ m/WebKit2*/);       
               $line =~ s/^\s*//; # "TestName"
               my $fullName = $suite . $line; # "SuiteName.TestName";
               push @tests, $fullName;
index 5dd085159b1cb8846dd192e3c140111cc6fb4700..a43dd76604dbb4b62eb75ae699e8ce7652642888 100644 (file)
@@ -105,7 +105,7 @@ static void testAFewStrings(Vector<Vector<UInt16>> testStrings)
 }
 
 // Split up the tests because they take too long otherwise and people start thinking their computer is hung.
-TEST(WebKit2, LineBreaking1)
+TEST(WebKit, LineBreaking1)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x0024, 0x31, 0x32, 0x33},
@@ -117,7 +117,7 @@ TEST(WebKit2, LineBreaking1)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking2)
+TEST(WebKit, LineBreaking2)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x2025, 0x2025},
@@ -129,7 +129,7 @@ TEST(WebKit2, LineBreaking2)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking3)
+TEST(WebKit, LineBreaking3)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x0025},
@@ -141,7 +141,7 @@ TEST(WebKit2, LineBreaking3)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking4)
+TEST(WebKit, LineBreaking4)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x00b0},
@@ -153,7 +153,7 @@ TEST(WebKit2, LineBreaking4)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking5)
+TEST(WebKit, LineBreaking5)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x2033},
@@ -165,7 +165,7 @@ TEST(WebKit2, LineBreaking5)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking6)
+TEST(WebKit, LineBreaking6)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x2103},
@@ -177,7 +177,7 @@ TEST(WebKit2, LineBreaking6)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking7)
+TEST(WebKit, LineBreaking7)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x3043},
@@ -189,7 +189,7 @@ TEST(WebKit2, LineBreaking7)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking8)
+TEST(WebKit, LineBreaking8)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x3083},
@@ -201,7 +201,7 @@ TEST(WebKit2, LineBreaking8)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking9)
+TEST(WebKit, LineBreaking9)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x3096},
@@ -213,7 +213,7 @@ TEST(WebKit2, LineBreaking9)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking10)
+TEST(WebKit, LineBreaking10)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x30a3},
@@ -225,7 +225,7 @@ TEST(WebKit2, LineBreaking10)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking11)
+TEST(WebKit, LineBreaking11)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x30e3},
@@ -237,7 +237,7 @@ TEST(WebKit2, LineBreaking11)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking12)
+TEST(WebKit, LineBreaking12)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x30f6},
@@ -249,7 +249,7 @@ TEST(WebKit2, LineBreaking12)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking13)
+TEST(WebKit, LineBreaking13)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x31f0},
@@ -261,7 +261,7 @@ TEST(WebKit2, LineBreaking13)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking14)
+TEST(WebKit, LineBreaking14)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x31f5},
@@ -273,7 +273,7 @@ TEST(WebKit2, LineBreaking14)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking15)
+TEST(WebKit, LineBreaking15)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x31fa},
@@ -285,7 +285,7 @@ TEST(WebKit2, LineBreaking15)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking16)
+TEST(WebKit, LineBreaking16)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0x31ff},
@@ -297,7 +297,7 @@ TEST(WebKit2, LineBreaking16)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking17)
+TEST(WebKit, LineBreaking17)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0xff1f},
@@ -309,7 +309,7 @@ TEST(WebKit2, LineBreaking17)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking18)
+TEST(WebKit, LineBreaking18)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0xff6a},
@@ -321,7 +321,7 @@ TEST(WebKit2, LineBreaking18)
     testAFewStrings(testStrings);
 }
 
-TEST(WebKit2, LineBreaking19)
+TEST(WebKit, LineBreaking19)
 {
     Vector<Vector<UInt16>> testStrings = {
         {0x4e00, 0x4e8c, 0x4e09, 0x56db, 0xff6f},
index 5503edd9edb3c836342398d722679d3012be37a3..4687498ae980cc8131d56a60aaa8134843d347df 100644 (file)
@@ -41,7 +41,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     done = true;
 }
 
-TEST(WebKit2, AboutBlankLoad)
+TEST(WebKit, AboutBlankLoad)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
index a1d09f2cdff50a8ca459078b05504e811a8b29de..48aadafe6b122257d335361e226054c25416d093 100644 (file)
@@ -57,7 +57,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, CanHandleRequest)
+TEST(WebKit, CanHandleRequest)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("CanHandleRequestTest"));
     setInjectedBundleClient(context.get());
index fabfd2d807a992ce10c3f10312f775129d819ad8..c9bae9b64252f444ca439590d4d0e1622a4662e1 100644 (file)
@@ -61,7 +61,7 @@ static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef urlRequest, WKDic
     return openedWebView->page();
 }
 
-TEST(WebKit2, CloseFromWithinCreatePage)
+TEST(WebKit, CloseFromWithinCreatePage)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index 71239e4f00a56094eef6ca2c0c140f5c7b42df4d..fe0a4f11c84cd5b9296093bf56fe185a0eb86962 100644 (file)
@@ -42,7 +42,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
 // Test for https://webkit.org/b/115607
 // This tests that we don't crash when calling WKPageClose and WKPageTerminate.
 
-TEST(WebKit2, CloseThenTerminate)
+TEST(WebKit, CloseThenTerminate)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
index d231e0e751936f2ece643b20193ada2dbde3b5ca..36800345591f8361975b11f5c684ebf0201eed56 100644 (file)
@@ -70,7 +70,7 @@ static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     WKCookieManagerGetHTTPCookieAcceptPolicy(cookieManager, reinterpret_cast<void*>(0x1234578), didGetUserHTTPCookieAcceptPolicy);
 }
 
-TEST(WebKit2, CookieManager)
+TEST(WebKit, CookieManager)
 {
     wkContext.adopt(WKContextCreate());
     PlatformWebView webView(wkContext.get());
index c336652ac663d84abff4945901c3336faa1c201f..eae01b087ad8b7d128354caf9301e08883dff662 100644 (file)
@@ -80,7 +80,7 @@ static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messag
         finished = true;
 }
 
-TEST(WebKit2, DISABLED_DOMWindowExtensionBasic)
+TEST(WebKit, DISABLED_DOMWindowExtensionBasic)
 {
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionBasicPageGroup"))); 
 
index 56a069fb9aa617ea98063e9df9e4bbd56e34454b..81add47f261a0d563a6c3719adb81ed5f3152882 100644 (file)
@@ -81,7 +81,7 @@ static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messag
       finished = true;
 }
 
-TEST(WebKit2, DISABLED_DOMWindowExtensionNoCache)
+TEST(WebKit, DISABLED_DOMWindowExtensionNoCache)
 {
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionNoCachePageGroup")));
 
index 49fa9549a9d80aff1c060651510bce865c78f89e..d4db0936d5eed772f1c6a4e880c9e89fdb68da83 100644 (file)
@@ -52,7 +52,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, DeferredViewInWindowStateChange)
+TEST(WebKit, DeferredViewInWindowStateChange)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("MouseMoveAfterCrashTest"));
 
index a930f534604107b00ce4aa739c41ac2948136bcb..b3e2c9750fa40a09c92abb4b4670a9a926283d1e 100644 (file)
@@ -75,7 +75,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, DidAssociateFormControls)
+TEST(WebKit, DidAssociateFormControls)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DidAssociateFormControlsTest"));
     setInjectedBundleClient(context.get());
index b5f4fb863594cd9befbb753298894fc603bf7675..5026171d170d183ab795d9e338ea786516e8beb9 100644 (file)
@@ -48,7 +48,7 @@ static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, cons
     didFinishTest = true;
 }
 
-TEST(WebKit2, DidNotHandleKeyDown)
+TEST(WebKit, DidNotHandleKeyDown)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
     PlatformWebView webView(context.get());
index 2a6f5da0a018090d973d19217925c3b644d6355b..5acc54ff885bc402427447adec62f620b988c470 100644 (file)
@@ -74,7 +74,7 @@ static void setInjectedBundleClient(WKPageRef page)
     WKPageSetPageInjectedBundleClient(page, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, DidRemoveFrameFromHiearchyInPageCache)
+TEST(WebKit, DidRemoveFrameFromHiearchyInPageCache)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DidRemoveFrameFromHiearchyInPageCache"));
     // Enable the page cache so we can test the WKBundlePageDidRemoveFrameFromHierarchyCallback API
index 21bca74dd4134b05b2c292274226e7dd8b615584..1505d45e9c03238302f86972ed1a7e5ff7fc1836 100644 (file)
@@ -46,7 +46,7 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef
     done = true;
 }
 
-TEST(WebKit2, DocumentStartUserScriptAlertCrashTest)
+TEST(WebKit, DocumentStartUserScriptAlertCrashTest)
 {
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DocumentStartUserScriptAlertCrashTestPageGroup"))); 
 
index eac36d87a99e1f3719e421c48e36adcb5a02742b..1192161b05e3e0bce68138b52ac4c5898b83001f 100644 (file)
@@ -69,7 +69,7 @@ static void setPagePolicyClient(WKPageRef page)
     WKPageSetPagePolicyClient(page, &policyClient.base);
 }
 
-TEST(WebKit2, DownloadDecideDestinationCrash)
+TEST(WebKit, DownloadDecideDestinationCrash)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     setContextDownloadClient(context.get());
index f92fb1e1b54c0884e68292a2b69a2d49943b39df..f10a68618c67948130a574ae99d9b58f7a0eab7d 100644 (file)
@@ -47,7 +47,7 @@ void checkUserMediaPermissionCallback(WKPageRef, WKFrameRef, WKSecurityOriginRef
     loadedSecondTime = true;
 }
 
-TEST(WebKit2, EnumerateDevices)
+TEST(WebKit, EnumerateDevices)
 {
     auto context = adoptWK(WKContextCreate());
 
index 0cabbd0fb05f9d4b7c423c9493f3bf3e798d39b7..e1de83265fbf71dc683e7f3c51b553cb377ca8a4 100644 (file)
@@ -42,7 +42,7 @@ static const char* strip(const char* input)
     return getenv(environmentVariable);
 }
 
-TEST(WebKit2, StripValuesEndingWithString)
+TEST(WebKit, StripValuesEndingWithString)
 {
     EXPECT_STREQ(strip(""), "");
     EXPECT_STREQ(strip(":"), ":");
index 64b666ab4e0b330ef2e264381392fd6a0d078318..5a06cfa54131eb298e387dc7d5370ae97db78cf9 100644 (file)
@@ -48,7 +48,7 @@ static void didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame,
     testDone = true;
 }
 
-TEST(WebKit2, EphemeralSessionPushStateNoHistoryCallback)
+TEST(WebKit, EphemeralSessionPushStateNoHistoryCallback)
 {
     auto configuration = adoptWK(WKPageConfigurationCreate());
 
index a6b5a4dd50e4ac2d99cbe701128f306e0c605164..21600fa8e2dd384d346cd78d6a51629e43ea7da7 100644 (file)
@@ -49,7 +49,7 @@ static void didRunJavaScript(WKSerializedScriptValueRef resultSerializedScriptVa
     testDone = true;
 }
 
-TEST(WebKit2, EvaluateJavaScriptThatThrowsAnException)
+TEST(WebKit, EvaluateJavaScriptThatThrowsAnException)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index d2cc644e1195acaa46722be9bfcedc17df88b5a6..a63055aba441762ff3d052d164ef716d4abf065e 100644 (file)
@@ -62,7 +62,7 @@ static void setClients(WKPageRef page)
     WKPageSetPageUIClient(page, &uiClient.base);
 }
 
-TEST(WebKit2, EventModifiers)
+TEST(WebKit, EventModifiers)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     
index c12b5366baf15f8bf71ac7508ee1e61bc3f3a090..b8983c4c41df2219d95ef107ddf964862c641681 100644 (file)
@@ -48,7 +48,7 @@ static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef f
     testDone = true;
 }
 
-TEST(WebKit2, FailedLoad)
+TEST(WebKit, FailedLoad)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 2e2189906d7d822841bcfeab4b96ed0a9f2d7c70..e7d1541218268176bfed465127fed1cc1f5f3301 100644 (file)
@@ -49,7 +49,7 @@ static void didCountStringMatches(WKPageRef page, WKStringRef string, unsigned n
     didCallCountStringMatches = true;
 }
 
-TEST(WebKit2, Find)
+TEST(WebKit, Find)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 88dc2d34a452bf79a81079b229d33d264d03e0d6..47c2e990824602c4b12056d094ee16dd5ed16b74 100644 (file)
@@ -115,7 +115,7 @@ static void didGetImageForMatchResult(WKPageRef page, WKImageRef image, uint32_t
     didCallGetImage = true;
 }
 
-TEST(WebKit2, FindMatches)
+TEST(WebKit, FindMatches)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 6cd63fab4a37ea55b5d58ca89f8c363b3391d9cb..bc7391bcb2e893b65c472dabb27c69d007bc1922 100644 (file)
@@ -49,7 +49,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     WKPageForceRepaint(page, 0, didForceRepaint);
 }
 
-TEST(WebKit2, ForceRepaint)
+TEST(WebKit, ForceRepaint)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 1e3281d8984968015240edaef2083822802e9a94..1273c10c6f5eff09083e52fcdba031a970061410 100644 (file)
@@ -43,7 +43,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     done = true;
 }
 
-TEST(WebKit2, FrameHandle)
+TEST(WebKit, FrameHandle)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 2c9c1133285783330d457ef42d6ece97e13ac56f..7a46799f7a72ddc9c231383297a5fd67b9fa8bd9 100644 (file)
@@ -56,7 +56,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     testDone = true;
 }
 
-TEST(WebKit2, FrameMIMETypeHTML)
+TEST(WebKit, FrameMIMETypeHTML)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index eb3bf38a3c0cc34c8f90cd0b1556d7612b208e34..efda12441c0788774d85c0f1aa3226b28f93d125 100644 (file)
@@ -55,7 +55,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     testDone = true;
 }
 
-TEST(WebKit2, FrameMIMETypePNG)
+TEST(WebKit, FrameMIMETypePNG)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 90fd37937b2e8ca918f0082e039a48f235ebb044..5ba21ba9189c478cbf589a7222d7361eb74e1d82 100644 (file)
@@ -154,7 +154,7 @@ struct GeolocationBasicStateTracker : GeolocationStateTracker {
     }
 };
 
-TEST(WebKit2, GeolocationBasic)
+TEST(WebKit, GeolocationBasic)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
@@ -195,7 +195,7 @@ struct GeolocationBasicWithHighAccuracyStateTracker : GeolocationStateTracker {
     }
 };
 
-TEST(WebKit2, GeolocationBasicWithHighAccuracy)
+TEST(WebKit, GeolocationBasicWithHighAccuracy)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
@@ -247,7 +247,7 @@ struct GeolocationTransitionToHighAccuracyStateTracker : GeolocationStateTracker
     }
 };
 
-TEST(WebKit2, GeolocationTransitionToHighAccuracy)
+TEST(WebKit, GeolocationTransitionToHighAccuracy)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     WKContextSetMaximumNumberOfProcesses(context.get(), 1);
@@ -312,7 +312,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     *static_cast<bool*>(const_cast<void*>(clientInfo)) = true;
 }
 
-TEST(WebKit2, GeolocationTransitionToLowAccuracy)
+TEST(WebKit, GeolocationTransitionToLowAccuracy)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     WKContextSetMaximumNumberOfProcesses(context.get(), 1);
index e3280a3b76f7a7e99cbee8d25600399872e579d9..22f5dfffba4669bbdf7d05904dd8789c7416447b 100644 (file)
@@ -46,7 +46,7 @@ static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef context, c
     return Util::createInitializationDictionaryForInjectedBundleTest("GetInjectedBundleInitializationUserDataCallbackTest",  Util::toWK("Extra initialization data").get());
 }
 
-TEST(WebKit2, GetInjectedBundleInitializationUserDataCallback)
+TEST(WebKit, GetInjectedBundleInitializationUserDataCallback)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
index 73f70628688be8eb0c38de7ff005cc2cd75b635f..421eea4292cbab14e946f798a35deb73f82b3508 100644 (file)
@@ -67,7 +67,7 @@ static bool shouldReleaseInEnumerate = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, NavigateDuringGetUserMediaPrompt)
+TEST(WebKit, NavigateDuringGetUserMediaPrompt)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto processPoolConfig = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
@@ -84,7 +84,7 @@ TEST(WebKit2, NavigateDuringGetUserMediaPrompt)
     TestWebKitAPI::Util::run(&okToProceed);
 }
 
-TEST(WebKit2, NavigateDuringDeviceEnumeration)
+TEST(WebKit, NavigateDuringDeviceEnumeration)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto processPoolConfig = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
index 1f4a3726c57ea1bd5dfd9bc7a9a9d2a687dc1b54..afafde64ca0045543ae9fdc1933f5da4648687eb 100644 (file)
@@ -71,7 +71,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, HitTestResultNodeHandle)
+TEST(WebKit, HitTestResultNodeHandle)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("HitTestResultNodeHandleTest"));
     
index a1d4046ed7323349b32eba0820405704eae1aa3e..154efb4c5d5794348f0eef00bd5f5611d2a1f42a 100644 (file)
@@ -51,7 +51,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
         done = true;
 }
 
-TEST(WebKit2, InjectedBundleBasic)
+TEST(WebKit, InjectedBundleBasic)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleBasicTest"));
 
index e178dc3cb0a48db010e5fd3f6b093813476468de..71e18fb920c380e0dd99bd025adb22ed56260a4e 100644 (file)
@@ -55,7 +55,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, InjectedBundleFrameHitTest)
+TEST(WebKit, InjectedBundleFrameHitTest)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleFrameHitTestTest"));
     
index 678aaa85b05a1bbcefef7a7e3f880899f246466a..a08882d5b497b1681e0b33d38807de262fdbabf0 100644 (file)
@@ -46,7 +46,7 @@ static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef context, c
     return Util::createInitializationDictionaryForInjectedBundleTest("InjectedBundleInitializationUserDataCallbackWinsTest",  Util::toWK("Set in the getInjectedBundleInitializationUserData callback").get());
 }
 
-TEST(WebKit2, InjectedBundleInitializationUserDataCallbackWins)
+TEST(WebKit, InjectedBundleInitializationUserDataCallbackWins)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
     WKRetainPtr<WKDictionaryRef> initializationDictionary(AdoptWK, Util::createInitializationDictionaryForInjectedBundleTest("InjectedBundleInitializationUserDataCallbackWinsTest",  Util::toWK("Set with WKContextSetInitializationUserDataForInjectedBundle").get()));
index 91fc8892948a53741a08fb5bcf087ddd18200b2d..de2b6831775b4b5bbe927de0e1ff1dd3147089ac 100644 (file)
@@ -83,7 +83,7 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef
     }
 }
 
-TEST(WebKit2, InjectedBundleMakeAllShadowRootOpenTest)
+TEST(WebKit, InjectedBundleMakeAllShadowRootOpenTest)
 {
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("InjectedBundleMakeAllShadowRootOpenTestPageGroup")));
 
index aa294643c72efa3ee10951f411534e5a6350d86c..149fcada237645a571921c39c8c58aad8e8b3427 100644 (file)
@@ -45,7 +45,7 @@ static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef,
         testDone = true;
 }
 
-TEST(WebKit2, LayoutMilestonesWithAllContentInFrame)
+TEST(WebKit, LayoutMilestonesWithAllContentInFrame)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index fde62c624f07da8b048a3680e9d1aac0e36ddccc..716208a657f1ba32f4d447a23f2c0f563283306d 100644 (file)
@@ -54,7 +54,7 @@ static void didReceiveTitleForFrame(WKPageRef page, WKStringRef title, WKFrameRe
     waitUntilLongTitleReceived = true;
 }
 
-TEST(WebKit2, LimitTitleSize)
+TEST(WebKit, LimitTitleSize)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index acc23348b16f654da6f24bd565cd682b1065b476..740184809bf90cfb345e1721db5f48445e1d759d 100644 (file)
@@ -64,14 +64,14 @@ static void loadAlternateHTMLString(WKURLRef baseURL, WKURLRef unreachableURL)
     Util::run(&didFinishLoad);
 }
 
-TEST(WebKit2, LoadAlternateHTMLStringWithNonDirectoryURL)
+TEST(WebKit, LoadAlternateHTMLStringWithNonDirectoryURL)
 {
     // Call WKPageLoadAlternateHTMLString() with fileURL which does not point to a directory.
     WKRetainPtr<WKURLRef> fileURL(AdoptWK, Util::createURLForResource("simple", "html"));
     loadAlternateHTMLString(fileURL.get(), fileURL.get());
 }
 
-TEST(WebKit2, LoadAlternateHTMLStringWithEmptyBaseURL)
+TEST(WebKit, LoadAlternateHTMLStringWithEmptyBaseURL)
 {
     // Call WKPageLoadAlternateHTMLString() with empty baseURL to make sure this test works
     // when baseURL does not grant read access to the unreachableURL. We use a separate test
index ac45fba2698a651a9e8da168f0b95d85b2f0a0fc..9a3f1ce12f3dc327966a571a7bf0f23657982b94 100644 (file)
@@ -58,7 +58,7 @@ static void didPerformServerRedirect(WKContextRef context, WKPageRef page, WKURL
     performedServerRedirect = true;
 }
 
-TEST(WebKit2, LoadCanceledNoServerRedirectCallback)
+TEST(WebKit, LoadCanceledNoServerRedirectCallback)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("LoadCanceledNoServerRedirectCallbackTest"));
     
index 63ad664e22d2245ba4ffe51f3eccb747c2924d29..5d4816be97244fc9da78f753c3d499f524690380 100644 (file)
@@ -95,7 +95,7 @@ void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const v
 
 // This test will load a blank page and next kill WebProcess, the expected
 // result is that a call to page load should spawn a new WebProcess.
-TEST(WebKit2, LoadPageAfterCrash)
+TEST(WebKit, LoadPageAfterCrash)
 {
     WebKit2CrashLoader helper;
     helper.loadUrl();
index 5dca5312f56ed2271c8e38d0c48d06d513b23354..4ef981eb86c63cdd5acd800bd8b38627a6a35906 100644 (file)
@@ -64,7 +64,7 @@ static bool hasRecievedCorrectCaptureState = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, MediaStreamTrackDetached)
+TEST(WebKit, MediaStreamTrackDetached)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto processPoolConfig = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
index f77a11ad871b27712c4f673c661d1091b3cc02b6..339e33507023724415266b9025f2c1c8840c586d 100644 (file)
@@ -69,77 +69,77 @@ static void buildAndPerformTest(WKEventMouseButton button, WKEventModifiers modi
     EXPECT_JS_EQ(webView.page(), "displayedMenu()", expectedMenuType);
 }
 
-TEST(WebKit2, MenuAndButtonForNormalLeftClick)
+TEST(WebKit, MenuAndButtonForNormalLeftClick)
 {
     buildAndPerformTest(kWKEventMouseButtonLeftButton, 0, "0", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForNormalRightClick)
+TEST(WebKit, MenuAndButtonForNormalRightClick)
 {
     buildAndPerformTest(kWKEventMouseButtonRightButton, 0, "2", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForNormalMiddleClick)
+TEST(WebKit, MenuAndButtonForNormalMiddleClick)
 {
     buildAndPerformTest(kWKEventMouseButtonMiddleButton, 0, "1", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForControlLeftClick)
+TEST(WebKit, MenuAndButtonForControlLeftClick)
 {
     buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersControlKey, "0", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForControlRightClick)
+TEST(WebKit, MenuAndButtonForControlRightClick)
 {
     buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersControlKey, "2", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForControlMiddleClick)
+TEST(WebKit, MenuAndButtonForControlMiddleClick)
 {
     buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersControlKey, "1", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForShiftLeftClick)
+TEST(WebKit, MenuAndButtonForShiftLeftClick)
 {
     buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersShiftKey, "0", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForShiftRightClick)
+TEST(WebKit, MenuAndButtonForShiftRightClick)
 {
     buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersShiftKey, "2", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForShiftMiddleClick)
+TEST(WebKit, MenuAndButtonForShiftMiddleClick)
 {
     buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersShiftKey, "1", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForCommandLeftClick)
+TEST(WebKit, MenuAndButtonForCommandLeftClick)
 {
     buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersMetaKey, "0", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForCommandRightClick)
+TEST(WebKit, MenuAndButtonForCommandRightClick)
 {
     buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersMetaKey, "2", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForCommandMiddleClick)
+TEST(WebKit, MenuAndButtonForCommandMiddleClick)
 {
     buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersMetaKey, "1", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForAltLeftClick)
+TEST(WebKit, MenuAndButtonForAltLeftClick)
 {
     buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersAltKey, "0", "none");
 }
 
-TEST(WebKit2, MenuAndButtonForAltRightClick)
+TEST(WebKit, MenuAndButtonForAltRightClick)
 {
     buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersAltKey, "2", "context");
 }
 
-TEST(WebKit2, MenuAndButtonForAltMiddleClick)
+TEST(WebKit, MenuAndButtonForAltMiddleClick)
 {
     buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersAltKey, "1", "none");
 }
index 10708fad0bf0bb9d773fe4de7a76e9b344648d63..7afe5cd1bb1055f349b9ee970378f793555b9262 100644 (file)
@@ -120,7 +120,7 @@ static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef urlRequest, WKDic
     return openedWebView->page();
 }
 
-TEST(WebKit2, ModalAlertsSPI)
+TEST(WebKit, ModalAlertsSPI)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
index 9d7f3997d36b8ae83bc53edfafec4ebe8d06fc67..61afd36c96535c1733752b9207d5ae5ccacbebf6 100644 (file)
@@ -51,7 +51,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, MouseMoveAfterCrash)
+TEST(WebKit, MouseMoveAfterCrash)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("MouseMoveAfterCrashTest"));
 
index 885c9bebc159973bc8e3cfa0f8ae1fed0c2eebd7..a8433921538f069ea47f218bbc234f36cedc0d3a 100644 (file)
@@ -54,7 +54,7 @@ static void decidePolicyForNavigationResponse(WKPageRef, WKNavigationResponseRef
     WKFramePolicyListenerUse(listener);
 }
 
-TEST(WebKit2, NavigationClientDefaultCrypto)
+TEST(WebKit, NavigationClientDefaultCrypto)
 {
     auto context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
index 42b3eda185d1d50bebce8aa47ebd491fb754f759..ca593330b4485aecd3f5c9d211107e96610b5488 100644 (file)
@@ -44,7 +44,7 @@ static bool loaded = false;
 static bool webProcessCrashed = false;
 static bool networkProcessCrashed = false;
 
-TEST(WebKit2, NetworkProcessCrashWithPendingConnection)
+TEST(WebKit, NetworkProcessCrashWithPendingConnection)
 {
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     RetainPtr<WKProcessPool> processPool = adoptNS([[WKProcessPool alloc] init]);
index 778d285bae33007f49855bfbad0ab4d168062522..763fe50ac1a6c1ca379b53db81aaad55664b57be 100644 (file)
@@ -73,7 +73,7 @@ static void setPageLoaderClient(WKPageRef page)
 // the frame load is completing before didLayout() manages to unlock the
 // kWKDidHitRelevantRepaintedObjectsAreaThreshold achievement. We probably need to fix this by making
 // this test have a long-running resource.
-TEST(WebKit2, DISABLED_NewFirstVisuallyNonEmptyLayout)
+TEST(WebKit, DISABLED_NewFirstVisuallyNonEmptyLayout)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutTest"));
 
index 5cff318fa46ef4e71db3b80967aa5f9cddb3bfca..090bafeaff093ce928397ae230c9aafd9946ba8e 100644 (file)
@@ -69,7 +69,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFails)
+TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFails)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutFailsTest"));
 
index 7bd1fd7b3cdae222750bfd06e97ec195916d3cf9..ba3383db677922f7cc715e44cab2c893eca3f54b 100644 (file)
@@ -73,7 +73,7 @@ static void setPageLoaderClient(WKPageRef page)
 // the frame load is completing before didLayout() manages to unlock the
 // kWKDidHitRelevantRepaintedObjectsAreaThreshold achievement. We probably need to fix this by making
 // this test have a long-running resource.
-TEST(WebKit2, DISABLED_NewFirstVisuallyNonEmptyLayoutForImages)
+TEST(WebKit, DISABLED_NewFirstVisuallyNonEmptyLayoutForImages)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutForImagesTest"));
 
index c7b24680ebb03dc4daeee16e0c07108ea5d9ed8f..ebf0d7e7f415333a797c27c781a6aea0d4ed27a8 100644 (file)
@@ -74,7 +74,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFrames)
+TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFrames)
 {
     didHitRelevantRepaintedObjectsAreaThresholdCounter = 0;
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutFramesTest"));
index 7ac216b2a4bb800bdb1124662ebcd3733de7e85d..9750a18aebe17035fd1ddfbf67ed29a0c3266e02 100644 (file)
@@ -111,7 +111,7 @@ static void decidePolicyForResponse(WKPageRef page, WKFrameRef frame, WKURLRespo
     WKFramePolicyListenerUse(listener);
 }
 
-TEST(WebKit2, PageLoadBasic)
+TEST(WebKit, PageLoadBasic)
 {
     State state;
 
@@ -154,7 +154,7 @@ TEST(WebKit2, PageLoadBasic)
     Util::run(&test1Done);
 }
 
-TEST(WebKit2, PageReload)
+TEST(WebKit, PageReload)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 46838db93adcb4fc672032c019e32af9ecc4211a..ba55a72f38e8dc0e37f90d1c28edbf1a74b3ee8d 100644 (file)
@@ -58,7 +58,7 @@ static void didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocum
     didChangeLocationWithinPage = true;
 }
 
-TEST(WebKit2, PageLoadDidChangeLocationWithinPageForFrame)
+TEST(WebKit, PageLoadDidChangeLocationWithinPageForFrame)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 7953608c8ae624e4b6c9da84759f7aa20c8421e6..fc3ea0a57ef7f533006166493da9a1f78351e566 100644 (file)
@@ -57,7 +57,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, ParentFrame)
+TEST(WebKit, ParentFrame)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ParentFrameTest"));
     setInjectedBundleClient(context.get());
index a8a57e048dcdd2e8e93179d96dec56c9c827f7e8..079c1cfd9c997ce312ca4106581dfedbaf1d5206 100644 (file)
@@ -58,7 +58,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, PasteboardNotifications)
+TEST(WebKit, PasteboardNotifications)
 {
     [[NSPasteboard generalPasteboard] clearContents];
     
index 22a8f04fa174f2e82f7b90e6188ee60ea5e211bb..38bd2e783611ba72c063c0482ea60ce40709273a 100644 (file)
@@ -36,7 +36,7 @@ namespace TestWebKitAPI {
 
 static bool done;
 
-TEST(WebKit2, PendingAPIRequestURL)
+TEST(WebKit, PendingAPIRequestURL)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 7712b142c90d27cd12e832fafa93be793529c5ca..14347790b74f93d003d8e9cc7b0f4043fe51b296 100644 (file)
@@ -58,7 +58,7 @@ static void didRunJavaScript(WKSerializedScriptValueRef resultSerializedScriptVa
     testDone = true;
 }
 
-TEST(WebKit2, PreventEmptyUserAgent)
+TEST(WebKit, PreventEmptyUserAgent)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 532c923737c3d3a97a002ff51a6ebf9c15892d01..c8f89b8efca4049ff05f7132c6045c20a5c2a2ec 100644 (file)
@@ -53,7 +53,7 @@ static void didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame,
     didSameDocumentNavigation = true;
 }
 
-TEST(WebKit2, PrivateBrowsingPushStateNoHistoryCallback)
+TEST(WebKit, PrivateBrowsingPushStateNoHistoryCallback)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index bbe46a9e8de1badd140b2f27570740d8bfe4acc8..307cd41dd3d41d75a3ad6ebd3855a7b5a5beaa01 100644 (file)
@@ -76,7 +76,7 @@ static void webProcessCrashed(WKPageRef page, WKProcessTerminationReason reason,
     crashHandlerCalled = true;
 }
 
-TEST(WebKit2, ProcessDidTerminateRequestedByClient)
+TEST(WebKit, ProcessDidTerminateRequestedByClient)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
@@ -100,7 +100,7 @@ TEST(WebKit2, ProcessDidTerminateRequestedByClient)
     Util::run(&clientTerminationHandlerCalled);
 }
 
-TEST(WebKit2, ProcessDidTerminateWithReasonCrash)
+TEST(WebKit, ProcessDidTerminateWithReasonCrash)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 190c85341af33bbc4d4b9b0b198bbc9295db7c22..e1624b9bf9188faaee0e841f7d74cd4720356d9c 100644 (file)
@@ -63,7 +63,7 @@ static void didCrash(WKPageRef page, const void*)
     WKPageReload(page);
 }
 
-TEST(WebKit2, ReloadPageAfterCrash)
+TEST(WebKit, ReloadPageAfterCrash)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index f2e1ae17fa688f3ec2ec8d084b1e026157d334d7..98124050c40095479c639f5e137b2615852bc2a4 100644 (file)
@@ -59,7 +59,7 @@ static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef,
     }
 }
 
-TEST(WebKit2, ResizeReversePaginatedWebView)
+TEST(WebKit, ResizeReversePaginatedWebView)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 2dfc8b4c234e752280b43e824f338a04b2ca09c1..6f857f2c50303e5bffe0185d6f054cb5971ea093 100644 (file)
@@ -73,7 +73,7 @@ static void didCrash(WKPageRef page, const void* clientInfo)
     WKPageReload(page);
 }
 
-TEST(WebKit2, ResizeWindowAfterCrash)
+TEST(WebKit, ResizeWindowAfterCrash)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     TestStatesData states(context.get());
index 06f81d53f69f716a1a8f82bba4471e52f87eecd4..8c43a1cdaf8a5ef5f6a4cfd5ef23f313838f7b2a 100644 (file)
@@ -57,7 +57,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, ResponsivenessTimerShouldNotFireAfterTearDown)
+TEST(WebKit, ResponsivenessTimerShouldNotFireAfterTearDown)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     // The two views need to share the same WebContent process.
index a034637e38acf465a524e5d0cecd52bd80ca3bf3..1c961775ba593916f68a0ab036afb5be6598192f 100644 (file)
@@ -75,7 +75,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, ResponsivenessTimerDoesntFireEarly)
+TEST(WebKit, ResponsivenessTimerDoesntFireEarly)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ResponsivenessTimerDoesntFireEarlyTest"));
     setInjectedBundleClient(context.get());
index 356b8e356acce203aa518e1f8b2afd3375ae299d..825201eb0b1a25ecfaa5ff9cb418ad3d50d04bcf 100644 (file)
@@ -66,7 +66,7 @@ static WKRetainPtr<WKDataRef> createSessionStateData(WKContextRef context)
     return adoptWK(WKSessionStateCopyData(sessionState.get()));
 }
 
-TEST(WebKit2, RestoreSessionStateContainingScrollRestorationDefault)
+TEST(WebKit, RestoreSessionStateContainingScrollRestorationDefault)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index b16537e70b7857647e167ff023cf88477dd4c81a..742fad9cd4ce7019cf261c72cc26d9fc6be43485 100644 (file)
@@ -70,7 +70,7 @@ static WKRetainPtr<WKDataRef> createSessionStateDataContainingFormData(WKContext
     return adoptWK(WKSessionStateCopyData(sessionState.get()));
 }
 
-TEST(WebKit2, RestoreSessionStateContainingFormData)
+TEST(WebKit, RestoreSessionStateContainingFormData)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index d597ba5fd89f67a7b706d5cb4e208c28a76cd841..18dfa02312ff047d8524b527a22be4b7da0a9e34 100644 (file)
@@ -74,7 +74,7 @@ static WKRetainPtr<WKDataRef> createSessionStateData(WKContextRef context)
     return adoptWK(WKSessionStateCopyData(sessionState.get()));
 }
 
-TEST(WebKit2, RestoreSessionStateWithoutNavigation)
+TEST(WebKit, RestoreSessionStateWithoutNavigation)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index 015571f5f0a2b6c8f07d51341717f33a759872f1..1ff9aa09d5495c8779d4e623a246dc739399cf6f 100644 (file)
@@ -69,7 +69,7 @@ static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTy
     testDone = true;
 }
 
-TEST(WebKit2, ScrollPinningBehaviors)
+TEST(WebKit, ScrollPinningBehaviors)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index f41e44a5e51edcbfbccce9376193aa0f3184fce2..1356d1004f0ec2fcf0385cf5f669afaca5566932 100644 (file)
@@ -69,7 +69,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, ShouldGoToBackForwardListItem)
+TEST(WebKit, ShouldGoToBackForwardListItem)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ShouldGoToBackForwardListItemTest"));
     // Enable the page cache so we can test the WKBundleBackForwardListItemIsInPageCache API
index f8098e6f1f6114c825308d8063f4067bd75aea53..bf9cc62e77c12fd7c64c3851296ace1e253f9436 100644 (file)
@@ -128,7 +128,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, ShouldKeepCurrentBackForwardListItemInList)
+TEST(WebKit, ShouldKeepCurrentBackForwardListItemInList)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index 226f52cc278ce6b52527baf8754f6443f11aa5ba..3050234be528800c3471585db3439cd0f0ddb94d 100644 (file)
@@ -49,7 +49,7 @@ static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, cons
         didNotHandleKeyDownEvent = true;
 }
 
-TEST(WebKit2, SpacebarScrolling)
+TEST(WebKit, SpacebarScrolling)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
index 386dfd30326720df02e48f2997f2c18f8da1622e..938b7eca1d2fb4f32d2323b8d13e688ee3056ea2 100644 (file)
@@ -60,7 +60,7 @@ static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErr
     done = true;
 }
 
-TEST(WebKit2, StopLoadingDuringDidFailProvisionalLoadTest)
+TEST(WebKit, StopLoadingDuringDidFailProvisionalLoadTest)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("StopLoadingDuringDidFailProvisionalLoadTest"));
     setInjectedBundleClient(context.get());
index 5d5c2f79dae15f6dde4552da0067fb0af9933db7..1cc7ca091a22e1ff3b756c591fd0da7d2c4f2fd3 100644 (file)
@@ -39,7 +39,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     loaded = true;
 }
 
-TEST(WebKit2, TerminateTwice)
+TEST(WebKit, TerminateTwice)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 7d4cc8c9e6b49f12efbdafc485b746d90cbfabee..363b753381f48ecbd1612abe84881ca6b27f31ae 100644 (file)
@@ -66,7 +66,7 @@ static void checkUserMediaPermissionCallback(WKPageRef, WKFrameRef, WKSecurityOr
     WKUserMediaPermissionCheckSetUserMediaAccessInfo(permissionRequest, WKStringCreateWithUTF8CString("0x123456789"), false);
 }
 
-TEST(WebKit2, UserMediaBasic)
+TEST(WebKit, UserMediaBasic)
 {
     auto context = adoptWK(WKContextCreate());
 
index fca35d71e6acf1a5ef106f64d4efdd25e39bf3f0..7d7b3006f064ada94bc443f6be016eb631f88fe6 100644 (file)
@@ -35,7 +35,7 @@
 
 static bool viewportSizeTestDone;
 
-TEST(WebKit2, ViewportSizeForViewportUnits)
+TEST(WebKit, ViewportSizeForViewportUnits)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
index b9a84ff8045b5a0520d860ce33f8557dcf360ec5..7af7847cae3026f793a2c19211583a31bdd8278a 100644 (file)
@@ -51,7 +51,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     loadDone = true;
 }
 
-TEST(WebKit2, WKBundleFileHandle)
+TEST(WebKit, WKBundleFileHandle)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WKBundleFileHandleTest"));
 
index f0d19025f55e13e6580a16eab27fa00e02134db4..879a72a17851f401e94b85cff01ad5f6ae84fc4a 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKImageCreateCGImageCrash)
+TEST(WebKit, WKImageCreateCGImageCrash)
 {
     EXPECT_FALSE(WKImageCreateCGImage(nullptr));
 }
index d041eeaed5d42c62cacb0135d697d9adeb02cd03..7fe97d208f161a6be27435cd45b42654cf71a1a3 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKPageConfigurationEmpty)
+TEST(WebKit, WKPageConfigurationEmpty)
 {
     WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
 
@@ -64,7 +64,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, WKPageConfigurationBasic)
+TEST(WebKit, WKPageConfigurationBasic)
 {
     WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
@@ -83,7 +83,7 @@ TEST(WebKit2, WKPageConfigurationBasic)
     Util::run(&didFinishLoad);
 }
 
-TEST(WebKit2, WKPageConfigurationBasicWithDataStore)
+TEST(WebKit, WKPageConfigurationBasicWithDataStore)
 {
     WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
@@ -105,7 +105,7 @@ TEST(WebKit2, WKPageConfigurationBasicWithDataStore)
     Util::run(&didFinishLoad);
 }
 
-TEST(WebKit2, WKPageConfigurationBasicWithNonPersistentDataStore)
+TEST(WebKit, WKPageConfigurationBasicWithNonPersistentDataStore)
 {
     WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
index 6ce49a13bed4867f3876e0e7eeaf69f5182652f7..a7a0e0136f0f5d3d5d9f663111a69a32a956232d 100644 (file)
@@ -103,7 +103,7 @@ static void createSessionStates(WKContextRef context)
     sessionStateWithAllItemsRemoved = adoptWK(static_cast<WKSessionStateRef>(WKPageCopySessionState(webView.page(), reinterpret_cast<void*>(1), filterAllItemsCallback)));
 }
 
-TEST(WebKit2, WKPageCopySessionStateWithFiltering)
+TEST(WebKit, WKPageCopySessionStateWithFiltering)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index 929baaa71e611c2e4cd8fc1c74aba801870fc240..498028b734beef7f61201a352af84cefa5ea6253 100644 (file)
@@ -63,7 +63,7 @@ static WKRetainPtr<WKSessionStateRef> createSessionState(WKContextRef context)
     return adoptWK(static_cast<WKSessionStateRef>(WKPageCopySessionState(webView.page(), reinterpret_cast<void*>(1), nullptr)));
 }
 
-TEST(WebKit2, WKPageGetScaleFactorNotZero)
+TEST(WebKit, WKPageGetScaleFactorNotZero)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index 1e848133fc12d97d931c49428e3e6ee9eb013d48..729145ae73bdadac8cca72d5a3b373b16bc6ab30 100644 (file)
@@ -95,7 +95,7 @@ static void setUpClients(WKPageRef page)
     WKPageSetPageUIClient(page, &uiClient.base);
 }
 
-TEST(WebKit2, WKPageIsPlayingAudio)
+TEST(WebKit, WKPageIsPlayingAudio)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
 
@@ -114,7 +114,7 @@ TEST(WebKit2, WKPageIsPlayingAudio)
     EXPECT_TRUE(WKPageIsPlayingAudio(webView.page()));
 }
 
-TEST(WebKit2, MSEIsPlayingAudio)
+TEST(WebKit, MSEIsPlayingAudio)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
 
index 8ceacb01f09a6add0dcafc6e3e280d92cbbc205c..5a0a30087b4896df79c6bf7d74d185e63c99e145 100644 (file)
@@ -33,7 +33,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKPreferencesBasic)
+TEST(WebKit, WKPreferencesBasic)
 {
     WKPreferencesRef preference = WKPreferencesCreate();
 
@@ -42,7 +42,7 @@ TEST(WebKit2, WKPreferencesBasic)
     WKRelease(preference);
 }
 
-TEST(WebKit2, WKPreferencesDefaults)
+TEST(WebKit, WKPreferencesDefaults)
 {
 #if PLATFORM(GTK)
     static const char* expectedStandardFontFamily = "Times";
@@ -106,7 +106,7 @@ TEST(WebKit2, WKPreferencesDefaults)
     WKRelease(preference);
 }
 
-TEST(WebKit2, WKPreferencesCopying)
+TEST(WebKit, WKPreferencesCopying)
 {
     WKRetainPtr<WKStringRef> identifier(AdoptWK, WKStringCreateWithUTF8CString("identifier"));
 
index 860d7d48d63466186d3e8eaa232775b701bdb9d4..6a0709a4944e3c205cf0a20a72bcdd815acf2c92 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKRetainPtr)
+TEST(WebKit, WKRetainPtr)
 {
     WKRetainPtr<WKStringRef> string1 = adoptWK(WKStringCreateWithUTF8CString("a"));
     WKRetainPtr<WKStringRef> string2 = adoptWK(WKStringCreateWithUTF8CString("a"));
index b4167be81503da6b3aeb4a2457aa2621124619ac..ca697423a0042dc090b536a29a6694abbf8c4538 100644 (file)
@@ -29,7 +29,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKString)
+TEST(WebKit, WKString)
 {
     WKStringRef string = WKStringCreateWithUTF8CString("hello");
     EXPECT_TRUE(!WKStringIsEmpty(string));
index 8b6e08b9d7379ccbbcdb99d3c1887b24c63e8a03..fc87a320188f3cd4da070a6f035b02a63c37746c 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKStringJSString)
+TEST(WebKit, WKStringJSString)
 {
     WKStringRef wkString = WKStringCreateWithUTF8CString("hello");
     JSStringRef jsString = JSStringCreateWithUTF8CString("hello");
index e08f1797b2fd663dd0ae5ba3364deaf5d4e23563..d578f50b9dd1e63083fc1e5ef2a5c1e8e5711303 100644 (file)
@@ -74,7 +74,7 @@ static void setPageLoaderClient(WKPageRef page)
     WKPageSetPageLoaderClient(page, &loaderClient.base);
 }
 
-TEST(WebKit2, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
+TEST(WebKit, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
@@ -120,7 +120,7 @@ TEST(WebKit2, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
     [thumbnailView removeObserver:observer.get() forKeyPath:@"snapshotSize" context:snapshotSizeChangeKVOContext];
 }
 
-TEST(WebKit2, WKThumbnailViewMaximumSnapshotSize)
+TEST(WebKit, WKThumbnailViewMaximumSnapshotSize)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     PlatformWebView webView(context.get());
index 06d673e215e8b65d6de060ec60989049152cfec3..be4bf7d339a983bb9335749efaf853689ee5e5a5 100644 (file)
@@ -105,7 +105,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const v
     didFinishLoad = true;
 }
 
-TEST(WebKit2, WebArchive)
+TEST(WebKit, WebArchive)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WebArchiveTest"));
     setInjectedBundleClient(context.get());
index ff5eef04ddf269ad1e083de57d57fb95cead182e..0b9247f754d87f7b6f7548c8bfecd0bf78cd1b2d 100644 (file)
@@ -41,7 +41,7 @@ static void wkContextGetStatisticsCallback(WKDictionaryRef statistics, WKErrorRe
     done = true;
 }
 
-TEST(WebKit2, WebCoreStatisticsWithNoWebProcess)
+TEST(WebKit, WebCoreStatisticsWithNoWebProcess)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
     
index 951aaf0050129c3261083ecfcb64c29722176c0b..9fbbf6e20e3aa36091cf01d483dc8c4e3570f925 100644 (file)
@@ -69,7 +69,7 @@ static void setInjectedBundleClient(WKContextRef context)
     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
 }
 
-TEST(WebKit2, WillSendSubmitEvent)
+TEST(WebKit, WillSendSubmitEvent)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WillSendSubmitEventTest"));
     setInjectedBundleClient(context.get());
index 05644cb1527a544e210da3b8f3eaba85ba59c2c0..d10ae05898373db742d3cddb6b258f354c50783c 100644 (file)
@@ -55,7 +55,7 @@ static void invalidMessageFunction(WKStringRef messageName)
     didReceiveInvalidMessage = true;
 }
 
-TEST(WebKit2, AttributedSubstringForProposedRangeWithImage)
+TEST(WebKit, AttributedSubstringForProposedRangeWithImage)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("AttributedSubstringForProposedRangeWithImagePageGroup").get()));
index 62e8e2fdf07f797c2a572924c981ab22bceddb45..cfbc11f8baf004395ef8b4a734876ceb31067e8b 100644 (file)
@@ -73,7 +73,7 @@ static WKStringRef decideDestinationWithSuggestedFilename(WKContextRef, WKDownlo
 
 // Checks that the HTML download attribute is used as suggested filename when selecting
 // the "Download Linked File" item in the context menu.
-TEST(WebKit2, ContextMenuDownloadHTMLDownloadAttribute)
+TEST(WebKit, ContextMenuDownloadHTMLDownloadAttribute)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
@@ -119,7 +119,7 @@ static WKStringRef decideDestinationWithSuggestedFilenameContainingSlashes(WKCon
     return Util::toWK("/tmp/WebKitAPITest/ContextMenuDownload").leakRef();
 }
 
-TEST(WebKit2, ContextMenuDownloadHTMLDownloadAttributeWithSlashes)
+TEST(WebKit, ContextMenuDownloadHTMLDownloadAttributeWithSlashes)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
index f46ad9acd5128838bc92679f6ef602db6713a762..096c7586e1000bd326293d1b3d40a9b784a051f9 100644 (file)
@@ -40,7 +40,7 @@ static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     didFinishLoad = true;
 }
 
-TEST(WebKit2, ScrollByLineCommands)
+TEST(WebKit, ScrollByLineCommands)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
index f947a8c2fba28568a6821160db5a2a503bef3c9b..be7be70392d4f190b9063c10cabbc1f2f65c07fc 100644 (file)
@@ -63,7 +63,7 @@ static RetainPtr<SyntheticBackingScaleFactorWindow> createWindow()
     return window;
 }
 
-TEST(WebKit2, GetBackingScaleFactor)
+TEST(WebKit, GetBackingScaleFactor)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("GetBackingScaleFactorTest"));
     setInjectedBundleClient(context.get());
index 7caed02a369277fafd9e0b1ea8bf810be8d0b8b4..4a2ab0904c5ce0fa2fdc10a86164e8e16d24b3b6 100644 (file)
@@ -40,7 +40,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
     loaded = true;
 }
 
-TEST(WebKit2, GetPIDAfterAbortedProcessLaunch)
+TEST(WebKit, GetPIDAfterAbortedProcessLaunch)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
 
index e3bca90ebf7bce07291160bafe88c008e09b2931..8772dae081b86b9d7f958351620be21c68c8f2b6 100644 (file)
@@ -65,7 +65,7 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
         done = true;
 }
 
-TEST(WebKit2, InjectedBundleAppleEvent)
+TEST(WebKit, InjectedBundleAppleEvent)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleAppleEventTest"));
 
index 173f19cc9f515f264e4079e294bf569ef5618648..5889eb58047053d337c9ebe782baf69d8514936f 100644 (file)
@@ -69,7 +69,7 @@ static void didCrash(WKPageRef page, const void*)
     EXPECT_TRUE(loadBeforeCrash);
 }
 
-TEST(WebKit2, RestoreStateAfterTermination)
+TEST(WebKit, RestoreStateAfterTermination)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
     PlatformWebView webView(context.get());
index 92cb06693233ad7c66717f439e1d5dc12716b458..c2fd10da19725291fffb8483c497635ac49ad682 100644 (file)
@@ -41,7 +41,7 @@
 
 static bool done;
 
-TEST(WebKit2, AdditionalReadAccessAllowedURLs)
+TEST(WebKit, AdditionalReadAccessAllowedURLs)
 {
     RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"AdditionalReadAccessAllowedURLsPlugIn"]);
 
index 882daab60cf0b9fc223cd9ec9db1e93e6bd126a4..4ad57310d19ac6f3318357ea733a76b4648558d2 100644 (file)
@@ -74,7 +74,7 @@ static size_t loadsStarted;
 
 @end
 
-TEST(WebKit2, AlwaysRevalidatedURLSchemes)
+TEST(WebKit, AlwaysRevalidatedURLSchemes)
 {
     @autoreleasepool {
         [NSURLProtocol registerClass:[AlwaysRevalidatedURLSchemeProtocol class]];
index c949ca72937efde74afd51c7206ca2141c6cd801..18d9bdc5bf614b33696cfe408a14cb708b61e23d 100644 (file)
@@ -85,7 +85,7 @@ static RetainPtr<TestNavigationDelegate> createFirstVisuallyNonEmptyWatchingNavi
     return navigationDelegate;
 }
 
-TEST(WebKit2, DISABLED_ResizeWithHiddenContentDoesNotHang)
+TEST(WebKit, DISABLED_ResizeWithHiddenContentDoesNotHang)
 {
     auto webView = createAnimatedResizeWebView();
     [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"blinking-div" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
@@ -109,7 +109,7 @@ TEST(WebKit2, DISABLED_ResizeWithHiddenContentDoesNotHang)
     }
 }
 
-TEST(WebKit2, AnimatedResizeDoesNotHang)
+TEST(WebKit, AnimatedResizeDoesNotHang)
 {
     auto webView = createAnimatedResizeWebView();
     [webView loadRequest:[NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"blinking-div" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]]];
@@ -137,7 +137,7 @@ TEST(WebKit2, AnimatedResizeDoesNotHang)
     }
 }
 
-TEST(WebKit2, AnimatedResizeBlocksViewportFitChanges)
+TEST(WebKit, AnimatedResizeBlocksViewportFitChanges)
 {
     auto webView = createAnimatedResizeWebView();
     [webView setUIDelegate:webView.get()];
@@ -184,7 +184,7 @@ TEST(WebKit2, AnimatedResizeBlocksViewportFitChanges)
     EXPECT_TRUE(didChangeSafeAreaShouldAffectObscuredInsets);
 }
 
-TEST(WebKit2, OverrideLayoutSizeChangesDuringAnimatedResizeSucceed)
+TEST(WebKit, OverrideLayoutSizeChangesDuringAnimatedResizeSucceed)
 {
     auto webView = createAnimatedResizeWebView();
     [webView setUIDelegate:webView.get()];
index ec96be6ac4d9cfdc4d3fe868bb601b662604e571..7c39c3ce8224839e1a59108626f29d9d36b63c9e 100644 (file)
@@ -118,7 +118,7 @@ static bool didEvaluateJavaScript;
 
 @end
 
-TEST(WebKit2, AutoLayoutIntegration)
+TEST(WebKit, AutoLayoutIntegration)
 {
     RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);
 
@@ -173,7 +173,7 @@ TEST(WebKit2, AutoLayoutIntegration)
     [webView _setShouldExpandContentToViewHeightForAutoLayout:NO];
 }
 
-TEST(WebKit2, AutoLayoutRenderingProgressRelativeOrdering)
+TEST(WebKit, AutoLayoutRenderingProgressRelativeOrdering)
 {
     RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);
 
index 12c01aec062869b385c3e48068f98ca9fe6bb91b..4eee89f1df08a708005a48636ba76e37d6df4feb 100644 (file)
@@ -71,7 +71,7 @@ static bool didWriteToPasteboard;
 
 @end
 
-TEST(WebKit2, WKWebProcessPlugInEditingDelegate)
+TEST(WebKit, WKWebProcessPlugInEditingDelegate)
 {
     RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"]);
     [[configuration processPool] _setObject:[NSNumber numberWithBool:NO] forBundleParameter:@"EditingDelegateShouldInsertText"];
index 1b7e269919713b2c804e6cb2f0695d936f69c0d3..439a68743a15838de3649f0e643976219b83d7ba 100644 (file)
@@ -35,7 +35,7 @@
 
 static bool isDone;
 
-TEST(WebKit2, BundleParameters)
+TEST(WebKit, BundleParameters)
 {
     @autoreleasepool {
         NSString * const testPlugInClassName = @"BundleParametersPlugIn";
index ebd8d01f0b1a260fe253b1f9663f4962b717972b..8f9023ed79ec4188efcbf0c7730f7f2ae737819f 100644 (file)
@@ -62,7 +62,7 @@ static bool didGetBodyInnerHTMLAfterDetectingData;
 @end
 
 // FIXME: Re-enable this test once webkit.org/b/167594 is fixed.
-TEST(WebKit2, DISABLED_WKWebProcessPlugInRangeHandle)
+TEST(WebKit, DISABLED_WKWebProcessPlugInRangeHandle)
 {
     RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleRangeHandlePlugIn"]);
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
index c0e38253bd8b8900b0f4da0aa8817fea2453e4cf..c5ef80780224fad40c523d79ab17850892f5ddb0 100644 (file)
@@ -51,7 +51,7 @@ static RetainPtr<WKScriptMessage> lastScriptMessage;
 
 @end
 
-TEST(WebKit2, CookieAcceptPolicy)
+TEST(WebKit, CookieAcceptPolicy)
 {
     auto originalCookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
     
index 7be94925b0f6f11b4827d492ac945090c51b141f..723c602703757cb06408da908e0ecdfac4eb23f5 100644 (file)
@@ -70,7 +70,7 @@ void expectLinkCount(WKWebView *webView, NSString *HTMLString, unsigned linkCoun
 }
 
 // FIXME: Re-enable this test once webkit.org/b/161967 is fixed.
-TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
+TEST(WebKit, DISABLED_DataDetectionReferenceDate)
 {
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     [configuration setDataDetectorTypes:WKDataDetectorTypeCalendarEvent];
index 7e37c055ef2da2212a29429bb6e1d606e128c529..7044b4dc0983f1727a4fab91a08167b1d39dc7dd 100644 (file)
@@ -73,7 +73,7 @@ static NSString *secondURL = @"data:text/html,Second";
 
 @end
 
-TEST(WebKit2, DecidePolicyForNavigationActionReload)
+TEST(WebKit, DecidePolicyForNavigationActionReload)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -103,7 +103,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionReload)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionReloadFromOrigin)
+TEST(WebKit, DecidePolicyForNavigationActionReloadFromOrigin)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -133,7 +133,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionReloadFromOrigin)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionGoBack)
+TEST(WebKit, DecidePolicyForNavigationActionGoBack)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -167,7 +167,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionGoBack)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionGoForward)
+TEST(WebKit, DecidePolicyForNavigationActionGoForward)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -205,7 +205,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionGoForward)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionOpenNewWindowAndDeallocSourceWebView)
+TEST(WebKit, DecidePolicyForNavigationActionOpenNewWindowAndDeallocSourceWebView)
 {
     auto controller = adoptNS([[DecidePolicyForNavigationActionController alloc] init]);
 
@@ -236,7 +236,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionOpenNewWindowAndDeallocSourceWebVie
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForTargetedHyperlink)
+TEST(WebKit, DecidePolicyForNavigationActionForTargetedHyperlink)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -285,7 +285,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionForTargetedHyperlink)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForTargetedWindowOpen)
+TEST(WebKit, DecidePolicyForNavigationActionForTargetedWindowOpen)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -334,7 +334,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionForTargetedWindowOpen)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForTargetedFormSubmission)
+TEST(WebKit, DecidePolicyForNavigationActionForTargetedFormSubmission)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -382,7 +382,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionForTargetedFormSubmission)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForHyperlinkThatRedirects)
+TEST(WebKit, DecidePolicyForNavigationActionForHyperlinkThatRedirects)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -432,7 +432,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionForHyperlinkThatRedirects)
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToGET)
+TEST(WebKit, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToGET)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -479,7 +479,7 @@ TEST(WebKit2, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsT
     action = nullptr;
 }
 
-TEST(WebKit2, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToPOST)
+TEST(WebKit, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToPOST)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
index 79a7f032a2ff43d1326d2814813a49492689d098..86e20df5a0e8a5a10d050f1260f7b8118144a582 100644 (file)
@@ -33,7 +33,7 @@
 
 #if PLATFORM(IOS) && WK_API_ENABLED
 
-TEST(WebKit2, DoAfterNextPresentationUpdateAfterCrash)
+TEST(WebKit, DoAfterNextPresentationUpdateAfterCrash)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
@@ -53,7 +53,7 @@ TEST(WebKit2, DoAfterNextPresentationUpdateAfterCrash)
     TestWebKitAPI::Util::run(&gotCallback);
 }
 
-TEST(WebKit2, DoAfterNextStablePresentationUpdateAfterCrash)
+TEST(WebKit, DoAfterNextStablePresentationUpdateAfterCrash)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
     
index feb2c86a3960b69207c30cd477aad4d95a2ec2ec..ac7082fb892ffec1f41d6a3574165f3942345168 100644 (file)
@@ -123,7 +123,7 @@ static void expectException(void (^completionHandler)())
 
 @end
 
-TEST(WebKit2, DuplicateCompletionHandlerCalls)
+TEST(WebKit, DuplicateCompletionHandlerCalls)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
     auto delegate = adoptNS([[DuplicateCompletionHandlerCallsDelegate alloc] init]);
index c31bcae8abc7175073affac072303c3216dfa983..c7374a4667cef6be194429cc594d90a83c0d1714 100644 (file)
@@ -76,7 +76,7 @@ static FindResult findMatches(WKWebView *webView, NSString *findString, NSTextFi
     return result;
 }
 
-TEST(WebKit2, FindInPage)
+TEST(WebKit, FindInPage)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 200, 200)]);
     [webView _setOverrideDeviceScaleFactor:2];
@@ -126,7 +126,7 @@ TEST(WebKit2, FindInPage)
     EXPECT_EQ((NSUInteger)1000, [result.matches count]);
 }
 
-TEST(WebKit2, FindInPageWrapping)
+TEST(WebKit, FindInPageWrapping)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
     [webView _setOverrideDeviceScaleFactor:2];
@@ -154,7 +154,7 @@ TEST(WebKit2, FindInPageWrapping)
     EXPECT_TRUE(result.didWrap);
 }
 
-TEST(WebKit2, FindInPageWrappingDisabled)
+TEST(WebKit, FindInPageWrappingDisabled)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
     [webView _setOverrideDeviceScaleFactor:2];
@@ -177,7 +177,7 @@ TEST(WebKit2, FindInPageWrappingDisabled)
     EXPECT_FALSE(result.didWrap);
 }
 
-TEST(WebKit2, FindInPageWrappingSubframe)
+TEST(WebKit, FindInPageWrappingSubframe)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
     [webView _setOverrideDeviceScaleFactor:2];
index fee1064b31f3c75b909e1e16d5fb1ee7282b8186..2d9dbdba2bc162de7f1f8d035ab3af5a1ed872b3 100644 (file)
@@ -37,7 +37,7 @@ static bool fixedLayoutSizeDone;
 static bool fixedLayoutSizeAfterNavigationDone;
 static bool fixedLayoutSizeDisabledDone;
 
-TEST(WebKit2, FixedLayoutSize)
+TEST(WebKit, FixedLayoutSize)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
index 8bc9a094b125a11e82ff3458f74dac87d853f710..1c4ddfb26cdd65ae5fa0bac9474d896a4cc3ebb6 100644 (file)
@@ -143,7 +143,7 @@ namespace TestWebKitAPI {
 // view. Without this, the web process would wait until the page is visible before sending
 // the requests to the UI process.
 
-TEST(WebKit2, GeolocationDeniedByLocationProvider)
+TEST(WebKit, GeolocationDeniedByLocationProvider)
 {
     auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
     auto coreLocationProvider = adoptNS([[TestCoreLocationProvider alloc] init]);
@@ -167,7 +167,7 @@ TEST(WebKit2, GeolocationDeniedByLocationProvider)
     EXPECT_FALSE(uiDelegate.get().authorizationWasRequested);
 }
 
-TEST(WebKit2, GeolocationDeniedByAPI)
+TEST(WebKit, GeolocationDeniedByAPI)
 {
     auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
     auto coreLocationProvider = adoptNS([[TestCoreLocationProvider alloc] init]);
@@ -191,7 +191,7 @@ TEST(WebKit2, GeolocationDeniedByAPI)
     EXPECT_TRUE(uiDelegate.get().authorizationWasRequested);
 }
 
-TEST(WebKit2, GeolocationAllowedByAPI)
+TEST(WebKit, GeolocationAllowedByAPI)
 {
     auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
     auto coreLocationProvider = adoptNS([[TestCoreLocationProvider alloc] init]);
@@ -215,7 +215,7 @@ TEST(WebKit2, GeolocationAllowedByAPI)
     EXPECT_TRUE(uiDelegate.get().authorizationWasRequested);
 }
 
-TEST(WebKit2, GeolocationError)
+TEST(WebKit, GeolocationError)
 {
     auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
     auto coreLocationProvider = adoptNS([[TestCoreLocationProvider alloc] init]);
@@ -240,7 +240,7 @@ TEST(WebKit2, GeolocationError)
     EXPECT_TRUE(uiDelegate.get().authorizationWasRequested);
 }
 
-TEST(WebKit2, DuplicateGeolocationAuthorizationCallbackCalls)
+TEST(WebKit, DuplicateGeolocationAuthorizationCallbackCalls)
 {
     auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
     auto coreLocationProvider = adoptNS([[TestCoreLocationProvider alloc] init]);
index ff64badcf5489524e38bab5cec92c3743e6002d0..a8049125646f95d64b1a61956073953feca27258 100644 (file)
@@ -56,7 +56,7 @@ static UIGestureRecognizer *recursiveFindHighlightLongPressRecognizer(UIView *vi
     return nil;
 }
 
-TEST(WebKit2, InteractionDeadlockAfterCrash)
+TEST(WebKit, InteractionDeadlockAfterCrash)
 {
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
 
index d44d4fb5e0836754b8e09b0c98e39ce9f8bbe25a..aa1f52f0901c4f266ce4933009982df557f0912d 100644 (file)
@@ -31,7 +31,7 @@
 #import <WebKit/WebKit.h>
 #import <wtf/RetainPtr.h>
 
-TEST(WebKit2, LoadDataWithNilMIMEType)
+TEST(WebKit, LoadDataWithNilMIMEType)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect]);
     NSString *mimeType = nil;
index 101fe24f2a55dae09053ecbccf15557f55cdea02..8b4a1db651063ce46665208c935b1c23137661c5 100644 (file)
@@ -66,7 +66,7 @@ static NSURL *literalURL(const char* literal)
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, LoadInvalidURLRequest)
+TEST(WebKit, LoadInvalidURLRequest)
 {
     @autoreleasepool {
         RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
index a446ee7ab0cb29ebc331687ffd7b4c1b68b53c56..349a0d0b2a28e3d863475eeb16060f3b845042dc 100644 (file)
@@ -129,7 +129,7 @@ static void sawDialog()
 
 @end
 
-TEST(WebKit2, ModalAlerts)
+TEST(WebKit, ModalAlerts)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
index b624f92c4cff9271a46b558cc4d381339c7ed4ab..46fbac2e52a0661b798df0a1bc62efe432c7bf7b 100644 (file)
@@ -40,7 +40,7 @@ static void expectAttributes(NSDictionary *attributes, NSNumber *expectedPermiss
     EXPECT_WK_STREQ(expectedFileType, attributes[NSFileType]);
 }
 
-TEST(WebKit2, _WKNSFileManagerExtras)
+TEST(WebKit, _WKNSFileManagerExtras)
 {
     NSString *fileName = @"test.pdf";
     NSFileManager *fileManager = [NSFileManager defaultManager];
index dc78b4deadf79d20b58d6294f62ebea481cda851..4104a0592861d4dd23c8867fb771e265f436d0f0 100644 (file)
@@ -33,7 +33,7 @@
 
 #if PLATFORM(MAC) && WK_API_ENABLED
 
-TEST(WebKit2, ObservedRenderingProgressEventsAfterCrash)
+TEST(WebKit, ObservedRenderingProgressEventsAfterCrash)
 {
     __block bool done = false;
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
index fb7ca62614f0275df552881aa7cb347c6cb49400..eacffa0e85ad65c4875083cd6613eeea363cc18e 100644 (file)
@@ -77,7 +77,7 @@ static void resetToConsistentState()
 
 @end
 
-TEST(WebKit2, OpenAndCloseWindow)
+TEST(WebKit, OpenAndCloseWindow)
 {
     resetToConsistentState();
 
@@ -139,7 +139,7 @@ TEST(WebKit2, OpenAndCloseWindow)
 
 @end
 
-TEST(WebKit2, OpenAndCloseWindowAsync)
+TEST(WebKit, OpenAndCloseWindowAsync)
 {
     resetToConsistentState();
 
@@ -157,7 +157,7 @@ TEST(WebKit2, OpenAndCloseWindowAsync)
     TestWebKitAPI::Util::run(&isDone);
 }
 
-TEST(WebKit2, OpenAsyncWithNil)
+TEST(WebKit, OpenAsyncWithNil)
 {
     resetToConsistentState();
 
@@ -177,7 +177,7 @@ TEST(WebKit2, OpenAsyncWithNil)
 }
 
 // https://bugs.webkit.org/show_bug.cgi?id=171083 - Try to figure out why this fails for some configs but not others, and resolve.
-//TEST(WebKit2, OpenAndCloseWindowAsyncCallbackException)
+//TEST(WebKit, OpenAndCloseWindowAsyncCallbackException)
 //{
 //    resetToConsistentState();
 //
@@ -228,7 +228,7 @@ TEST(WebKit2, OpenAsyncWithNil)
 
 @end
 
-TEST(WebKit2, OpenWindowFeatures)
+TEST(WebKit, OpenWindowFeatures)
 {
     resetToConsistentState();
 
index 2129047089ebb3cfea86ff78dc1677c2c31290e4..fc65772e122c9426d92192dc3b8f9ce76d360446 100644 (file)
@@ -33,7 +33,7 @@
 #import <WebKit/_WKExperimentalFeature.h>
 #import <wtf/RetainPtr.h>
 
-TEST(WebKit2, DefaultWKPreferences)
+TEST(WebKit, DefaultWKPreferences)
 {
     RetainPtr<WKPreferences> preferences = adoptNS([[WKPreferences alloc] init]);
 
@@ -42,7 +42,7 @@ TEST(WebKit2, DefaultWKPreferences)
     EXPECT_TRUE([preferences _isStandalone]);
 }
 
-TEST(WebKit2, LoadsImagesAutomatically)
+TEST(WebKit, LoadsImagesAutomatically)
 {
     RetainPtr<WKPreferences> preferences = adoptNS([[WKPreferences alloc] init]);
 
@@ -53,7 +53,7 @@ TEST(WebKit2, LoadsImagesAutomatically)
     EXPECT_TRUE([preferences _loadsImagesAutomatically]);
 }
 
-TEST(WebKit2, ExperimentalFeatures)
+TEST(WebKit, ExperimentalFeatures)
 {
     NSArray *features = [WKPreferences _experimentalFeatures];
     EXPECT_NOT_NULL(features);
index 9b40904b175bc3a3555216d7c9ba9b7140d9f222..8fd1d85b8a9a74d8cbf050fdf2f23b61a0a8589c 100644 (file)
@@ -40,7 +40,7 @@
 
 static bool isDone;
 
-TEST(WebKit2, RemoteObjectRegistry)
+TEST(WebKit, RemoteObjectRegistry)
 {
     @autoreleasepool {
         NSString * const testPlugInClassName = @"RemoteObjectRegistryPlugIn";
index c8a90f819d505a6c116210aa7620f484fca3184a..baf89ed8c5d87882af3733dde73425b780e9c9a4 100644 (file)
@@ -65,12 +65,12 @@ static void runTestWithWidth(NSNumber *width, CGSize expectedSize)
     Util::run(&testFinished);
 }
 
-TEST(WebKit2, NodeHandleRenderedImageExcludingOverflow)
+TEST(WebKit, NodeHandleRenderedImageExcludingOverflow)
 {
     runTestWithWidth(nil, { 720, 540 });
 }
 
-TEST(WebKit2, NodeHandleRenderedImageWithWidth)
+TEST(WebKit, NodeHandleRenderedImageWithWidth)
 {
     runTestWithWidth(@(-1), { 0, 0 });
     runTestWithWidth(@0, { 0, 0 });
index 114a92ef45e2ca8d72dd8129d30c710fe2f834f9..2104bc4239da2ebd1bd6f1b6a8fb3e37e2dae8c3 100644 (file)
@@ -52,7 +52,7 @@ static NSString * const expectedFileName = @"这是中文";
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, RunOpenPanelNonLatin1)
+TEST(WebKit, RunOpenPanelNonLatin1)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
     auto uiDelegate = adoptNS([[RunOpenPanelUIDelegate alloc] init]);
index 1ac3d923da14714f7da9f82956ccbb5dc403c73c..a1263e7608e7a5ce0d995a0082c5056512a7471b 100644 (file)
@@ -70,7 +70,7 @@ static RetainPtr<WKWebView> newWebView;
 
 @end
 
-TEST(WebKit2, ShouldOpenExternalURLsInWindowOpen)
+TEST(WebKit, ShouldOpenExternalURLsInWindowOpen)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -131,7 +131,7 @@ TEST(WebKit2, ShouldOpenExternalURLsInWindowOpen)
     action = nullptr;
 }
 
-TEST(WebKit2, ShouldOpenExternalURLsInTargetedLink)
+TEST(WebKit, ShouldOpenExternalURLsInTargetedLink)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
@@ -208,7 +208,7 @@ TEST(WebKit2, ShouldOpenExternalURLsInTargetedLink)
     action = nullptr;
 }
 
-TEST(WebKit2, RestoreShouldOpenExternalURLsPolicyAfterCrash)
+TEST(WebKit, RestoreShouldOpenExternalURLsPolicyAfterCrash)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
     auto window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
index ec51b963830bd7a3c71072be6e448d6ae55ee78e..eaad3c93d660a087c517976a51f1c3f8d26b4fae 100644 (file)
@@ -36,7 +36,7 @@ static bool shrinkToFitDone;
 static bool shrinkToFitAfterNavigationDone;
 static bool shrinkToFitDisabledDone;
 
-TEST(WebKit2, ShrinkToFit)
+TEST(WebKit, ShrinkToFit)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
index 1c8fdbc346a3bd9f500e2bfd9eeb0f8748d5792a..1928031658a853cb0b6365e6d3965ecad429b712 100644 (file)
@@ -59,7 +59,7 @@ static bool done;
 
 @end
 
-TEST(WebKit2, WKWebViewIsPlayingAudio)
+TEST(WebKit, WKWebViewIsPlayingAudio)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:[[[WKWebViewConfiguration alloc] init] autorelease]]);
     auto observer = adoptNS([[AudioObserver alloc] init]);
@@ -109,7 +109,7 @@ static RetainPtr<UITestDelegate> delegate;
 
 @end
 
-TEST(WebKit2, ShowWebView)
+TEST(WebKit, ShowWebView)
 {
     delegate = adoptNS([[UITestDelegate alloc] init]);
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
@@ -148,7 +148,7 @@ bool firstToolbarDone;
 
 @end
 
-TEST(WebKit2, ToolbarVisible)
+TEST(WebKit, ToolbarVisible)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:[[[WKWebViewConfiguration alloc] init] autorelease]]);
     auto delegate = adoptNS([[ToolbarDelegate alloc] init]);
@@ -180,7 +180,7 @@ static bool readyForClick;
 
 @end
 
-TEST(WebKit2, ClickAutoFillButton)
+TEST(WebKit, ClickAutoFillButton)
 {
     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"ClickAutoFillButton"];
 
@@ -226,7 +226,7 @@ static _WKFocusDirection takenDirection;
 
 @end
 
-TEST(WebKit2, Focus)
+TEST(WebKit, Focus)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
     auto delegate = adoptNS([[FocusDelegate alloc] init]);
@@ -267,7 +267,7 @@ TEST(WebKit2, Focus)
 
 @end
 
-TEST(WebKit2, SaveDataToFile)
+TEST(WebKit, SaveDataToFile)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
     auto delegate = adoptNS([[SaveDataToFileDelegate alloc] init]);
@@ -315,7 +315,7 @@ static void synthesizeWheelEvents(NSView *view, int x, int y)
 
 @end
 
-TEST(WebKit2, DidNotHandleWheelEvent)
+TEST(WebKit, DidNotHandleWheelEvent)
 {
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
     auto delegate = adoptNS([[WheelDelegate alloc] init]);
index 871368ea2b7011bb4186ad59e4c919468dcb1ca3..b3b2ec82c1d7cf069f7bd8ffcb122b75783a1e21 100644 (file)
@@ -51,7 +51,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, VisibleContentRect_FullBounds)
+TEST(WebKit, VisibleContentRect_FullBounds)
 {
     auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebViewWithEnclosingView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:config.get()]);
@@ -59,7 +59,7 @@ TEST(WebKit2, VisibleContentRect_FullBounds)
     EXPECT_TRUE(CGRectEqualToRect([webView _visibleContentRect], CGRectMake(0, 0, 800, 600)));
 }
 
-TEST(WebKit2, VisibleContentRect_FullBoundsWithinScrollView)
+TEST(WebKit, VisibleContentRect_FullBoundsWithinScrollView)
 {
     auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebViewWithEnclosingView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:config.get()]);
@@ -71,7 +71,7 @@ TEST(WebKit2, VisibleContentRect_FullBoundsWithinScrollView)
     EXPECT_TRUE(CGRectEqualToRect([webView _visibleContentRect], CGRectMake(0, 0, 800, 600)));
 }
 
-TEST(WebKit2, VisibleContentRect_FullBoundsWhenClippedByNonScrollView)
+TEST(WebKit, VisibleContentRect_FullBoundsWhenClippedByNonScrollView)
 {
     auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebViewWithEnclosingView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:config.get()]);
@@ -85,7 +85,7 @@ TEST(WebKit2, VisibleContentRect_FullBoundsWhenClippedByNonScrollView)
     EXPECT_TRUE(CGRectEqualToRect([webView _visibleContentRect], CGRectMake(0, 0, 1000, 800)));
 }
 
-TEST(WebKit2, VisibleContentRect_ClippedBoundsWhenClippedByScrollView)
+TEST(WebKit, VisibleContentRect_ClippedBoundsWhenClippedByScrollView)
 {
     CGRect windowBounds = CGRectMake(0, 0, 800, 600);
     auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
@@ -102,7 +102,7 @@ TEST(WebKit2, VisibleContentRect_ClippedBoundsWhenClippedByScrollView)
     EXPECT_TRUE(CGRectEqualToRect([webView _visibleContentRect], CGRectMake(150, 150, 800, 600)));
 }
 
-TEST(WebKit2, VisibleContentRect_ClippedBoundsWhenClippedByEnclosingView)
+TEST(WebKit, VisibleContentRect_ClippedBoundsWhenClippedByEnclosingView)
 {
     auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebViewWithEnclosingView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:config.get()]);
index e3df4d6f98ceba87f5cdfb35acc1b97f107202f4..34c62686ede5834a477441a10b989bb3beadd868 100644 (file)
@@ -48,7 +48,7 @@ static UIView *recursiveFindWKContentView(UIView *view)
     return nil;
 }
 
-TEST(WebKit2, WKContentViewEditingActions)
+TEST(WebKit, WKContentViewEditingActions)
 {
     [UIPasteboard generalPasteboard].items = @[];
 
index 6248dd955f2f3dc7c4b5cf3d18d58e98df267c0f..c10a8f98a630a48412ed0807c6bbb4ab9e27f7f2 100644 (file)
@@ -44,7 +44,7 @@
 
 @end
 
-TEST(WebKit2, WKContentViewTargetForAction)
+TEST(WebKit, WKContentViewTargetForAction)
 {
     auto webView = adoptNS([[TestWKContentViewTargetForActionView alloc] init]);
     [webView synchronouslyLoadTestPageNamed:@"rich-and-plain-text"];
index ad10ee3371cc65ec6ad9366023c0cc9c0b1a2da6..015271b3942f28a2e4c349ac97e1231c06a14e03 100644 (file)
@@ -182,12 +182,12 @@ static void runTestWithWebsiteDataStore(WKWebsiteDataStore* dataStore)
     [globalCookieStore removeObserver:observer2.get()];
 }
 
-TEST(WebKit2, WKHTTPCookieStore)
+TEST(WebKit, WKHTTPCookieStore)
 {
     runTestWithWebsiteDataStore([WKWebsiteDataStore defaultDataStore]);
 }
 
-TEST(WebKit2, WKHTTPCookieStoreNonPersistent)
+TEST(WebKit, WKHTTPCookieStoreNonPersistent)
 {
     RetainPtr<WKWebsiteDataStore> nonPersistentDataStore;
     @autoreleasepool {
@@ -197,7 +197,7 @@ TEST(WebKit2, WKHTTPCookieStoreNonPersistent)
     runTestWithWebsiteDataStore(nonPersistentDataStore.get());
 }
 
-TEST(WebKit2, WKHTTPCookieStoreCustom)
+TEST(WebKit, WKHTTPCookieStoreCustom)
 {
     NSURL *cookieStorageFile = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/CookieStorage/Cookie.File" stringByExpandingTildeInPath] isDirectory:NO];
     NSURL *idbPath = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/IndexedDB/" stringByExpandingTildeInPath] isDirectory:YES];
@@ -216,7 +216,7 @@ TEST(WebKit2, WKHTTPCookieStoreCustom)
     runTestWithWebsiteDataStore(customDataStore.get());
 }
 
-TEST(WebKit2, CookieObserverCrash)
+TEST(WebKit, CookieObserverCrash)
 {
     RetainPtr<WKWebsiteDataStore> nonPersistentDataStore;
     @autoreleasepool {
@@ -256,7 +256,7 @@ static bool finished;
 }
 @end
 
-TEST(WebKit2, WKHTTPCookieStoreWithoutProcessPool)
+TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
 {
     NSHTTPCookie *cookie = [NSHTTPCookie cookieWithProperties:[NSDictionary dictionaryWithObjectsAndKeys:@"127.0.0.1", NSHTTPCookieDomain, @"/", NSHTTPCookiePath, @"cookiename", NSHTTPCookieName, @"cookievalue", NSHTTPCookieValue, [NSDate distantFuture], NSHTTPCookieExpires, nil]];
     NSString *alertCookieHTML = @"<script>alert('cookie:'+document.cookie);</script>";
index fbde0d3f1f9c4d0a13698aca1312f79e5d8d0d11..c01a606363145ca8252cd584d9cd8e4c830e7666 100644 (file)
@@ -34,7 +34,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKNSNumber)
+TEST(WebKit, WKNSNumber)
 {
     auto booleanRef = adoptWK(WKBooleanCreate(true));
     auto uint64Ref = adoptWK(WKUInt64Create(39));
index 98f2b6bf6158ba59ed0843ab27877b50104957fd..c4354ebb3f03bb694df4db6a5418ce683685114b 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, WKObject)
+TEST(WebKit, WKObject)
 {
     WKStringRef stringRef = WKStringCreateWithUTF8CString("just testing");
     ASSERT_TRUE([@"just testing" isEqualToString:(NSString *)stringRef]);
@@ -50,7 +50,7 @@ TEST(WebKit2, WKObject)
     ASSERT_EQ((id)0, weakString);
 }
 
-TEST(WebKit2, WKObject_classMethods)
+TEST(WebKit, WKObject_classMethods)
 {
     Class wkObjectClass = NSClassFromString(@"WKObject");
     ASSERT_NE((Class)0, wkObjectClass);
@@ -58,7 +58,7 @@ TEST(WebKit2, WKObject_classMethods)
     ASSERT_TRUE([wkObjectClass conformsToProtocol:@protocol(NSObject)]);
 }
 
-TEST(WebKit2, WKObject_classInDictionary)
+TEST(WebKit, WKObject_classInDictionary)
 {
     Class wkObjectClass = NSClassFromString(@"WKObject");
     ASSERT_NE((Class)0, wkObjectClass);
index 0740c970669a106885bf006aa34ba81c5c076dea..9539cfbfd7dbf8637863a42fe8059ae6e0541c85 100644 (file)
@@ -35,7 +35,7 @@
 
 static bool finishedDispatch;
 
-TEST(WebKit2, WKPDFViewResizeCrash)
+TEST(WebKit, WKPDFViewResizeCrash)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
index a9171f2a382df5571e7d70c9099ae6c46b511651..f9c1fedec2bf12c444ab52ecdca1ffe7dbc43ad2 100644 (file)
@@ -33,7 +33,7 @@
 
 #if WK_API_ENABLED && PLATFORM(IOS)
 
-TEST(WebKit2, WKPDFViewStablePresentationUpdateCallback)
+TEST(WebKit, WKPDFViewStablePresentationUpdateCallback)
 {
     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
 
index 28303a6fe762b2cc2c2117aadfc53e8e3ac78a6d..75aa8706d5bc18c660d9daa78fb3d2458fe5a903 100644 (file)
@@ -47,7 +47,7 @@ static void checkElementTypeAndBoundingRect(_WKActivatedElementInfo *elementInfo
     EXPECT_EQ(expectedType, elementInfo.type);
 }
     
-TEST(WebKit2, RequestActivatedElementInfoForLink)
+TEST(WebKit, RequestActivatedElementInfoForLink)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
     [webView loadHTMLString:@"<html><head><meta name='viewport' content='initial-scale=1'></head><body style = 'margin: 0px;'><a href='testURL.test' style='display: block; height: 100%;' title='HitTestLinkTitle' id='testID'></a></body></html>" baseURL:nil];
@@ -72,7 +72,7 @@ TEST(WebKit2, RequestActivatedElementInfoForLink)
     TestWebKitAPI::Util::run(&finished);
 }
     
-TEST(WebKit2, RequestActivatedElementInfoForBlank)
+TEST(WebKit, RequestActivatedElementInfoForBlank)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
     [webView loadHTMLString:@"<html><head><meta name='viewport' content='initial-scale=1'></head><body style = 'margin: 0px;'></body></html>" baseURL:nil];
@@ -91,7 +91,7 @@ TEST(WebKit2, RequestActivatedElementInfoForBlank)
     TestWebKitAPI::Util::run(&finished);
 }
     
-TEST(WebKit2, RequestActivatedElementInfoWithNestedSynchronousUpdates)
+TEST(WebKit, RequestActivatedElementInfoWithNestedSynchronousUpdates)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
     [webView synchronouslyLoadHTMLString:@"<meta name='viewport' content='initial-scale=1'><style>body { margin:0 } a { display:block; width:200px; height:200px }</style><a href='https://www.apple.com'>FOO</a>"];
@@ -115,7 +115,7 @@ TEST(WebKit2, RequestActivatedElementInfoWithNestedSynchronousUpdates)
     TestWebKitAPI::Util::run(&finished);
 }
 
-TEST(WebKit2, RequestActivatedElementInfoWithNestedRequests)
+TEST(WebKit, RequestActivatedElementInfoWithNestedRequests)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
     [webView synchronouslyLoadTestPageNamed:@"image-and-contenteditable"];
index 306ac0c3b461c6552db7de8999c09f2d8226a953..da6f0caee63f05f9f644c42fa9b8f16d62e9d7bd 100644 (file)
@@ -114,7 +114,7 @@ static void runTest(_WKWebGLLoadPolicy first, _WKWebGLLoadPolicy second = _WKWeb
     TestWebKitAPI::Util::run(&testComplete);
 }
 
-TEST(WebKit2, WebGLPolicy)
+TEST(WebKit, WebGLPolicy)
 {
     htmlURL = [NSURL URLWithString:@"test:///html"];
     
index 7a9d40f9ac4843791499b491829af19681d58c40..486c6cf92d8fef35708a9ec33b3805b7f63b49b1 100644 (file)
@@ -68,7 +68,7 @@ static WKScriptMessage *getNextMessage()
     return [[scriptMessages.takeFirst() retain] autorelease];
 }
 
-TEST(WebKit2, WebsiteDataStoreCustomPaths)
+TEST(WebKit, WebsiteDataStoreCustomPaths)
 {
     RetainPtr<WebsiteDataStoreCustomPathsMessageHandler> handler = adoptNS([[WebsiteDataStoreCustomPathsMessageHandler alloc] init]);
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
index af3f616e93ec644ee37460af2552fc1249e84055..eaa919b284d5825714e789374c339ee8ef717c40 100644 (file)
@@ -125,7 +125,7 @@ static size_t alertCount;
 
 @end
 
-TEST(WebKit2, WebsitePoliciesContentBlockersEnabled)
+TEST(WebKit, WebsitePoliciesContentBlockersEnabled)
 {
     [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
 
@@ -197,7 +197,7 @@ TEST(WebKit2, WebsitePoliciesContentBlockersEnabled)
 
 @end
 
-TEST(WebKit2, WebsitePoliciesAutoplayEnabled)
+TEST(WebKit, WebsitePoliciesAutoplayEnabled)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
 
@@ -298,7 +298,7 @@ static void runUntilReceivesAutoplayEvent(WKAutoplayEvent event)
         CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true);
 }
 
-TEST(WebKit2, WebsitePoliciesPlayAfterPreventedAutoplay)
+TEST(WebKit, WebsitePoliciesPlayAfterPreventedAutoplay)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 336, 276) configuration:configuration.get()]);
@@ -366,7 +366,7 @@ TEST(WebKit2, WebsitePoliciesPlayAfterPreventedAutoplay)
     ASSERT_TRUE(*receivedAutoplayEventFlags & kWKAutoplayEventFlagsHasAudio);
 }
 
-TEST(WebKit2, WebsitePoliciesPlayingWithoutInterference)
+TEST(WebKit, WebsitePoliciesPlayingWithoutInterference)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 336, 276) configuration:configuration.get()]);
@@ -385,7 +385,7 @@ TEST(WebKit2, WebsitePoliciesPlayingWithoutInterference)
     ASSERT_TRUE(*receivedAutoplayEventFlags & kWKAutoplayEventFlagsHasAudio);
 }
 
-TEST(WebKit2, WebsitePoliciesUserInterferenceWithPlaying)
+TEST(WebKit, WebsitePoliciesUserInterferenceWithPlaying)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 336, 276) configuration:configuration.get()]);
@@ -509,7 +509,7 @@ struct ParsedRange {
 
 @end
 
-TEST(WebKit2, WebsitePoliciesDuringRedirect)
+TEST(WebKit, WebsitePoliciesDuringRedirect)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto videoData = adoptNS([[NSData alloc] initWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"test" withExtension:@"mp4" subdirectory:@"TestWebKitAPI.resources"]]);
@@ -529,7 +529,7 @@ TEST(WebKit2, WebsitePoliciesDuringRedirect)
     [webView waitForMessage:@"autoplayed"];
 }
 
-TEST(WebKit2, WebsitePoliciesUpdates)
+TEST(WebKit, WebsitePoliciesUpdates)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
@@ -565,7 +565,7 @@ TEST(WebKit2, WebsitePoliciesUpdates)
     runUntilReceivesAutoplayEvent(kWKAutoplayEventDidPreventFromAutoplaying);
 }
 
-TEST(WebKit2, WebsitePoliciesAutoplayQuirks)
+TEST(WebKit, WebsitePoliciesAutoplayQuirks)
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
index 7ae266cc552a2c223661e32dec1ac3f5d17471ef..20e50c013fb5f373ed787d82269e0af1924ed150 100644 (file)
@@ -59,7 +59,7 @@ static bool didBeginPlaying = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, AudioSessionCategoryIOS)
+TEST(WebKitLegacy, AudioSessionCategoryIOS)
 {
     WebCore::Settings::setShouldManageAudioSessionCategory(true);
     RetainPtr<UIWindow> uiWindow = adoptNS([[UIWindow alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
index 80915cc3644c715ea1e6af891fcfe945b734c38e..38f9e5b26d86f78df046169acc2e38c2e7eb33a6 100644 (file)
@@ -60,7 +60,7 @@ static NSInteger getPixelIndex(NSInteger x, NSInteger y, NSInteger width)
     return (y * width + x) * 4;
 }
 
-TEST(WebKit1, RenderInContextSnapshot)
+TEST(WebKitLegacy, RenderInContextSnapshot)
 {
     const NSInteger width = 800;
     const NSInteger height = 600;
index 0796b2a9eddfcbde43bcd490c9928d2b74d8a5d8..600e3bc11db39793bfe891f6d11524d5dd21cc4b 100644 (file)
@@ -40,7 +40,7 @@ static bool testFinished = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, PreventImageLoadWithAutoResizingTest)
+TEST(WebKit, PreventImageLoadWithAutoResizingTest)
 {
     WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DenyWillSendRequestTest"));
     PlatformWebView webView(context.get());
index c17dd813098c840a3648997fda5fba391cb3274f..a2755c0da3eff9826d9300c71453b63010ed31be 100644 (file)
@@ -29,7 +29,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, MemoryCacheAddImageToCache)
+TEST(WebKitLegacy, MemoryCacheAddImageToCache)
 {
     CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
     uint32_t pixel = 0;
index 6a7a2b597cee65ea9fc32ea3c42d88fbe565b698..27cbf1f564017c1e9d173ffb1e13d8956be2bd08 100644 (file)
@@ -52,7 +52,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, ReloadBackForward)
+TEST(WebKitLegacy, ReloadBackForward)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<BackForwardListTest> testController = adoptNS([BackForwardListTest new]);
index 18076b2516f1fc0edbe620157c6a840f9952b6a2..98196a7f75f8106196d83c248e8bb374ad2a8e77 100644 (file)
@@ -60,7 +60,7 @@ static bool didFinishLoad = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, CancelLoadFromResourceLoadDelegate)
+TEST(WebKitLegacy, CancelLoadFromResourceLoadDelegate)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index 422ab4ab4b96fddbb7b56e799f69bfd6d78761a2..9b6b241454a3972b49d6605eb9d15abe5e33952d 100644 (file)
@@ -67,7 +67,7 @@ static bool testFinished = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, CloseNewWindowInNavigationPolicyDelegate)
+TEST(WebKitLegacy, CloseNewWindowInNavigationPolicyDelegate)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index d95763944c6f92ec54f37223a9e56987c4c621e0..8350f4b1c93872f420d1795a41f0b7bc16ad7bb5 100644 (file)
@@ -86,8 +86,7 @@ static void contextMenuCopyLink(WebView* webView, int itemIndex)
     }
 }
 
-
-TEST(WebKit1, ContextMenuCanCopyURL)
+TEST(WebKitLegacy, ContextMenuCanCopyURL)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0,0,800,600) frameName:nil groupName:nil]);
     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
index 58f0217bc8d6f5bf6a6807d52d6f9982df77650a..dfbf12020d723678cece25ff62341ac84b9319a8 100644 (file)
@@ -47,7 +47,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, ContextMenuDefaultItemsHaveTags)
+TEST(WebKitLegacy, ContextMenuDefaultItemsHaveTags)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) frameName:nil groupName:nil]);
     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(100, 100, 800, 600) styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:YES]);
index e841737e54aabafd33ccc0b169b0852c4934145c..6d52d29cf3fdd4846ccce36a5d36ab1e2ba354f3 100644 (file)
@@ -87,7 +87,7 @@ void cleanUp()
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, CrossPartitionFileSchemeAccess)
+TEST(WebKitLegacy, CrossPartitionFileSchemeAccess)
 {
     NSURL *url = [[NSBundle mainBundle] URLForResource:@"CrossPartitionFileSchemeAccess" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
     const char *filePath = [url fileSystemRepresentation];
index b3e48a631ba721af9a6a8347f0e36691a4ca7c66..132cc7b9830de2545243570304fe3a7c96dd67dc 100644 (file)
@@ -54,7 +54,7 @@ static void expectCellAboveCell(DOMDocument *document, NSString *cellID, NSStrin
     EXPECT_WK_STREQ(cellAboveID, [cellAbove getAttribute:@"id"]);
 }
 
-TEST(WebKit1, HTMLTableCellElementCellAbove)
+TEST(WebKitLegacy, HTMLTableCellElementCellAbove)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<HTMLTableCellElementCellAboveTest> testController = adoptNS([HTMLTableCellElementCellAboveTest new]);
index effb4403646f8141473a1707dd6da1071c11d31b..8a8c255e41904c6272ce07d0b3f7e3b8fa8d7f65 100644 (file)
@@ -47,7 +47,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DOMHTMLVideoElementWrapper)
+TEST(WebKitLegacy, DOMHTMLVideoElementWrapper)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<VideoWrapperFrameLoadDelegate> frameLoadDelegate = adoptNS([VideoWrapperFrameLoadDelegate new]);
index 48b49ea82f38c0ccabf031cd40927c62a671c3a1..187a7a5ebbd3dc77bfd1ad1899bb3274c91dea52 100644 (file)
@@ -46,7 +46,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DOMNodeCompareDocumentPosition)
+TEST(WebKitLegacy, DOMNodeCompareDocumentPosition)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<DOMNodeTest> testController = adoptNS([DOMNodeTest new]);
index 7bd23ea98e657b0de078e4ea6af688b35ac2213f..f5c83df33fc3f35d52c0366234ddb33815734042 100644 (file)
@@ -33,7 +33,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DOMNodeFromJSObject)
+TEST(WebKitLegacy, DOMNodeFromJSObject)
 {
     WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];
 
index f28337b5244eb865548b88cb89c4cb5e07535f80..804b76be8344a4a618ef9a99f4d3943631066428 100644 (file)
@@ -46,7 +46,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DOMRangeOfString)
+TEST(WebKitLegacy, DOMRangeOfString)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);
     RetainPtr<DOMRangeOfStringFrameLoadDelegate> frameLoadDelegate = adoptNS([DOMRangeOfStringFrameLoadDelegate new]);
index 220c51e511b93889acfb0d0d379a960c2a991f16..c5bdf5b7eeaffeeeafe5541f1a0f0fbe70375a26 100644 (file)
@@ -50,7 +50,7 @@ static NSDictionary *regions;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DeviceScaleFactorInDashboardRegions)
+TEST(WebKitLegacy, DeviceScaleFactorInDashboardRegions)
 {
     NSRect viewFrame = NSMakeRect(0, 0, 800, 600);
     RetainPtr<SyntheticBackingScaleFactorWindow> window = adoptNS([[SyntheticBackingScaleFactorWindow alloc] initWithContentRect:viewFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
index d142814ab26cb7040537744a545450585dac638a..b635d8a396c613ccc5d8dff4f005c6cade47e03f 100644 (file)
@@ -78,7 +78,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, EarlyKVOCrash)
+TEST(WebKitLegacy, EarlyKVOCrash)
 {
     auto webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);
     auto earlyKVOCrashResponder = adoptNS([[EarlyKVOCrashResponder alloc] initWithWebView:webView.get()]);
index 05746f67b7d0a99a635d9cff64157a758bd9078b..2933a4af178d376e2976023673127e6f0ef0e65a 100644 (file)
@@ -44,7 +44,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, ElementAtPoint)
+TEST(WebKitLegacy, ElementAtPoint)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<ElementAtPointFrameLoadDelegate> frameLoadDelegate = adoptNS([[ElementAtPointFrameLoadDelegate alloc] init]);
index 19e71b53e01a624a1ec359d1c51993b61ce3a1c2..af50604e5ce514482b3e7d6da668450cff4ca177 100644 (file)
@@ -41,7 +41,7 @@ static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     didFinishLoad = true;
 }
 
-TEST(WebKit2, FirstResponderScrollingPosition)
+TEST(WebKit, FirstResponderScrollingPosition)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
 
index d3f894659f6f8e789c5368030e070fc73e3b085d..aa54459fb256fc1687f7d9374a9ddde43e6a71d9 100644 (file)
@@ -45,7 +45,7 @@ static bool finishedLoad = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit2, FirstResponderSuppression)
+TEST(WebKit, FirstResponderSuppression)
 {
     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
     [window makeKeyAndOrderFront:nil];
index 681e1b2cdcb46dd40668551626fbd4a78dfe4ba1..715b91af646289f10789b1620f976e6efeb4b3df 100644 (file)
@@ -110,7 +110,7 @@ static bool testFinished;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, FragmentNavigation)
+TEST(WebKitLegacy, FragmentNavigation)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
index 973bd16e69a359e3f9afb9de476b92530fde8763..5763fc1137adfa3f72f0a43e4bd9fca59e613f54 100644 (file)
@@ -48,7 +48,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, HTMLCollectionNamedItemTest)
+TEST(WebKitLegacy, HTMLCollectionNamedItemTest)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<HTMLCollectionNamedItemTest> testController = adoptNS([HTMLCollectionNamedItemTest new]);
index 2f5d68c2053d2006b827ef417a1aff87c68cceb2..a704f8055dc791f0a92f9ed2aa6d6a5340de597a 100644 (file)
@@ -48,7 +48,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, HTMLFormCollectionNamedItemTest)
+TEST(WebKitLegacy, HTMLFormCollectionNamedItemTest)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<HTMLFormCollectionNamedItemTest> testController = adoptNS([HTMLFormCollectionNamedItemTest new]);
index 082a69093623e225bcc638552075adc9388647bd..25dfd34d645c34d77ad428eb077f0f109e41770f 100644 (file)
@@ -50,7 +50,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, InspectorBarTest)
+TEST(WebKitLegacy, InspectorBarTest)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<InspectorBarController> inspectorBarController = adoptNS([InspectorBarController new]);
index 94b635fe3565956f33d15e5c5e3ff7c855a2c075..eed79722aad0ee4c9aacc6a20c47cc849043fb77 100644 (file)
@@ -81,7 +81,7 @@ namespace TestWebKitAPI {
 
 #if WK_API_ENABLED
 
-TEST(WebKit2, IsNavigationActionTrusted)
+TEST(WebKit, IsNavigationActionTrusted)
 {
     @autoreleasepool {
         RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
@@ -99,7 +99,7 @@ TEST(WebKit2, IsNavigationActionTrusted)
 
 #endif
 
-TEST(WebKit1, IsNavigationActionTrusted)
+TEST(WebKitLegacy, IsNavigationActionTrusted)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] init]);
index 32b5d2ff0c37952de93c4a994e264ca983b964ba..69fb5921880b48a2c8c4c0036e93e46e183baf2c 100644 (file)
@@ -50,7 +50,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, JSWrapperForNode)
+TEST(WebKitLegacy, JSWrapperForNode)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<JSWrapperForNodeFrameLoadDelegate> frameLoadDelegate = adoptNS([[JSWrapperForNodeFrameLoadDelegate alloc] init]);
index dd821fc673c088854314dfc4f6afcd96e2e0b59b..b8aa0b3306ef2da7486cb1c77581185f95fc8ade 100644 (file)
@@ -58,7 +58,7 @@ static size_t maxTitleLength = 4096;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, LimitTitleSize)
+TEST(WebKitLegacy, LimitTitleSize)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<LimitTitleSizeTest> testController = adoptNS([LimitTitleSizeTest new]);
index f3da4896b97d280e38a0775dcb737547b28052ef..6dd5e1eaa016e87d8ce76975c9517f9c0b24a7dc 100644 (file)
@@ -62,7 +62,7 @@ static bool didFailProvisionalLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, LoadInvalidURLRequest)
+TEST(WebKitLegacy, LoadInvalidURLRequest)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] init]);
index a7a34994157dda417d98037ff34b72132c2b01f5..fccfbadc815dccb3f882590e58c3eba48adfc419 100644 (file)
@@ -141,7 +141,7 @@ static bool hasAssertionType(CFStringRef type)
     return false;
 }
 
-TEST(WebKit1, MediaPlaybackSleepAssertion)
+TEST(WebKitLegacy, MediaPlaybackSleepAssertion)
 {
     didFinishLoad = false;
     didBeginPlaying = false;
index 828e83a2647f96ac8f4768b2f862a8dfbd13250e..d561dcb662987d536d7d35771795edeaa7fa4037 100644 (file)
@@ -70,7 +70,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, MemoryCacheDisableWithinResourceLoadDelegate)
+TEST(WebKitLegacy, MemoryCacheDisableWithinResourceLoadDelegate)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index 3977bf40bec380f52fbc2f575000d450d06a9842..75c6fa3e8049211e2e70c53dc2acb7677be19c09 100644 (file)
@@ -75,7 +75,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DISABLED_MemoryCachePruneWithinResourceLoadDelegate)
+TEST(WebKitLegacy, DISABLED_MemoryCachePruneWithinResourceLoadDelegate)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index 8d9b8860b05f26a4f65b379ff9a49c1c0ae0def1..1d7bbd516aeec98f4ffa3f68fa1bd153b48a449e 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, MemoryPressureHandler)
+TEST(WebKitLegacy, MemoryPressureHandler)
 {
     WebInstallMemoryPressureHandler();
     [[[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil] autorelease];
index 00e8f8d7d891122f7fe695075401169ac19d71de..700254e4dafcb72fcb6644099ba5ea7f3843eed0 100644 (file)
@@ -63,77 +63,77 @@ static void buildAndPerformTest(NSEventType buttonEvent, NSEventModifierFlags mo
         EXPECT_EQ(expectedMenu, [NSMenu menuTypeForEvent:event]);
 }
 
-TEST(WebKit1, MenuAndButtonForNormalLeftClick)
+TEST(WebKitLegacy, MenuAndButtonForNormalLeftClick)
 {
     buildAndPerformTest(NSEventTypeLeftMouseDown, 0, WebCore::LeftButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForNormalRightClick)
+TEST(WebKitLegacy, MenuAndButtonForNormalRightClick)
 {
     buildAndPerformTest(NSEventTypeRightMouseDown, 0, WebCore::RightButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForNormalMiddleClick)
+TEST(WebKitLegacy, MenuAndButtonForNormalMiddleClick)
 {
     buildAndPerformTest(NSEventTypeOtherMouseDown, 0, WebCore::MiddleButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForControlLeftClick)
+TEST(WebKitLegacy, MenuAndButtonForControlLeftClick)
 {
     buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagControl, WebCore::LeftButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForControlRightClick)
+TEST(WebKitLegacy, MenuAndButtonForControlRightClick)
 {
     buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagControl, WebCore::RightButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForControlMiddleClick)
+TEST(WebKitLegacy, MenuAndButtonForControlMiddleClick)
 {
     buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagControl, WebCore::MiddleButton, NSMenuTypeNone);
 }
     
-TEST(WebKit1, MenuAndButtonForShiftLeftClick)
+TEST(WebKitLegacy, MenuAndButtonForShiftLeftClick)
 {
     buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagShift, WebCore::LeftButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForShiftRightClick)
+TEST(WebKitLegacy, MenuAndButtonForShiftRightClick)
 {
     buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagShift, WebCore::RightButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForShiftMiddleClick)
+TEST(WebKitLegacy, MenuAndButtonForShiftMiddleClick)
 {
     buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagShift, WebCore::MiddleButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForCommandLeftClick)
+TEST(WebKitLegacy, MenuAndButtonForCommandLeftClick)
 {
     buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagCommand, WebCore::LeftButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForCommandRightClick)
+TEST(WebKitLegacy, MenuAndButtonForCommandRightClick)
 {
     buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagCommand, WebCore::RightButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForCommandMiddleClick)
+TEST(WebKitLegacy, MenuAndButtonForCommandMiddleClick)
 {
     buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagCommand, WebCore::MiddleButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForAltLeftClick)
+TEST(WebKitLegacy, MenuAndButtonForAltLeftClick)
 {
     buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagOption, WebCore::LeftButton, NSMenuTypeNone);
 }
 
-TEST(WebKit1, MenuAndButtonForAltRightClick)
+TEST(WebKitLegacy, MenuAndButtonForAltRightClick)
 {
     buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagOption, WebCore::RightButton, NSMenuTypeContextMenu);
 }
 
-TEST(WebKit1, MenuAndButtonForAltMiddleClick)
+TEST(WebKitLegacy, MenuAndButtonForAltMiddleClick)
 {
     buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagOption, WebCore::MiddleButton, NSMenuTypeNone);
 }
index 56ea67eaee0758624470d145434c2979f290f8cd..1327774f40d533886a3a0da8752a7544738187df 100644 (file)
@@ -90,7 +90,7 @@ NSArray *tests = @[
     @[@"fr-CA", @"fr-CA"],
 ];
 
-TEST(WebKit1, NavigatorLanguage)
+TEST(WebKitLegacy, NavigatorLanguage)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);
     RetainPtr<NavigatorLanguageDelegate> frameLoadDelegate = adoptNS([NavigatorLanguageDelegate new]);
index 35a5d9e505f53c084cea3defa44b266d9f964d74..c94b28bf201ef6741f6af2bdf5a7b3ec5dd569af 100644 (file)
@@ -46,7 +46,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, RenderedImageFromDOMNode)
+TEST(WebKitLegacy, RenderedImageFromDOMNode)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400) frameName:nil groupName:nil]);
     RetainPtr<RenderedImageFromDOMNodeFrameLoadDelegate> frameLoadDelegate = adoptNS([RenderedImageFromDOMNodeFrameLoadDelegate new]);
index 66fee63c290d6ee980e3664c9306e2b4a3eaf6d3..339a7f708f788fef5dc2cc289f70aee2a28840b7 100644 (file)
@@ -46,7 +46,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, RenderedImageFromDOMRange)
+TEST(WebKitLegacy, RenderedImageFromDOMRange)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<RenderedImageFromDOMRangeFrameLoadDelegate> frameLoadDelegate = adoptNS([RenderedImageFromDOMRangeFrameLoadDelegate new]);
index 889c6d07bc9d0fd75e3dac12bbd317a468420a70..dd6f3dc95e449527b5a808e141edf67281b477f5 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, SetAndUpdateCacheModelInitialModel)
+TEST(WebKitLegacy, SetAndUpdateCacheModelInitialModel)
 {
     EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 
@@ -44,7 +44,7 @@ TEST(WebKit1, SetAndUpdateCacheModelInitialModel)
     EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 }
 
-TEST(WebKit1, SetAndUpdateCacheModelStandardPreferenceChange)
+TEST(WebKitLegacy, SetAndUpdateCacheModelStandardPreferenceChange)
 {
     EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 
@@ -58,7 +58,7 @@ TEST(WebKit1, SetAndUpdateCacheModelStandardPreferenceChange)
     EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
 }
 
-TEST(WebKit1, SetAndUpdateCacheModelPreferencesChangeMix)
+TEST(WebKitLegacy, SetAndUpdateCacheModelPreferencesChangeMix)
 {
     // On change, the cache model always take the highest value of any preference bound to a WebView.
     EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
index f19a377cc088016410d62649e09f00503482f8c2..e1f9cabe73029adc77a3c692798a1226aca176c2 100644 (file)
@@ -47,7 +47,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, SetDocumentURITestFile)
+TEST(WebKitLegacy, SetDocumentURITestFile)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<SetDocumentURITest> testController = adoptNS([SetDocumentURITest new]);
@@ -64,7 +64,7 @@ TEST(WebKit1, SetDocumentURITestFile)
     EXPECT_WK_STREQ(@"file:///test", [document baseURI]);
 }
 
-TEST(WebKit1, SetDocumentURITestURL)
+TEST(WebKitLegacy, SetDocumentURITestURL)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<SetDocumentURITest> testController = adoptNS([SetDocumentURITest new]);
@@ -84,7 +84,7 @@ TEST(WebKit1, SetDocumentURITestURL)
     EXPECT_WK_STREQ(@"http://example.com/relativeURL.html", result);
 }
 
-TEST(WebKit1, SetDocumentURITestString)
+TEST(WebKitLegacy, SetDocumentURITestString)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<SetDocumentURITest> testController = adoptNS([SetDocumentURITest new]);
@@ -100,7 +100,7 @@ TEST(WebKit1, SetDocumentURITestString)
     EXPECT_WK_STREQ(@"about:blank", [document baseURI]);
 }
 
-TEST(WebKit1, SetDocumentURITestNull)
+TEST(WebKitLegacy, SetDocumentURITestNull)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<SetDocumentURITest> testController = adoptNS([SetDocumentURITest new]);
index 1006f869154b0ee564755685eca3b36765cfafe9..485835c720ee17e4d195e1b03357e06ff5f11af6 100644 (file)
@@ -47,7 +47,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, SimplifyMarkupTest)
+TEST(WebKitLegacy, SimplifyMarkupTest)
 {
     RetainPtr<WebView> webView1 = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<WebView> webView2 = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
index 8f50022221cf0c912dc805823a6991a3c2218194..08dc660eca62872bfd7412faaff4bc0722e2a8c4 100644 (file)
@@ -46,7 +46,7 @@ static bool finished = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, StopLoadingFromDidFinishLoading)
+TEST(WebKitLegacy, StopLoadingFromDidFinishLoading)
 {
     AutodrainedPool pool;
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] init]);
index 660a4e4527347700a92d1a4fb884a29e9441081c..13696d6a8e15564e66ea451f0c0d581cdea520af 100644 (file)
@@ -53,7 +53,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, StopLoadingFromDidReceiveResponse)
+TEST(WebKitLegacy, StopLoadingFromDidReceiveResponse)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index 260a5a53e74ee80725671a0af9ae171002535730..cc0b44ca27a472b30e2a9da30e25d4d9d46b4c9c 100644 (file)
@@ -29,7 +29,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, StringByEvaluatingJavaScriptFromString)
+TEST(WebKitLegacy, StringByEvaluatingJavaScriptFromString)
 {
     // maps expected result <= JavaScript expression
     RetainPtr<NSDictionary> expressions = adoptNS([[NSDictionary alloc] initWithObjectsAndKeys:
index c86e8e59c9f8497535e2e367532b88274f3e4a7b..1b6944d111c29d4c5c6ac233da28578e0ad1d461 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, StringTruncator)
+TEST(WebKitLegacy, StringTruncator)
 {
     @autoreleasepool {
         EXPECT_EQ(nil, [WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:nil]);
index 870a4896a0aa4e2c4e830e5902dfd7d3f6ae5a0d..a156b1e2a16f30c258a0f86c3859246bc36f885e 100644 (file)
@@ -27,7 +27,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, SubresourceErrorCrash)
+TEST(WebKitLegacy, SubresourceErrorCrash)
 {
     WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:@"" groupName:@""];
     [webView.mainFrame loadHTMLString:@"<link rel=stylesheet href='x-error:error'>" baseURL:nil];
index c81573bc6fe8f3e58ed4eda20cc7fc6eccafe84c..23eeb0053ff50e57225d16875dc1cc78dd67d812 100644 (file)
@@ -27,7 +27,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, TypingStyleCrash)
+TEST(WebKitLegacy, TypingStyleCrash)
 {
     WebView *webView = [[WebView alloc] init];
     (void)[webView typingStyle];
index 3ddcaa9645b773b8c380f97d20c169a7c12c92de..590c5b4f14c20315968a85dd843c6bf03625085e 100644 (file)
@@ -58,7 +58,7 @@ void nsObjectDescriptionTest(NSObject *object)
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WebScriptObjectDescription)
+TEST(WebKitLegacy, WebScriptObjectDescription)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<WebScriptDescriptionTest> testController = adoptNS([WebScriptDescriptionTest new]);
index d4bc83bf9dca50c3554c48fa75201bf9cb2de00a..106a25aa74b9b71d7ab6e817d0cc59410053b48e 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WebViewCanPasteURL)
+TEST(WebKitLegacy, WebViewCanPasteURL)
 {
     WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];
     [webView setEditable:YES];
index 5049fb3af21dbff01304fbc3b6e512f92ade8e4b..58e07c140eefcab45b8e2de73c80df71edefb086 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WebViewCanPasteZeroPng)
+TEST(WebKitLegacy, WebViewCanPasteZeroPng)
 {
     WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];
     [webView setEditable:YES];
index 56b2c26baddc69fd70ca35b4bd8e5cce60b3a53f..05d6803525b0f174de5d53abd5053eadb1cd03bc 100644 (file)
@@ -48,7 +48,7 @@ static bool didFinishLoad = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WebViewCloseInsideDidFinishLoadForFrame)
+TEST(WebKitLegacy, WebViewCloseInsideDidFinishLoadForFrame)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
index a12cf505111f2c356dfe7e7e8980558a2b6c3bb4..69f4489e77fa0b66865b1ba651a72c5e51160e7a 100644 (file)
@@ -136,7 +136,7 @@ static bool didReportException = false;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DidCreateJavaScriptContextSanity1)
+TEST(WebKitLegacy, DidCreateJavaScriptContextSanity1)
 {
     didFinishLoad = false;
     @autoreleasepool {
@@ -162,7 +162,7 @@ TEST(WebKit1, DidCreateJavaScriptContextSanity1)
     }
 }
 
-TEST(WebKit1, DidCreateJavaScriptContextSanity2)
+TEST(WebKitLegacy, DidCreateJavaScriptContextSanity2)
 {
     didCallWindowCallback = false;
     @autoreleasepool {
@@ -185,7 +185,7 @@ TEST(WebKit1, DidCreateJavaScriptContextSanity2)
     }
 }
 
-TEST(WebKit1, DidCreateJavaScriptContextCallJSFunctionFromObjCCallbackTest)
+TEST(WebKitLegacy, DidCreateJavaScriptContextCallJSFunctionFromObjCCallbackTest)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
@@ -209,7 +209,7 @@ TEST(WebKit1, DidCreateJavaScriptContextCallJSFunctionFromObjCCallbackTest)
     }
 }
 
-TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromJSTest)
+TEST(WebKitLegacy, DidCreateJavaScriptContextAddCustomPropertiesFromJSTest)
 {
     didFindMyCustomProperty = false;
     @autoreleasepool {
@@ -235,7 +235,7 @@ TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromJSTest)
     }
 }
 
-TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromObjCTest)
+TEST(WebKitLegacy, DidCreateJavaScriptContextAddCustomPropertiesFromObjCTest)
 {
     didFindMyCustomProperty = false;
     @autoreleasepool {
@@ -263,7 +263,7 @@ TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromObjCTest)
     }
 }
 
-TEST(WebKit1, DidCreateJavaScriptContextBackForwardCacheTest)
+TEST(WebKitLegacy, DidCreateJavaScriptContextBackForwardCacheTest)
 {
     didInsertMyCustomProperty = false;
     didFindMyCustomProperty = false;
@@ -306,7 +306,7 @@ TEST(WebKit1, DidCreateJavaScriptContextBackForwardCacheTest)
     }
 }
 
-TEST(WebKit1, ReportExceptionTest)
+TEST(WebKitLegacy, ReportExceptionTest)
 {
     didReportException = false;
     @autoreleasepool {
index 86d80de45ff4627f740c109993e423fc82d76f5f..0fb540b33e58c4f129ddc0ea75447bf95806d18d 100644 (file)
@@ -50,7 +50,7 @@ static bool didRemoveFrame;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, DidRemoveFrameFromHierarchy)
+TEST(WebKitLegacy, DidRemoveFrameFromHierarchy)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<DidRemoveFrameFromHierarchyFrameLoadDelegate> frameLoadDelegate = adoptNS([[DidRemoveFrameFromHierarchyFrameLoadDelegate alloc] init]);
index 095d56dd6e7f008cf23991369246fd7dd15fbd28..348d558e107a23f1780eb07b5b7a02819b357ed1 100644 (file)
@@ -155,7 +155,7 @@ static NSImage *imageFromData(NSData *data)
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, IconLoadingDelegateDefaultFirst)
+TEST(WebKitLegacy, IconLoadingDelegateDefaultFirst)
 {
     [NSURLProtocol registerClass:[IconLoadingProtocol class]];
 
@@ -196,7 +196,7 @@ TEST(WebKit1, IconLoadingDelegateDefaultFirst)
     [NSURLProtocol unregisterClass:[IconLoadingProtocol class]];
 }
 
-TEST(WebKit1, IconLoadingDelegateCustomFirst)
+TEST(WebKitLegacy, IconLoadingDelegateCustomFirst)
 {
     [NSURLProtocol registerClass:[IconLoadingProtocol class]];
 
index 09f02e50c0d241335ac02b929563ae3b6886e64f..3a2fadea6a0422352fd27c71c0e610a1b0c979aa 100644 (file)
@@ -72,7 +72,7 @@ static NSURL *testURL()
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WillPerformClientRedirectToURLCrash)
+TEST(WebKitLegacy, WillPerformClientRedirectToURLCrash)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
index a3b058c01624308b0e42ea1ce8649e718330f895..7fda41a787c5f279c787f2f90b1da50914f8b0d2 100644 (file)
@@ -57,7 +57,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WillSendSubmitEvent)
+TEST(WebKitLegacy, WillSendSubmitEvent)
 {
     @autoreleasepool {
         RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
index 7c52949292d551bffebdab360ce9933a6f895407..9cd09800510ae6cc8ad0225a30894e6925de305d 100644 (file)
@@ -61,7 +61,7 @@ static void spinLoop(NSTimeInterval timeout, BOOL (^block)())
     }
 }
 
-TEST(WebKit1, WindowlessWebViewWithMedia)
+TEST(WebKitLegacy, WindowlessWebViewWithMedia)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
index b21de9a305885d0ab9dacf81fda60396a5898d06..248a7e952869ea81eff8f0422f2f8555bdc76b29 100644 (file)
@@ -45,7 +45,7 @@ static bool didFinishLoad;
 
 namespace TestWebKitAPI {
 
-TEST(WebKit1, WordBoundaryTypingAttributes)
+TEST(WebKitLegacy, WordBoundaryTypingAttributes)
 {
     RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
     RetainPtr<WordBoundaryTypingAttributesController> controller = adoptNS([WordBoundaryTypingAttributesController new]);