Changeset 221505 in webkit


Ignore:
Timestamp:
Sep 1, 2017, 3:56:15 PM (8 years ago)
Author:
achristensen@apple.com
Message:

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.

Location:
trunk/Tools
Files:
193 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Tools/ChangeLog

    r221503 r221505  
     12017-09-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Rename WebKit2 API tests after directory rename
     4        https://bugs.webkit.org/show_bug.cgi?id=176250
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/Lots of files...
     9        Renamed WebKit2 to WebKit and WebKit1 to WebKitLegacy.
     10
    1112017-09-01  Alex Christensen  <achristensen@webkit.org>
    212

  • TabularUnified trunk/Tools/Scripts/run-api-tests

    r214372 r221505  
    9191
    9292The following command will run a single test:
    93     $programName WebKit2.AboutBlank
    94 
    95 The following command will run all tests in suites that begin with 'WebKit2':
    96     $programName WebKit2
     93    $programName WebKit.AboutBlank
     94
     95The following command will run all tests in suites that begin with 'WebKit':
     96    $programName WebKit
    9797
    9898EOF
    … …  
    328328              $suite = $line; # "SuiteName."
    329329           } else {
    330               # Disabling WebKit2 API test on Windows since we will be disabling WebKit2 on Windows.
    331               next if (isAppleWinWebKit() && $suite =~ m/WebKit2*/);       
    332330              $line =~ s/^\s*//; # "TestName"
    333331              my $fullName = $suite . $line; # "SuiteName.TestName";

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebCore/LineBreaking.mm

    r212235 r221505  
    106106
    107107// Split up the tests because they take too long otherwise and people start thinking their computer is hung.
    108 TEST(WebKit2, LineBreaking1)
     108TEST(WebKit, LineBreaking1)
    109109{
    110110    Vector<Vector<UInt16>> testStrings = {
    … …  
    118118}
    119119
    120 TEST(WebKit2, LineBreaking2)
     120TEST(WebKit, LineBreaking2)
    121121{
    122122    Vector<Vector<UInt16>> testStrings = {
    … …  
    130130}
    131131
    132 TEST(WebKit2, LineBreaking3)
     132TEST(WebKit, LineBreaking3)
    133133{
    134134    Vector<Vector<UInt16>> testStrings = {
    … …  
    142142}
    143143
    144 TEST(WebKit2, LineBreaking4)
     144TEST(WebKit, LineBreaking4)
    145145{
    146146    Vector<Vector<UInt16>> testStrings = {
    … …  
    154154}
    155155
    156 TEST(WebKit2, LineBreaking5)
     156TEST(WebKit, LineBreaking5)
    157157{
    158158    Vector<Vector<UInt16>> testStrings = {
    … …  
    166166}
    167167
    168 TEST(WebKit2, LineBreaking6)
     168TEST(WebKit, LineBreaking6)
    169169{
    170170    Vector<Vector<UInt16>> testStrings = {
    … …  
    178178}
    179179
    180 TEST(WebKit2, LineBreaking7)
     180TEST(WebKit, LineBreaking7)
    181181{
    182182    Vector<Vector<UInt16>> testStrings = {
    … …  
    190190}
    191191
    192 TEST(WebKit2, LineBreaking8)
     192TEST(WebKit, LineBreaking8)
    193193{
    194194    Vector<Vector<UInt16>> testStrings = {
    … …  
    202202}
    203203
    204 TEST(WebKit2, LineBreaking9)
     204TEST(WebKit, LineBreaking9)
    205205{
    206206    Vector<Vector<UInt16>> testStrings = {
    … …  
    214214}
    215215
    216 TEST(WebKit2, LineBreaking10)
     216TEST(WebKit, LineBreaking10)
    217217{
    218218    Vector<Vector<UInt16>> testStrings = {
    … …  
    226226}
    227227
    228 TEST(WebKit2, LineBreaking11)
     228TEST(WebKit, LineBreaking11)
    229229{
    230230    Vector<Vector<UInt16>> testStrings = {
    … …  
    238238}
    239239
    240 TEST(WebKit2, LineBreaking12)
     240TEST(WebKit, LineBreaking12)
    241241{
    242242    Vector<Vector<UInt16>> testStrings = {
    … …  
    250250}
    251251
    252 TEST(WebKit2, LineBreaking13)
     252TEST(WebKit, LineBreaking13)
    253253{
    254254    Vector<Vector<UInt16>> testStrings = {
    … …  
    262262}
    263263
    264 TEST(WebKit2, LineBreaking14)
     264TEST(WebKit, LineBreaking14)
    265265{
    266266    Vector<Vector<UInt16>> testStrings = {
    … …  
    274274}
    275275
    276 TEST(WebKit2, LineBreaking15)
     276TEST(WebKit, LineBreaking15)
    277277{
    278278    Vector<Vector<UInt16>> testStrings = {
    … …  
    286286}
    287287
    288 TEST(WebKit2, LineBreaking16)
     288TEST(WebKit, LineBreaking16)
    289289{
    290290    Vector<Vector<UInt16>> testStrings = {
    … …  
    298298}
    299299
    300 TEST(WebKit2, LineBreaking17)
     300TEST(WebKit, LineBreaking17)
    301301{
    302302    Vector<Vector<UInt16>> testStrings = {
    … …  
    310310}
    311311
    312 TEST(WebKit2, LineBreaking18)
     312TEST(WebKit, LineBreaking18)
    313313{
    314314    Vector<Vector<UInt16>> testStrings = {
    … …  
    322322}
    323323
    324 TEST(WebKit2, LineBreaking19)
     324TEST(WebKit, LineBreaking19)
    325325{
    326326    Vector<Vector<UInt16>> testStrings = {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/AboutBlankLoad.cpp

    r177506 r221505  
    4242}
    4343
    44 TEST(WebKit2, AboutBlankLoad)
     44TEST(WebKit, AboutBlankLoad)
    4545{
    4646    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/CanHandleRequest.cpp

    r177506 r221505  
    5858}
    5959
    60 TEST(WebKit2, CanHandleRequest)
     60TEST(WebKit, CanHandleRequest)
    6161{
    6262    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("CanHandleRequestTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseFromWithinCreatePage.cpp

    r208509 r221505  
    6262}
    6363
    64 TEST(WebKit2, CloseFromWithinCreatePage)
     64TEST(WebKit, CloseFromWithinCreatePage)
    6565{
    6666    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp

    r177506 r221505  
    4343// This tests that we don't crash when calling WKPageClose and WKPageTerminate.
    4444
    45 TEST(WebKit2, CloseThenTerminate)
     45TEST(WebKit, CloseThenTerminate)
    4646{
    4747    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp

    r177506 r221505  
    7171}
    7272
    73 TEST(WebKit2, CookieManager)
     73TEST(WebKit, CookieManager)
    7474{
    7575    wkContext.adopt(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionBasic.cpp

    r177506 r221505  
    8181}
    8282
    83 TEST(WebKit2, DISABLED_DOMWindowExtensionBasic)
     83TEST(WebKit, DISABLED_DOMWindowExtensionBasic)
    8484{
    8585    WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionBasicPageGroup")));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DOMWindowExtensionNoCache.cpp

    r177506 r221505  
    8282}
    8383
    84 TEST(WebKit2, DISABLED_DOMWindowExtensionNoCache)
     84TEST(WebKit, DISABLED_DOMWindowExtensionNoCache)
    8585{
    8686    WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DOMWindowExtensionNoCachePageGroup")));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm

    r202232 r221505  
    5353}
    5454
    55 TEST(WebKit2, DeferredViewInWindowStateChange)
     55TEST(WebKit, DeferredViewInWindowStateChange)
    5656{
    5757    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("MouseMoveAfterCrashTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DidAssociateFormControls.cpp

    r177506 r221505  
    7676}
    7777
    78 TEST(WebKit2, DidAssociateFormControls)
     78TEST(WebKit, DidAssociateFormControls)
    7979{
    8080    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DidAssociateFormControlsTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp

    r177506 r221505  
    4949}
    5050
    51 TEST(WebKit2, DidNotHandleKeyDown)
     51TEST(WebKit, DidNotHandleKeyDown)
    5252{
    5353    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp

    r206922 r221505  
    7575}
    7676
    77 TEST(WebKit2, DidRemoveFrameFromHiearchyInPageCache)
     77TEST(WebKit, DidRemoveFrameFromHiearchyInPageCache)
    7878{
    7979    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DidRemoveFrameFromHiearchyInPageCache"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp

    r186046 r221505  
    4747}
    4848
    49 TEST(WebKit2, DocumentStartUserScriptAlertCrashTest)
     49TEST(WebKit, DocumentStartUserScriptAlertCrashTest)
    5050{
    5151    WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DocumentStartUserScriptAlertCrashTestPageGroup")));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/DownloadDecideDestinationCrash.cpp

    r177506 r221505  
    7070}
    7171
    72 TEST(WebKit2, DownloadDecideDestinationCrash)
     72TEST(WebKit, DownloadDecideDestinationCrash)
    7373{
    7474    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/EnumerateMediaDevices.cpp

    r215939 r221505  
    4848}
    4949
    50 TEST(WebKit2, EnumerateDevices)
     50TEST(WebKit, EnumerateDevices)
    5151{
    5252    auto context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/EnvironmentUtilitiesTest.cpp

    r215521 r221505  
    4343}
    4444
    45 TEST(WebKit2, StripValuesEndingWithString)
     45TEST(WebKit, StripValuesEndingWithString)
    4646{
    4747    EXPECT_STREQ(strip(""), "");

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/EphemeralSessionPushStateNoHistoryCallback.cpp

    r206929 r221505  
    4949}
    5050
    51 TEST(WebKit2, EphemeralSessionPushStateNoHistoryCallback)
     51TEST(WebKit, EphemeralSessionPushStateNoHistoryCallback)
    5252{
    5353    auto configuration = adoptWK(WKPageConfigurationCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/EvaluateJavaScript.cpp

    r177506 r221505  
    5050}
    5151
    52 TEST(WebKit2, EvaluateJavaScriptThatThrowsAnException)
     52TEST(WebKit, EvaluateJavaScriptThatThrowsAnException)
    5353{
    5454    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp

    r215790 r221505  
    6363}
    6464
    65 TEST(WebKit2, EventModifiers)
     65TEST(WebKit, EventModifiers)
    6666{
    6767    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/FailedLoad.cpp

    r177506 r221505  
    4949}
    5050
    51 TEST(WebKit2, FailedLoad)
     51TEST(WebKit, FailedLoad)
    5252{
    5353    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp

    r177506 r221505  
    5050}
    5151
    52 TEST(WebKit2, Find)
     52TEST(WebKit, Find)
    5353{
    5454    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm

    r178293 r221505  
    116116}
    117117
    118 TEST(WebKit2, FindMatches)
     118TEST(WebKit, FindMatches)
    119119{
    120120    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp

    r177506 r221505  
    5050}
    5151
    52 TEST(WebKit2, ForceRepaint)
     52TEST(WebKit, ForceRepaint)
    5353{
    5454    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp

    r204909 r221505  
    4444}
    4545
    46 TEST(WebKit2, FrameHandle)
     46TEST(WebKit, FrameHandle)
    4747{
    4848    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypeHTML.cpp

    r177506 r221505  
    5757}
    5858
    59 TEST(WebKit2, FrameMIMETypeHTML)
     59TEST(WebKit, FrameMIMETypeHTML)
    6060{
    6161    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameMIMETypePNG.cpp

    r177506 r221505  
    5656}
    5757
    58 TEST(WebKit2, FrameMIMETypePNG)
     58TEST(WebKit, FrameMIMETypePNG)
    5959{
    6060    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp

    r192808 r221505  
    155155};
    156156
    157 TEST(WebKit2, GeolocationBasic)
     157TEST(WebKit, GeolocationBasic)
    158158{
    159159    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
    … …  
    196196};
    197197
    198 TEST(WebKit2, GeolocationBasicWithHighAccuracy)
     198TEST(WebKit, GeolocationBasicWithHighAccuracy)
    199199{
    200200    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
    … …  
    248248};
    249249
    250 TEST(WebKit2, GeolocationTransitionToHighAccuracy)
     250TEST(WebKit, GeolocationTransitionToHighAccuracy)
    251251{
    252252    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
    … …  
    313313}
    314314
    315 TEST(WebKit2, GeolocationTransitionToLowAccuracy)
     315TEST(WebKit, GeolocationTransitionToLowAccuracy)
    316316{
    317317    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp

    r177506 r221505  
    4747}
    4848
    49 TEST(WebKit2, GetInjectedBundleInitializationUserDataCallback)
     49TEST(WebKit, GetInjectedBundleInitializationUserDataCallback)
    5050{
    5151    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMediaNavigation.mm

    r219135 r221505  
    6868namespace TestWebKitAPI {
    6969
    70 TEST(WebKit2, NavigateDuringGetUserMediaPrompt)
     70TEST(WebKit, NavigateDuringGetUserMediaPrompt)
    7171{
    7272    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    8585}
    8686
    87 TEST(WebKit2, NavigateDuringDeviceEnumeration)
     87TEST(WebKit, NavigateDuringDeviceEnumeration)
    8888{
    8989    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp

    r177506 r221505  
    7272}
    7373
    74 TEST(WebKit2, HitTestResultNodeHandle)
     74TEST(WebKit, HitTestResultNodeHandle)
    7575{
    7676    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("HitTestResultNodeHandleTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp

    r177506 r221505  
    5252}
    5353
    54 TEST(WebKit2, InjectedBundleBasic)
     54TEST(WebKit, InjectedBundleBasic)
    5555{
    5656    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleBasicTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleFrameHitTest.cpp

    r177506 r221505  
    5656}
    5757
    58 TEST(WebKit2, InjectedBundleFrameHitTest)
     58TEST(WebKit, InjectedBundleFrameHitTest)
    5959{
    6060    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleFrameHitTestTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp

    r177506 r221505  
    4747}
    4848
    49 TEST(WebKit2, InjectedBundleInitializationUserDataCallbackWins)
     49TEST(WebKit, InjectedBundleInitializationUserDataCallbackWins)
    5050{
    5151    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleMakeAllShadowRootsOpen.cpp

    r211139 r221505  
    8484}
    8585
    86 TEST(WebKit2, InjectedBundleMakeAllShadowRootOpenTest)
     86TEST(WebKit, InjectedBundleMakeAllShadowRootOpenTest)
    8787{
    8888    WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("InjectedBundleMakeAllShadowRootOpenTestPageGroup")));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/LayoutMilestonesWithAllContentInFrame.cpp

    r177506 r221505  
    4646}
    4747
    48 TEST(WebKit2, LayoutMilestonesWithAllContentInFrame)
     48TEST(WebKit, LayoutMilestonesWithAllContentInFrame)
    4949{
    5050    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp

    r215784 r221505  
    5555}
    5656
    57 TEST(WebKit2, LimitTitleSize)
     57TEST(WebKit, LimitTitleSize)
    5858{
    5959    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp

    r180565 r221505  
    6565}
    6666
    67 TEST(WebKit2, LoadAlternateHTMLStringWithNonDirectoryURL)
     67TEST(WebKit, LoadAlternateHTMLStringWithNonDirectoryURL)
    6868{
    6969    // Call WKPageLoadAlternateHTMLString() with fileURL which does not point to a directory.
    … …  
    7272}
    7373
    74 TEST(WebKit2, LoadAlternateHTMLStringWithEmptyBaseURL)
     74TEST(WebKit, LoadAlternateHTMLStringWithEmptyBaseURL)
    7575{
    7676    // Call WKPageLoadAlternateHTMLString() with empty baseURL to make sure this test works

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp

    r177506 r221505  
    5959}
    6060
    61 TEST(WebKit2, LoadCanceledNoServerRedirectCallback)
     61TEST(WebKit, LoadCanceledNoServerRedirectCallback)
    6262{
    6363    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("LoadCanceledNoServerRedirectCallbackTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp

    r177506 r221505  
    9696// This test will load a blank page and next kill WebProcess, the expected
    9797// result is that a call to page load should spawn a new WebProcess.
    98 TEST(WebKit2, LoadPageAfterCrash)
     98TEST(WebKit, LoadPageAfterCrash)
    9999{
    100100    WebKit2CrashLoader helper;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/MediaStreamTrackDetached.mm

    r218399 r221505  
    6565namespace TestWebKitAPI {
    6666
    67 TEST(WebKit2, MediaStreamTrackDetached)
     67TEST(WebKit, MediaStreamTrackDetached)
    6868{
    6969    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp

    r182589 r221505  
    7070}
    7171
    72 TEST(WebKit2, MenuAndButtonForNormalLeftClick)
     72TEST(WebKit, MenuAndButtonForNormalLeftClick)
    7373{
    7474    buildAndPerformTest(kWKEventMouseButtonLeftButton, 0, "0", "none");
    7575}
    7676
    77 TEST(WebKit2, MenuAndButtonForNormalRightClick)
     77TEST(WebKit, MenuAndButtonForNormalRightClick)
    7878{
    7979    buildAndPerformTest(kWKEventMouseButtonRightButton, 0, "2", "context");
    8080}
    8181
    82 TEST(WebKit2, MenuAndButtonForNormalMiddleClick)
     82TEST(WebKit, MenuAndButtonForNormalMiddleClick)
    8383{
    8484    buildAndPerformTest(kWKEventMouseButtonMiddleButton, 0, "1", "none");
    8585}
    8686
    87 TEST(WebKit2, MenuAndButtonForControlLeftClick)
     87TEST(WebKit, MenuAndButtonForControlLeftClick)
    8888{
    8989    buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersControlKey, "0", "context");
    9090}
    9191
    92 TEST(WebKit2, MenuAndButtonForControlRightClick)
     92TEST(WebKit, MenuAndButtonForControlRightClick)
    9393{
    9494    buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersControlKey, "2", "context");
    9595}
    9696
    97 TEST(WebKit2, MenuAndButtonForControlMiddleClick)
     97TEST(WebKit, MenuAndButtonForControlMiddleClick)
    9898{
    9999    buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersControlKey, "1", "none");
    100100}
    101101
    102 TEST(WebKit2, MenuAndButtonForShiftLeftClick)
     102TEST(WebKit, MenuAndButtonForShiftLeftClick)
    103103{
    104104    buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersShiftKey, "0", "none");
    105105}
    106106
    107 TEST(WebKit2, MenuAndButtonForShiftRightClick)
     107TEST(WebKit, MenuAndButtonForShiftRightClick)
    108108{
    109109    buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersShiftKey, "2", "context");
    110110}
    111111
    112 TEST(WebKit2, MenuAndButtonForShiftMiddleClick)
     112TEST(WebKit, MenuAndButtonForShiftMiddleClick)
    113113{
    114114    buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersShiftKey, "1", "none");
    115115}
    116116
    117 TEST(WebKit2, MenuAndButtonForCommandLeftClick)
     117TEST(WebKit, MenuAndButtonForCommandLeftClick)
    118118{
    119119    buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersMetaKey, "0", "none");
    120120}
    121121
    122 TEST(WebKit2, MenuAndButtonForCommandRightClick)
     122TEST(WebKit, MenuAndButtonForCommandRightClick)
    123123{
    124124    buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersMetaKey, "2", "context");
    125125}
    126126
    127 TEST(WebKit2, MenuAndButtonForCommandMiddleClick)
     127TEST(WebKit, MenuAndButtonForCommandMiddleClick)
    128128{
    129129    buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersMetaKey, "1", "none");
    130130}
    131131
    132 TEST(WebKit2, MenuAndButtonForAltLeftClick)
     132TEST(WebKit, MenuAndButtonForAltLeftClick)
    133133{
    134134    buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersAltKey, "0", "none");
    135135}
    136136
    137 TEST(WebKit2, MenuAndButtonForAltRightClick)
     137TEST(WebKit, MenuAndButtonForAltRightClick)
    138138{
    139139    buildAndPerformTest(kWKEventMouseButtonRightButton, kWKEventModifiersAltKey, "2", "context");
    140140}
    141141
    142 TEST(WebKit2, MenuAndButtonForAltMiddleClick)
     142TEST(WebKit, MenuAndButtonForAltMiddleClick)
    143143{
    144144    buildAndPerformTest(kWKEventMouseButtonMiddleButton, kWKEventModifiersAltKey, "1", "none");

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ModalAlertsSPI.cpp

    r217574 r221505  
    121121}
    122122
    123 TEST(WebKit2, ModalAlertsSPI)
     123TEST(WebKit, ModalAlertsSPI)
    124124{
    125125    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp

    r177506 r221505  
    5252}
    5353
    54 TEST(WebKit2, MouseMoveAfterCrash)
     54TEST(WebKit, MouseMoveAfterCrash)
    5555{
    5656    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("MouseMoveAfterCrashTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NavigationClientDefaultCrypto.cpp

    r216157 r221505  
    5555}
    5656
    57 TEST(WebKit2, NavigationClientDefaultCrypto)
     57TEST(WebKit, NavigationClientDefaultCrypto)
    5858{
    5959    auto context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NetworkProcessCrashWithPendingConnection.mm

    r219087 r221505  
    4545static bool networkProcessCrashed = false;
    4646
    47 TEST(WebKit2, NetworkProcessCrashWithPendingConnection)
     47TEST(WebKit, NetworkProcessCrashWithPendingConnection)
    4848{
    4949    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp

    r177506 r221505  
    7474// kWKDidHitRelevantRepaintedObjectsAreaThreshold achievement. We probably need to fix this by making
    7575// this test have a long-running resource.
    76 TEST(WebKit2, DISABLED_NewFirstVisuallyNonEmptyLayout)
     76TEST(WebKit, DISABLED_NewFirstVisuallyNonEmptyLayout)
    7777{
    7878    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp

    r177506 r221505  
    7070}
    7171
    72 TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFails)
     72TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFails)
    7373{
    7474    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutFailsTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp

    r177506 r221505  
    7474// kWKDidHitRelevantRepaintedObjectsAreaThreshold achievement. We probably need to fix this by making
    7575// this test have a long-running resource.
    76 TEST(WebKit2, DISABLED_NewFirstVisuallyNonEmptyLayoutForImages)
     76TEST(WebKit, DISABLED_NewFirstVisuallyNonEmptyLayoutForImages)
    7777{
    7878    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("NewFirstVisuallyNonEmptyLayoutForImagesTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp

    r185496 r221505  
    7575}
    7676
    77 TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFrames)
     77TEST(WebKit, NewFirstVisuallyNonEmptyLayoutFrames)
    7878{
    7979    didHitRelevantRepaintedObjectsAreaThresholdCounter = 0;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp

    r210782 r221505  
    112112}
    113113
    114 TEST(WebKit2, PageLoadBasic)
     114TEST(WebKit, PageLoadBasic)
    115115{
    116116    State state;
    … …  
    155155}
    156156
    157 TEST(WebKit2, PageReload)
     157TEST(WebKit, PageReload)
    158158{
    159159    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp

    r177506 r221505  
    5959}
    6060
    61 TEST(WebKit2, PageLoadDidChangeLocationWithinPageForFrame)
     61TEST(WebKit, PageLoadDidChangeLocationWithinPageForFrame)
    6262{
    6363    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ParentFrame.cpp

    r177506 r221505  
    5858}
    5959
    60 TEST(WebKit2, ParentFrame)
     60TEST(WebKit, ParentFrame)
    6161{
    6262    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ParentFrameTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PasteboardNotifications.mm

    r177506 r221505  
    5959}
    6060
    61 TEST(WebKit2, PasteboardNotifications)
     61TEST(WebKit, PasteboardNotifications)
    6262{
    6363    [[NSPasteboard generalPasteboard] clearContents];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp

    r199664 r221505  
    3737static bool done;
    3838
    39 TEST(WebKit2, PendingAPIRequestURL)
     39TEST(WebKit, PendingAPIRequestURL)
    4040{
    4141    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PreventEmptyUserAgent.cpp

    r177506 r221505  
    5959}
    6060
    61 TEST(WebKit2, PreventEmptyUserAgent)
     61TEST(WebKit, PreventEmptyUserAgent)
    6262{
    6363    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp

    r177506 r221505  
    5454}
    5555
    56 TEST(WebKit2, PrivateBrowsingPushStateNoHistoryCallback)
     56TEST(WebKit, PrivateBrowsingPushStateNoHistoryCallback)
    5757{
    5858    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ProcessDidTerminate.cpp

    r216249 r221505  
    7777}
    7878
    79 TEST(WebKit2, ProcessDidTerminateRequestedByClient)
     79TEST(WebKit, ProcessDidTerminateRequestedByClient)
    8080{
    8181    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
    … …  
    101101}
    102102
    103 TEST(WebKit2, ProcessDidTerminateWithReasonCrash)
     103TEST(WebKit, ProcessDidTerminateWithReasonCrash)
    104104{
    105105    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ReloadPageAfterCrash.cpp

    r177506 r221505  
    6464}
    6565
    66 TEST(WebKit2, ReloadPageAfterCrash)
     66TEST(WebKit, ReloadPageAfterCrash)
    6767{
    6868    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeReversePaginatedWebView.cpp

    r177506 r221505  
    6060}
    6161
    62 TEST(WebKit2, ResizeReversePaginatedWebView)
     62TEST(WebKit, ResizeReversePaginatedWebView)
    6363{
    6464    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp

    r177506 r221505  
    7474}
    7575
    76 TEST(WebKit2, ResizeWindowAfterCrash)
     76TEST(WebKit, ResizeWindowAfterCrash)
    7777{
    7878    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ResponsivenessTimer.cpp

    r218295 r221505  
    5858}
    5959
    60 TEST(WebKit2, ResponsivenessTimerShouldNotFireAfterTearDown)
     60TEST(WebKit, ResponsivenessTimerShouldNotFireAfterTearDown)
    6161{
    6262    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ResponsivenessTimerDoesntFireEarly.cpp

    r177506 r221505  
    7676}
    7777
    78 TEST(WebKit2, ResponsivenessTimerDoesntFireEarly)
     78TEST(WebKit, ResponsivenessTimerDoesntFireEarly)
    7979{
    8080    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ResponsivenessTimerDoesntFireEarlyTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp

    r218121 r221505  
    6767}
    6868
    69 TEST(WebKit2, RestoreSessionStateContainingScrollRestorationDefault)
     69TEST(WebKit, RestoreSessionStateContainingScrollRestorationDefault)
    7070{
    7171    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp

    r177506 r221505  
    7171}
    7272
    73 TEST(WebKit2, RestoreSessionStateContainingFormData)
     73TEST(WebKit, RestoreSessionStateContainingFormData)
    7474{
    7575    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateWithoutNavigation.cpp

    r202724 r221505  
    7575}
    7676
    77 TEST(WebKit2, RestoreSessionStateWithoutNavigation)
     77TEST(WebKit, RestoreSessionStateWithoutNavigation)
    7878{
    7979    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp

    r177506 r221505  
    7070}
    7171
    72 TEST(WebKit2, ScrollPinningBehaviors)
     72TEST(WebKit, ScrollPinningBehaviors)
    7373{
    7474    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ShouldGoToBackForwardListItem.cpp

    r177506 r221505  
    7070}
    7171
    72 TEST(WebKit2, ShouldGoToBackForwardListItem)
     72TEST(WebKit, ShouldGoToBackForwardListItem)
    7373{
    7474    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("ShouldGoToBackForwardListItemTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ShouldKeepCurrentBackForwardListItemInList.cpp

    r177506 r221505  
    129129}
    130130
    131 TEST(WebKit2, ShouldKeepCurrentBackForwardListItemInList)
     131TEST(WebKit, ShouldKeepCurrentBackForwardListItemInList)
    132132{
    133133    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp

    r177506 r221505  
    5050}
    5151
    52 TEST(WebKit2, SpacebarScrolling)
     52TEST(WebKit, SpacebarScrolling)
    5353{
    5454    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp

    r192910 r221505  
    6161}
    6262
    63 TEST(WebKit2, StopLoadingDuringDidFailProvisionalLoadTest)
     63TEST(WebKit, StopLoadingDuringDidFailProvisionalLoadTest)
    6464{
    6565    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("StopLoadingDuringDidFailProvisionalLoadTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp

    r206789 r221505  
    4040}
    4141
    42 TEST(WebKit2, TerminateTwice)
     42TEST(WebKit, TerminateTwice)
    4343{
    4444    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp

    r216836 r221505  
    6767}
    6868
    69 TEST(WebKit2, UserMediaBasic)
     69TEST(WebKit, UserMediaBasic)
    7070{
    7171    auto context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/ViewportSizeForViewportUnits.mm

    r217735 r221505  
    3636static bool viewportSizeTestDone;
    3737
    38 TEST(WebKit2, ViewportSizeForViewportUnits)
     38TEST(WebKit, ViewportSizeForViewportUnits)
    3939{
    4040    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle.cpp

    r180798 r221505  
    5252}
    5353
    54 TEST(WebKit2, WKBundleFileHandle)
     54TEST(WebKit, WKBundleFileHandle)
    5555{
    5656    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WKBundleFileHandleTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKImageCreateCGImageCrash.cpp

    r177506 r221505  
    3232namespace TestWebKitAPI {
    3333
    34 TEST(WebKit2, WKImageCreateCGImageCrash)
     34TEST(WebKit, WKImageCreateCGImageCrash)
    3535{
    3636    EXPECT_FALSE(WKImageCreateCGImage(nullptr));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp

    r188543 r221505  
    3636namespace TestWebKitAPI {
    3737
    38 TEST(WebKit2, WKPageConfigurationEmpty)
     38TEST(WebKit, WKPageConfigurationEmpty)
    3939{
    4040    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
    … …  
    6565}
    6666
    67 TEST(WebKit2, WKPageConfigurationBasic)
     67TEST(WebKit, WKPageConfigurationBasic)
    6868{
    6969    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
    … …  
    8484}
    8585
    86 TEST(WebKit2, WKPageConfigurationBasicWithDataStore)
     86TEST(WebKit, WKPageConfigurationBasicWithDataStore)
    8787{
    8888    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());
    … …  
    106106}
    107107
    108 TEST(WebKit2, WKPageConfigurationBasicWithNonPersistentDataStore)
     108TEST(WebKit, WKPageConfigurationBasicWithNonPersistentDataStore)
    109109{
    110110    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageConfigurationCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp

    r183933 r221505  
    104104}
    105105
    106 TEST(WebKit2, WKPageCopySessionStateWithFiltering)
     106TEST(WebKit, WKPageCopySessionStateWithFiltering)
    107107{
    108108    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp

    r177506 r221505  
    6464}
    6565
    66 TEST(WebKit2, WKPageGetScaleFactorNotZero)
     66TEST(WebKit, WKPageGetScaleFactorNotZero)
    6767{
    6868    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp

    r210608 r221505  
    9696}
    9797
    98 TEST(WebKit2, WKPageIsPlayingAudio)
     98TEST(WebKit, WKPageIsPlayingAudio)
    9999{
    100100    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
    … …  
    115115}
    116116
    117 TEST(WebKit2, MSEIsPlayingAudio)
     117TEST(WebKit, MSEIsPlayingAudio)
    118118{
    119119    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp

    r215758 r221505  
    3434namespace TestWebKitAPI {
    3535
    36 TEST(WebKit2, WKPreferencesBasic)
     36TEST(WebKit, WKPreferencesBasic)
    3737{
    3838    WKPreferencesRef preference = WKPreferencesCreate();
    … …  
    4343}
    4444
    45 TEST(WebKit2, WKPreferencesDefaults)
     45TEST(WebKit, WKPreferencesDefaults)
    4646{
    4747#if PLATFORM(GTK)
    … …  
    107107}
    108108
    109 TEST(WebKit2, WKPreferencesCopying)
     109TEST(WebKit, WKPreferencesCopying)
    110110{
    111111    WKRetainPtr<WKStringRef> identifier(AdoptWK, WKStringCreateWithUTF8CString("identifier"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKRetainPtr.cpp

    r190836 r221505  
    3333namespace TestWebKitAPI {
    3434
    35 TEST(WebKit2, WKRetainPtr)
     35TEST(WebKit, WKRetainPtr)
    3636{
    3737    WKRetainPtr<WKStringRef> string1 = adoptWK(WKStringCreateWithUTF8CString("a"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKString.cpp

    r177506 r221505  
    3030namespace TestWebKitAPI {
    3131
    32 TEST(WebKit2, WKString)
     32TEST(WebKit, WKString)
    3333{
    3434    WKStringRef string = WKStringCreateWithUTF8CString("hello");

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKStringJSString.cpp

    r177506 r221505  
    3333namespace TestWebKitAPI {
    3434
    35 TEST(WebKit2, WKStringJSString)
     35TEST(WebKit, WKStringJSString)
    3636{
    3737    WKStringRef wkString = WKStringCreateWithUTF8CString("hello");

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm

    r205878 r221505  
    7575}
    7676
    77 TEST(WebKit2, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
     77TEST(WebKit, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
    7878{
    7979    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
    … …  
    121121}
    122122
    123 TEST(WebKit2, WKThumbnailViewMaximumSnapshotSize)
     123TEST(WebKit, WKThumbnailViewMaximumSnapshotSize)
    124124{
    125125    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp

    r177506 r221505  
    106106}
    107107
    108 TEST(WebKit2, WebArchive)
     108TEST(WebKit, WebArchive)
    109109{
    110110    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WebArchiveTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WebCoreStatisticsWithNoWebProcess.cpp

    r177506 r221505  
    4242}
    4343
    44 TEST(WebKit2, WebCoreStatisticsWithNoWebProcess)
     44TEST(WebKit, WebCoreStatisticsWithNoWebProcess)
    4545{
    4646    WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/WillSendSubmitEvent.cpp

    r177506 r221505  
    7070}
    7171
    72 TEST(WebKit2, WillSendSubmitEvent)
     72TEST(WebKit, WillSendSubmitEvent)
    7373{
    7474    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("WillSendSubmitEventTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm

    r209957 r221505  
    5656}
    5757
    58 TEST(WebKit2, AttributedSubstringForProposedRangeWithImage)
     58TEST(WebKit, AttributedSubstringForProposedRangeWithImage)
    5959{
    6060    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm

    r213010 r221505  
    7474// Checks that the HTML download attribute is used as suggested filename when selecting
    7575// the "Download Linked File" item in the context menu.
    76 TEST(WebKit2, ContextMenuDownloadHTMLDownloadAttribute)
     76TEST(WebKit, ContextMenuDownloadHTMLDownloadAttribute)
    7777{
    7878    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
    … …  
    120120}
    121121
    122 TEST(WebKit2, ContextMenuDownloadHTMLDownloadAttributeWithSlashes)
     122TEST(WebKit, ContextMenuDownloadHTMLDownloadAttributeWithSlashes)
    123123{
    124124    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm

    r168961 r221505  
    4141}
    4242
    43 TEST(WebKit2, ScrollByLineCommands)
     43TEST(WebKit, ScrollByLineCommands)
    4444{
    4545    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetBackingScaleFactor.mm

    r168961 r221505  
    6464}
    6565
    66 TEST(WebKit2, GetBackingScaleFactor)
     66TEST(WebKit, GetBackingScaleFactor)
    6767{
    6868    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("GetBackingScaleFactorTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp

    r203674 r221505  
    4141}
    4242
    43 TEST(WebKit2, GetPIDAfterAbortedProcessLaunch)
     43TEST(WebKit, GetPIDAfterAbortedProcessLaunch)
    4444{
    4545    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp

    r215197 r221505  
    6666}
    6767
    68 TEST(WebKit2, InjectedBundleAppleEvent)
     68TEST(WebKit, InjectedBundleAppleEvent)
    6969{
    7070    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleAppleEventTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/RestoreStateAfterTermination.mm

    r214006 r221505  
    7070}
    7171
    72 TEST(WebKit2, RestoreStateAfterTermination)
     72TEST(WebKit, RestoreStateAfterTermination)
    7373{
    7474    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AdditionalReadAccessAllowedURLs.mm

    r217923 r221505  
    4242static bool done;
    4343
    44 TEST(WebKit2, AdditionalReadAccessAllowedURLs)
     44TEST(WebKit, AdditionalReadAccessAllowedURLs)
    4545{
    4646    RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"AdditionalReadAccessAllowedURLsPlugIn"]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AlwaysRevalidatedURLSchemes.mm

    r205329 r221505  
    7575@end
    7676
    77 TEST(WebKit2, AlwaysRevalidatedURLSchemes)
     77TEST(WebKit, AlwaysRevalidatedURLSchemes)
    7878{
    7979    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AnimatedResize.mm

    r221153 r221505  
    8686}
    8787
    88 TEST(WebKit2, DISABLED_ResizeWithHiddenContentDoesNotHang)
     88TEST(WebKit, DISABLED_ResizeWithHiddenContentDoesNotHang)
    8989{
    9090    auto webView = createAnimatedResizeWebView();
    … …  
    110110}
    111111
    112 TEST(WebKit2, AnimatedResizeDoesNotHang)
     112TEST(WebKit, AnimatedResizeDoesNotHang)
    113113{
    114114    auto webView = createAnimatedResizeWebView();
    … …  
    138138}
    139139
    140 TEST(WebKit2, AnimatedResizeBlocksViewportFitChanges)
     140TEST(WebKit, AnimatedResizeBlocksViewportFitChanges)
    141141{
    142142    auto webView = createAnimatedResizeWebView();
    … …  
    185185}
    186186
    187 TEST(WebKit2, OverrideLayoutSizeChangesDuringAnimatedResizeSucceed)
     187TEST(WebKit, OverrideLayoutSizeChangesDuringAnimatedResizeSucceed)
    188188{
    189189    auto webView = createAnimatedResizeWebView();

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm

    r218509 r221505  
    119119@end
    120120
    121 TEST(WebKit2, AutoLayoutIntegration)
     121TEST(WebKit, AutoLayoutIntegration)
    122122{
    123123    RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);
    … …  
    174174}
    175175
    176 TEST(WebKit2, AutoLayoutRenderingProgressRelativeOrdering)
     176TEST(WebKit, AutoLayoutRenderingProgressRelativeOrdering)
    177177{
    178178    RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleEditingDelegate.mm

    r216203 r221505  
    7272@end
    7373
    74 TEST(WebKit2, WKWebProcessPlugInEditingDelegate)
     74TEST(WebKit, WKWebProcessPlugInEditingDelegate)
    7575{
    7676    RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleEditingDelegatePlugIn"]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleParameters.mm

    r219533 r221505  
    3636static bool isDone;
    3737
    38 TEST(WebKit2, BundleParameters)
     38TEST(WebKit, BundleParameters)
    3939{
    4040    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleRangeHandle.mm

    r216203 r221505  
    6363
    6464// FIXME: Re-enable this test once webkit.org/b/167594 is fixed.
    65 TEST(WebKit2, DISABLED_WKWebProcessPlugInRangeHandle)
     65TEST(WebKit, DISABLED_WKWebProcessPlugInRangeHandle)
    6666{
    6767    RetainPtr<WKWebViewConfiguration> configuration = retainPtr([WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"BundleRangeHandlePlugIn"]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CookieAcceptPolicy.mm

    r220243 r221505  
    5252@end
    5353
    54 TEST(WebKit2, CookieAcceptPolicy)
     54TEST(WebKit, CookieAcceptPolicy)
    5555{
    5656    auto originalCookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm

    r215651 r221505  
    7171
    7272// FIXME: Re-enable this test once webkit.org/b/161967 is fixed.
    73 TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
     73TEST(WebKit, DISABLED_DataDetectionReferenceDate)
    7474{
    7575    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DecidePolicyForNavigationAction.mm

    r220459 r221505  
    7474@end
    7575
    76 TEST(WebKit2, DecidePolicyForNavigationActionReload)
     76TEST(WebKit, DecidePolicyForNavigationActionReload)
    7777{
    7878    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    104104}
    105105
    106 TEST(WebKit2, DecidePolicyForNavigationActionReloadFromOrigin)
     106TEST(WebKit, DecidePolicyForNavigationActionReloadFromOrigin)
    107107{
    108108    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    134134}
    135135
    136 TEST(WebKit2, DecidePolicyForNavigationActionGoBack)
     136TEST(WebKit, DecidePolicyForNavigationActionGoBack)
    137137{
    138138    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    168168}
    169169
    170 TEST(WebKit2, DecidePolicyForNavigationActionGoForward)
     170TEST(WebKit, DecidePolicyForNavigationActionGoForward)
    171171{
    172172    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    206206}
    207207
    208 TEST(WebKit2, DecidePolicyForNavigationActionOpenNewWindowAndDeallocSourceWebView)
     208TEST(WebKit, DecidePolicyForNavigationActionOpenNewWindowAndDeallocSourceWebView)
    209209{
    210210    auto controller = adoptNS([[DecidePolicyForNavigationActionController alloc] init]);
    … …  
    237237}
    238238
    239 TEST(WebKit2, DecidePolicyForNavigationActionForTargetedHyperlink)
     239TEST(WebKit, DecidePolicyForNavigationActionForTargetedHyperlink)
    240240{
    241241    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    286286}
    287287
    288 TEST(WebKit2, DecidePolicyForNavigationActionForTargetedWindowOpen)
     288TEST(WebKit, DecidePolicyForNavigationActionForTargetedWindowOpen)
    289289{
    290290    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    335335}
    336336
    337 TEST(WebKit2, DecidePolicyForNavigationActionForTargetedFormSubmission)
     337TEST(WebKit, DecidePolicyForNavigationActionForTargetedFormSubmission)
    338338{
    339339    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    383383}
    384384
    385 TEST(WebKit2, DecidePolicyForNavigationActionForHyperlinkThatRedirects)
     385TEST(WebKit, DecidePolicyForNavigationActionForHyperlinkThatRedirects)
    386386{
    387387    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    433433}
    434434
    435 TEST(WebKit2, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToGET)
     435TEST(WebKit, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToGET)
    436436{
    437437    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    480480}
    481481
    482 TEST(WebKit2, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToPOST)
     482TEST(WebKit, DecidePolicyForNavigationActionForPOSTFormSubmissionThatRedirectsToPOST)
    483483{
    484484    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DoAfterNextPresentationUpdateAfterCrash.mm

    r214495 r221505  
    3434#if PLATFORM(IOS) && WK_API_ENABLED
    3535
    36 TEST(WebKit2, DoAfterNextPresentationUpdateAfterCrash)
     36TEST(WebKit, DoAfterNextPresentationUpdateAfterCrash)
    3737{
    3838    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
    … …  
    5454}
    5555
    56 TEST(WebKit2, DoAfterNextStablePresentationUpdateAfterCrash)
     56TEST(WebKit, DoAfterNextStablePresentationUpdateAfterCrash)
    5757{
    5858    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DuplicateCompletionHandlerCalls.mm

    r210031 r221505  
    124124@end
    125125
    126 TEST(WebKit2, DuplicateCompletionHandlerCalls)
     126TEST(WebKit, DuplicateCompletionHandlerCalls)
    127127{
    128128    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm

    r214893 r221505  
    7777}
    7878
    79 TEST(WebKit2, FindInPage)
     79TEST(WebKit, FindInPage)
    8080{
    8181    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 200, 200)]);
    … …  
    127127}
    128128
    129 TEST(WebKit2, FindInPageWrapping)
     129TEST(WebKit, FindInPageWrapping)
    130130{
    131131    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
    … …  
    155155}
    156156
    157 TEST(WebKit2, FindInPageWrappingDisabled)
     157TEST(WebKit, FindInPageWrappingDisabled)
    158158{
    159159    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
    … …  
    178178}
    179179
    180 TEST(WebKit2, FindInPageWrappingSubframe)
     180TEST(WebKit, FindInPageWrappingSubframe)
    181181{
    182182    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FixedLayoutSize.mm

    r205329 r221505  
    3838static bool fixedLayoutSizeDisabledDone;
    3939
    40 TEST(WebKit2, FixedLayoutSize)
     40TEST(WebKit, FixedLayoutSize)
    4141{
    4242    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Geolocation.mm

    r215246 r221505  
    144144// the requests to the UI process.
    145145
    146 TEST(WebKit2, GeolocationDeniedByLocationProvider)
     146TEST(WebKit, GeolocationDeniedByLocationProvider)
    147147{
    148148    auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
    … …  
    168168}
    169169
    170 TEST(WebKit2, GeolocationDeniedByAPI)
     170TEST(WebKit, GeolocationDeniedByAPI)
    171171{
    172172    auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
    … …  
    192192}
    193193
    194 TEST(WebKit2, GeolocationAllowedByAPI)
     194TEST(WebKit, GeolocationAllowedByAPI)
    195195{
    196196    auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
    … …  
    216216}
    217217
    218 TEST(WebKit2, GeolocationError)
     218TEST(WebKit, GeolocationError)
    219219{
    220220    auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);
    … …  
    241241}
    242242
    243 TEST(WebKit2, DuplicateGeolocationAuthorizationCallbackCalls)
     243TEST(WebKit, DuplicateGeolocationAuthorizationCallbackCalls)
    244244{
    245245    auto uiDelegate = adoptNS([[GeolocationTestUIDelegate alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InteractionDeadlockAfterCrash.mm

    r212167 r221505  
    5757}
    5858
    59 TEST(WebKit2, InteractionDeadlockAfterCrash)
     59TEST(WebKit, InteractionDeadlockAfterCrash)
    6060{
    6161    RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadDataWithNilMIMEType.mm

    r207563 r221505  
    3232#import <wtf/RetainPtr.h>
    3333
    34 TEST(WebKit2, LoadDataWithNilMIMEType)
     34TEST(WebKit, LoadDataWithNilMIMEType)
    3535{
    3636    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSZeroRect]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/LoadInvalidURLRequest.mm

    r208089 r221505  
    6767namespace TestWebKitAPI {
    6868
    69 TEST(WebKit2, LoadInvalidURLRequest)
     69TEST(WebKit, LoadInvalidURLRequest)
    7070{
    7171    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ModalAlerts.mm

    r217571 r221505  
    130130@end
    131131
    132 TEST(WebKit2, ModalAlerts)
     132TEST(WebKit, ModalAlerts)
    133133{
    134134    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/NSFileManagerExtras.mm

    r220506 r221505  
    4141}
    4242
    43 TEST(WebKit2, _WKNSFileManagerExtras)
     43TEST(WebKit, _WKNSFileManagerExtras)
    4444{
    4545    NSString *fileName = @"test.pdf";

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ObservedRenderingProgressEventsAfterCrash.mm

    r208340 r221505  
    3434#if PLATFORM(MAC) && WK_API_ENABLED
    3535
    36 TEST(WebKit2, ObservedRenderingProgressEventsAfterCrash)
     36TEST(WebKit, ObservedRenderingProgressEventsAfterCrash)
    3737{
    3838    __block bool done = false;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/OpenAndCloseWindow.mm

    r219378 r221505  
    7878@end
    7979
    80 TEST(WebKit2, OpenAndCloseWindow)
     80TEST(WebKit, OpenAndCloseWindow)
    8181{
    8282    resetToConsistentState();
    … …  
    140140@end
    141141
    142 TEST(WebKit2, OpenAndCloseWindowAsync)
     142TEST(WebKit, OpenAndCloseWindowAsync)
    143143{
    144144    resetToConsistentState();
    … …  
    158158}
    159159
    160 TEST(WebKit2, OpenAsyncWithNil)
     160TEST(WebKit, OpenAsyncWithNil)
    161161{
    162162    resetToConsistentState();
    … …  
    178178
    179179// https://bugs.webkit.org/show_bug.cgi?id=171083 - Try to figure out why this fails for some configs but not others, and resolve.
    180 //TEST(WebKit2, OpenAndCloseWindowAsyncCallbackException)
     180//TEST(WebKit, OpenAndCloseWindowAsyncCallbackException)
    181181//{
    182182//    resetToConsistentState();
    … …  
    229229@end
    230230
    231 TEST(WebKit2, OpenWindowFeatures)
     231TEST(WebKit, OpenWindowFeatures)
    232232{
    233233    resetToConsistentState();

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Preferences.mm

    r210103 r221505  
    3434#import <wtf/RetainPtr.h>
    3535
    36 TEST(WebKit2, DefaultWKPreferences)
     36TEST(WebKit, DefaultWKPreferences)
    3737{
    3838    RetainPtr<WKPreferences> preferences = adoptNS([[WKPreferences alloc] init]);
    … …  
    4343}
    4444
    45 TEST(WebKit2, LoadsImagesAutomatically)
     45TEST(WebKit, LoadsImagesAutomatically)
    4646{
    4747    RetainPtr<WKPreferences> preferences = adoptNS([[WKPreferences alloc] init]);
    … …  
    5454}
    5555
    56 TEST(WebKit2, ExperimentalFeatures)
     56TEST(WebKit, ExperimentalFeatures)
    5757{
    5858    NSArray *features = [WKPreferences _experimentalFeatures];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.mm

    r216203 r221505  
    4141static bool isDone;
    4242
    43 TEST(WebKit2, RemoteObjectRegistry)
     43TEST(WebKit, RemoteObjectRegistry)
    4444{
    4545    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RenderedImageWithOptions.mm

    r216203 r221505  
    6666}
    6767
    68 TEST(WebKit2, NodeHandleRenderedImageExcludingOverflow)
     68TEST(WebKit, NodeHandleRenderedImageExcludingOverflow)
    6969{
    7070    runTestWithWidth(nil, { 720, 540 });
    7171}
    7272
    73 TEST(WebKit2, NodeHandleRenderedImageWithWidth)
     73TEST(WebKit, NodeHandleRenderedImageWithWidth)
    7474{
    7575    runTestWithWidth(@(-1), { 0, 0 });

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RunOpenPanel.mm

    r217865 r221505  
    5353namespace TestWebKitAPI {
    5454
    55 TEST(WebKit2, RunOpenPanelNonLatin1)
     55TEST(WebKit, RunOpenPanelNonLatin1)
    5656{
    5757    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ShouldOpenExternalURLsInNewWindowActions.mm

    r208455 r221505  
    7171@end
    7272
    73 TEST(WebKit2, ShouldOpenExternalURLsInWindowOpen)
     73TEST(WebKit, ShouldOpenExternalURLsInWindowOpen)
    7474{
    7575    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    132132}
    133133
    134 TEST(WebKit2, ShouldOpenExternalURLsInTargetedLink)
     134TEST(WebKit, ShouldOpenExternalURLsInTargetedLink)
    135135{
    136136    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
    … …  
    209209}
    210210
    211 TEST(WebKit2, RestoreShouldOpenExternalURLsPolicyAfterCrash)
     211TEST(WebKit, RestoreShouldOpenExternalURLsPolicyAfterCrash)
    212212{
    213213    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ShrinkToFit.mm

    r205329 r221505  
    3737static bool shrinkToFitDisabledDone;
    3838
    39 TEST(WebKit2, ShrinkToFit)
     39TEST(WebKit, ShrinkToFit)
    4040{
    4141    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

    r221503 r221505  
    6060@end
    6161
    62 TEST(WebKit2, WKWebViewIsPlayingAudio)
     62TEST(WebKit, WKWebViewIsPlayingAudio)
    6363{
    6464    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:[[[WKWebViewConfiguration alloc] init] autorelease]]);
    … …  
    110110@end
    111111
    112 TEST(WebKit2, ShowWebView)
     112TEST(WebKit, ShowWebView)
    113113{
    114114    delegate = adoptNS([[UITestDelegate alloc] init]);
    … …  
    149149@end
    150150
    151 TEST(WebKit2, ToolbarVisible)
     151TEST(WebKit, ToolbarVisible)
    152152{
    153153    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:[[[WKWebViewConfiguration alloc] init] autorelease]]);
    … …  
    181181@end
    182182
    183 TEST(WebKit2, ClickAutoFillButton)
     183TEST(WebKit, ClickAutoFillButton)
    184184{
    185185    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"ClickAutoFillButton"];
    … …  
    227227@end
    228228
    229 TEST(WebKit2, Focus)
     229TEST(WebKit, Focus)
    230230{
    231231    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
    … …  
    268268@end
    269269
    270 TEST(WebKit2, SaveDataToFile)
     270TEST(WebKit, SaveDataToFile)
    271271{
    272272    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
    … …  
    316316@end
    317317
    318 TEST(WebKit2, DidNotHandleWheelEvent)
     318TEST(WebKit, DidNotHandleWheelEvent)
    319319{
    320320    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/VisibleContentRect.mm

    r216802 r221505  
    5252namespace TestWebKitAPI {
    5353
    54 TEST(WebKit2, VisibleContentRect_FullBounds)
     54TEST(WebKit, VisibleContentRect_FullBounds)
    5555{
    5656    auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    6060}
    6161
    62 TEST(WebKit2, VisibleContentRect_FullBoundsWithinScrollView)
     62TEST(WebKit, VisibleContentRect_FullBoundsWithinScrollView)
    6363{
    6464    auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    7272}
    7373
    74 TEST(WebKit2, VisibleContentRect_FullBoundsWhenClippedByNonScrollView)
     74TEST(WebKit, VisibleContentRect_FullBoundsWhenClippedByNonScrollView)
    7575{
    7676    auto config = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    8686}
    8787
    88 TEST(WebKit2, VisibleContentRect_ClippedBoundsWhenClippedByScrollView)
     88TEST(WebKit, VisibleContentRect_ClippedBoundsWhenClippedByScrollView)
    8989{
    9090    CGRect windowBounds = CGRectMake(0, 0, 800, 600);
    … …  
    103103}
    104104
    105 TEST(WebKit2, VisibleContentRect_ClippedBoundsWhenClippedByEnclosingView)
     105TEST(WebKit, VisibleContentRect_ClippedBoundsWhenClippedByEnclosingView)
    106106{
    107107    auto config = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentViewEditingActions.mm

    r218276 r221505  
    4949}
    5050
    51 TEST(WebKit2, WKContentViewEditingActions)
     51TEST(WebKit, WKContentViewEditingActions)
    5252{
    5353    [UIPasteboard generalPasteboard].items = @[];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentViewTargetForAction.mm

    r221415 r221505  
    4545@end
    4646
    47 TEST(WebKit2, WKContentViewTargetForAction)
     47TEST(WebKit, WKContentViewTargetForAction)
    4848{
    4949    auto webView = adoptNS([[TestWKContentViewTargetForActionView alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm

    r219567 r221505  
    183183}
    184184
    185 TEST(WebKit2, WKHTTPCookieStore)
     185TEST(WebKit, WKHTTPCookieStore)
    186186{
    187187    runTestWithWebsiteDataStore([WKWebsiteDataStore defaultDataStore]);
    188188}
    189189
    190 TEST(WebKit2, WKHTTPCookieStoreNonPersistent)
     190TEST(WebKit, WKHTTPCookieStoreNonPersistent)
    191191{
    192192    RetainPtr<WKWebsiteDataStore> nonPersistentDataStore;
    … …  
    198198}
    199199
    200 TEST(WebKit2, WKHTTPCookieStoreCustom)
     200TEST(WebKit, WKHTTPCookieStoreCustom)
    201201{
    202202    NSURL *cookieStorageFile = [NSURL fileURLWithPath:[@"~/Library/WebKit/TestWebKitAPI/CustomWebsiteData/CookieStorage/Cookie.File" stringByExpandingTildeInPath] isDirectory:NO];
    … …  
    217217}
    218218
    219 TEST(WebKit2, CookieObserverCrash)
     219TEST(WebKit, CookieObserverCrash)
    220220{
    221221    RetainPtr<WKWebsiteDataStore> nonPersistentDataStore;
    … …  
    257257@end
    258258
    259 TEST(WebKit2, WKHTTPCookieStoreWithoutProcessPool)
     259TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
    260260{
    261261    NSHTTPCookie *cookie = [NSHTTPCookie cookieWithProperties:[NSDictionary dictionaryWithObjectsAndKeys:@"127.0.0.1", NSHTTPCookieDomain, @"/", NSHTTPCookiePath, @"cookiename", NSHTTPCookieName, @"cookievalue", NSHTTPCookieValue, [NSDate distantFuture], NSHTTPCookieExpires, nil]];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKNSNumber.mm

    r205036 r221505  
    3535namespace TestWebKitAPI {
    3636
    37 TEST(WebKit2, WKNSNumber)
     37TEST(WebKit, WKNSNumber)
    3838{
    3939    auto booleanRef = adoptWK(WKBooleanCreate(true));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKObject.mm

    r219764 r221505  
    3636namespace TestWebKitAPI {
    3737
    38 TEST(WebKit2, WKObject)
     38TEST(WebKit, WKObject)
    3939{
    4040    WKStringRef stringRef = WKStringCreateWithUTF8CString("just testing");
    … …  
    5151}
    5252
    53 TEST(WebKit2, WKObject_classMethods)
     53TEST(WebKit, WKObject_classMethods)
    5454{
    5555    Class wkObjectClass = NSClassFromString(@"WKObject");
    … …  
    5959}
    6060
    61 TEST(WebKit2, WKObject_classInDictionary)
     61TEST(WebKit, WKObject_classInDictionary)
    6262{
    6363    Class wkObjectClass = NSClassFromString(@"WKObject");

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFViewResizeCrash.mm

    r205329 r221505  
    3636static bool finishedDispatch;
    3737
    38 TEST(WebKit2, WKPDFViewResizeCrash)
     38TEST(WebKit, WKPDFViewResizeCrash)
    3939{
    4040    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFViewStablePresentationUpdateCallback.mm

    r218917 r221505  
    3434#if WK_API_ENABLED && PLATFORM(IOS)
    3535
    36 TEST(WebKit2, WKPDFViewStablePresentationUpdateCallback)
     36TEST(WebKit, WKPDFViewStablePresentationUpdateCallback)
    3737{
    3838    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKRequestActivatedElementInfo.mm

    r219768 r221505  
    4848}
    4949   
    50 TEST(WebKit2, RequestActivatedElementInfoForLink)
     50TEST(WebKit, RequestActivatedElementInfoForLink)
    5151{
    5252    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
    … …  
    7373}
    7474   
    75 TEST(WebKit2, RequestActivatedElementInfoForBlank)
     75TEST(WebKit, RequestActivatedElementInfoForBlank)
    7676{
    7777    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
    … …  
    9292}
    9393   
    94 TEST(WebKit2, RequestActivatedElementInfoWithNestedSynchronousUpdates)
     94TEST(WebKit, RequestActivatedElementInfoWithNestedSynchronousUpdates)
    9595{
    9696    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
    … …  
    116116}
    117117
    118 TEST(WebKit2, RequestActivatedElementInfoWithNestedRequests)
     118TEST(WebKit, RequestActivatedElementInfoWithNestedRequests)
    119119{
    120120    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebGLPolicy.mm

    r221486 r221505  
    115115}
    116116
    117 TEST(WebKit2, WebGLPolicy)
     117TEST(WebKit, WebGLPolicy)
    118118{
    119119    htmlURL = [NSURL URLWithString:@"test:///html"];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm

    r221337 r221505  
    6969}
    7070
    71 TEST(WebKit2, WebsiteDataStoreCustomPaths)
     71TEST(WebKit, WebsiteDataStoreCustomPaths)
    7272{
    7373    RetainPtr<WebsiteDataStoreCustomPathsMessageHandler> handler = adoptNS([[WebsiteDataStoreCustomPathsMessageHandler alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm

    r221172 r221505  
    126126@end
    127127
    128 TEST(WebKit2, WebsitePoliciesContentBlockersEnabled)
     128TEST(WebKit, WebsitePoliciesContentBlockersEnabled)
    129129{
    130130    [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
    … …  
    198198@end
    199199
    200 TEST(WebKit2, WebsitePoliciesAutoplayEnabled)
     200TEST(WebKit, WebsitePoliciesAutoplayEnabled)
    201201{
    202202    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    299299}
    300300
    301 TEST(WebKit2, WebsitePoliciesPlayAfterPreventedAutoplay)
     301TEST(WebKit, WebsitePoliciesPlayAfterPreventedAutoplay)
    302302{
    303303    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    367367}
    368368
    369 TEST(WebKit2, WebsitePoliciesPlayingWithoutInterference)
     369TEST(WebKit, WebsitePoliciesPlayingWithoutInterference)
    370370{
    371371    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    386386}
    387387
    388 TEST(WebKit2, WebsitePoliciesUserInterferenceWithPlaying)
     388TEST(WebKit, WebsitePoliciesUserInterferenceWithPlaying)
    389389{
    390390    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    510510@end
    511511
    512 TEST(WebKit2, WebsitePoliciesDuringRedirect)
     512TEST(WebKit, WebsitePoliciesDuringRedirect)
    513513{
    514514    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    530530}
    531531
    532 TEST(WebKit2, WebsitePoliciesUpdates)
     532TEST(WebKit, WebsitePoliciesUpdates)
    533533{
    534534    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
    … …  
    566566}
    567567
    568 TEST(WebKit2, WebsitePoliciesAutoplayQuirks)
     568TEST(WebKit, WebsitePoliciesAutoplayQuirks)
    569569{
    570570    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm

    r219191 r221505  
    6060namespace TestWebKitAPI {
    6161
    62 TEST(WebKit1, AudioSessionCategoryIOS)
     62TEST(WebKitLegacy, AudioSessionCategoryIOS)
    6363{
    6464    WebCore::Settings::setShouldManageAudioSessionCategory(true);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/SnapshotViaRenderInContext.mm

    r217296 r221505  
    6161}
    6262
    63 TEST(WebKit1, RenderInContextSnapshot)
     63TEST(WebKitLegacy, RenderInContextSnapshot)
    6464{
    6565    const NSInteger width = 800;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitObjC/PreventImageLoadWithAutoResizing.mm

    r194950 r221505  
    4141namespace TestWebKitAPI {
    4242
    43 TEST(WebKit2, PreventImageLoadWithAutoResizingTest)
     43TEST(WebKit, PreventImageLoadWithAutoResizingTest)
    4444{
    4545    WKRetainPtr<WKContextRef> context = adoptWK(Util::createContextForInjectedBundleTest("DenyWillSendRequestTest"));

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/ios/MemoryCacheAddImageToCacheIOS.mm

    r168970 r221505  
    3030namespace TestWebKitAPI {
    3131
    32 TEST(WebKit1, MemoryCacheAddImageToCache)
     32TEST(WebKitLegacy, MemoryCacheAddImageToCache)
    3333{
    3434    CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/BackForwardList.mm

    r178293 r221505  
    5353namespace TestWebKitAPI {
    5454
    55 TEST(WebKit1, ReloadBackForward)
     55TEST(WebKitLegacy, ReloadBackForward)
    5656{
    5757    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/CancelLoadFromResourceLoadDelegate.mm

    r178293 r221505  
    6161namespace TestWebKitAPI {
    6262
    63 TEST(WebKit1, CancelLoadFromResourceLoadDelegate)
     63TEST(WebKitLegacy, CancelLoadFromResourceLoadDelegate)
    6464{
    6565    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/CloseNewWindowInNavigationPolicyDelegate.mm

    r178293 r221505  
    6868namespace TestWebKitAPI {
    6969
    70 TEST(WebKit1, CloseNewWindowInNavigationPolicyDelegate)
     70TEST(WebKitLegacy, CloseNewWindowInNavigationPolicyDelegate)
    7171{
    7272    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuCanCopyURL.mm

    r208455 r221505  
    8787}
    8888
    89 
    90 TEST(WebKit1, ContextMenuCanCopyURL)
     89TEST(WebKitLegacy, ContextMenuCanCopyURL)
    9190{
    9291    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0,0,800,600) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/ContextMenuDefaultItemsHaveTags.mm

    r208455 r221505  
    4848namespace TestWebKitAPI {
    4949
    50 TEST(WebKit1, ContextMenuDefaultItemsHaveTags)
     50TEST(WebKitLegacy, ContextMenuDefaultItemsHaveTags)
    5151{
    5252    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/CrossPartitionFileSchemeAccess.mm

    r210600 r221505  
    8888namespace TestWebKitAPI {
    8989
    90 TEST(WebKit1, CrossPartitionFileSchemeAccess)
     90TEST(WebKitLegacy, CrossPartitionFileSchemeAccess)
    9191{
    9292    NSURL *url = [[NSBundle mainBundle] URLForResource:@"CrossPartitionFileSchemeAccess" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLTableCellCellAbove.mm

    r178293 r221505  
    5555}
    5656
    57 TEST(WebKit1, HTMLTableCellElementCellAbove)
     57TEST(WebKitLegacy, HTMLTableCellElementCellAbove)
    5858{
    5959    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DOMHTMLVideoElementWrapper.mm

    r197633 r221505  
    4848namespace TestWebKitAPI {
    4949
    50 TEST(WebKit1, DOMHTMLVideoElementWrapper)
     50TEST(WebKitLegacy, DOMHTMLVideoElementWrapper)
    5151{
    5252    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DOMNode.mm

    r208027 r221505  
    4747namespace TestWebKitAPI {
    4848
    49 TEST(WebKit1, DOMNodeCompareDocumentPosition)
     49TEST(WebKitLegacy, DOMNodeCompareDocumentPosition)
    5050{
    5151    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DOMNodeFromJSObject.mm

    r138747 r221505  
    3434namespace TestWebKitAPI {
    3535
    36 TEST(WebKit1, DOMNodeFromJSObject)
     36TEST(WebKitLegacy, DOMNodeFromJSObject)
    3737{
    3838    WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DOMRangeOfString.mm

    r178293 r221505  
    4747namespace TestWebKitAPI {
    4848
    49 TEST(WebKit1, DOMRangeOfString)
     49TEST(WebKitLegacy, DOMRangeOfString)
    5050{
    5151    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorInDashboardRegions.mm

    r178293 r221505  
    5151namespace TestWebKitAPI {
    5252
    53 TEST(WebKit1, DeviceScaleFactorInDashboardRegions)
     53TEST(WebKitLegacy, DeviceScaleFactorInDashboardRegions)
    5454{
    5555    NSRect viewFrame = NSMakeRect(0, 0, 800, 600);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/EarlyKVOCrash.mm

    r198604 r221505  
    7979namespace TestWebKitAPI {
    8080
    81 TEST(WebKit1, EarlyKVOCrash)
     81TEST(WebKitLegacy, EarlyKVOCrash)
    8282{
    8383    auto webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/ElementAtPointInWebFrame.mm

    r178293 r221505  
    4545namespace TestWebKitAPI {
    4646
    47 TEST(WebKit1, ElementAtPoint)
     47TEST(WebKitLegacy, ElementAtPoint)
    4848{
    4949    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm

    r191451 r221505  
    4242}
    4343
    44 TEST(WebKit2, FirstResponderScrollingPosition)
     44TEST(WebKit, FirstResponderScrollingPosition)
    4545{
    4646    WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderSuppression.mm

    r215587 r221505  
    4646namespace TestWebKitAPI {
    4747
    48 TEST(WebKit2, FirstResponderSuppression)
     48TEST(WebKit, FirstResponderSuppression)
    4949{
    5050    RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/FragmentNavigation.mm

    r178293 r221505  
    111111namespace TestWebKitAPI {
    112112
    113 TEST(WebKit1, FragmentNavigation)
     113TEST(WebKitLegacy, FragmentNavigation)
    114114{
    115115    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/HTMLCollectionNamedItem.mm

    r183976 r221505  
    4949namespace TestWebKitAPI {
    5050
    51 TEST(WebKit1, HTMLCollectionNamedItemTest)
     51TEST(WebKitLegacy, HTMLCollectionNamedItemTest)
    5252{
    5353    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/HTMLFormCollectionNamedItem.mm

    r183976 r221505  
    4949namespace TestWebKitAPI {
    5050
    51 TEST(WebKit1, HTMLFormCollectionNamedItemTest)
     51TEST(WebKitLegacy, HTMLFormCollectionNamedItemTest)
    5252{
    5353    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm

    r186268 r221505  
    5151namespace TestWebKitAPI {
    5252
    53 TEST(WebKit1, InspectorBarTest)
     53TEST(WebKitLegacy, InspectorBarTest)
    5454{
    5555    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/IsNavigationActionTrusted.mm

    r197151 r221505  
    8282#if WK_API_ENABLED
    8383
    84 TEST(WebKit2, IsNavigationActionTrusted)
     84TEST(WebKit, IsNavigationActionTrusted)
    8585{
    8686    @autoreleasepool {
    … …  
    100100#endif
    101101
    102 TEST(WebKit1, IsNavigationActionTrusted)
     102TEST(WebKitLegacy, IsNavigationActionTrusted)
    103103{
    104104    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/JSWrapperForNodeInWebFrame.mm

    r178293 r221505  
    5151namespace TestWebKitAPI {
    5252
    53 TEST(WebKit1, JSWrapperForNode)
     53TEST(WebKitLegacy, JSWrapperForNode)
    5454{
    5555    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/LimitTitleSize.mm

    r215784 r221505  
    5959namespace TestWebKitAPI {
    6060
    61 TEST(WebKit1, LimitTitleSize)
     61TEST(WebKitLegacy, LimitTitleSize)
    6262{
    6363    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm

    r208089 r221505  
    6363namespace TestWebKitAPI {
    6464
    65 TEST(WebKit1, LoadInvalidURLRequest)
     65TEST(WebKitLegacy, LoadInvalidURLRequest)
    6666{
    6767    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm

    r217449 r221505  
    142142}
    143143
    144 TEST(WebKit1, MediaPlaybackSleepAssertion)
     144TEST(WebKitLegacy, MediaPlaybackSleepAssertion)
    145145{
    146146    didFinishLoad = false;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCacheDisableWithinResourceLoadDelegate.mm

    r178293 r221505  
    7171namespace TestWebKitAPI {
    7272
    73 TEST(WebKit1, MemoryCacheDisableWithinResourceLoadDelegate)
     73TEST(WebKitLegacy, MemoryCacheDisableWithinResourceLoadDelegate)
    7474{
    7575    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MemoryCachePruneWithinResourceLoadDelegate.mm

    r178293 r221505  
    7676namespace TestWebKitAPI {
    7777
    78 TEST(WebKit1, DISABLED_MemoryCachePruneWithinResourceLoadDelegate)
     78TEST(WebKitLegacy, DISABLED_MemoryCachePruneWithinResourceLoadDelegate)
    7979{
    8080    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MemoryPressureHandler.mm

    r208580 r221505  
    2929namespace TestWebKitAPI {
    3030
    31 TEST(WebKit1, MemoryPressureHandler)
     31TEST(WebKitLegacy, MemoryPressureHandler)
    3232{
    3333    WebInstallMemoryPressureHandler();

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm

    r220979 r221505  
    6464}
    6565
    66 TEST(WebKit1, MenuAndButtonForNormalLeftClick)
     66TEST(WebKitLegacy, MenuAndButtonForNormalLeftClick)
    6767{
    6868    buildAndPerformTest(NSEventTypeLeftMouseDown, 0, WebCore::LeftButton, NSMenuTypeNone);
    6969}
    7070
    71 TEST(WebKit1, MenuAndButtonForNormalRightClick)
     71TEST(WebKitLegacy, MenuAndButtonForNormalRightClick)
    7272{
    7373    buildAndPerformTest(NSEventTypeRightMouseDown, 0, WebCore::RightButton, NSMenuTypeContextMenu);
    7474}
    7575
    76 TEST(WebKit1, MenuAndButtonForNormalMiddleClick)
     76TEST(WebKitLegacy, MenuAndButtonForNormalMiddleClick)
    7777{
    7878    buildAndPerformTest(NSEventTypeOtherMouseDown, 0, WebCore::MiddleButton, NSMenuTypeNone);
    7979}
    8080
    81 TEST(WebKit1, MenuAndButtonForControlLeftClick)
     81TEST(WebKitLegacy, MenuAndButtonForControlLeftClick)
    8282{
    8383    buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagControl, WebCore::LeftButton, NSMenuTypeContextMenu);
    8484}
    8585
    86 TEST(WebKit1, MenuAndButtonForControlRightClick)
     86TEST(WebKitLegacy, MenuAndButtonForControlRightClick)
    8787{
    8888    buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagControl, WebCore::RightButton, NSMenuTypeContextMenu);
    8989}
    9090
    91 TEST(WebKit1, MenuAndButtonForControlMiddleClick)
     91TEST(WebKitLegacy, MenuAndButtonForControlMiddleClick)
    9292{
    9393    buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagControl, WebCore::MiddleButton, NSMenuTypeNone);
    9494}
    9595   
    96 TEST(WebKit1, MenuAndButtonForShiftLeftClick)
     96TEST(WebKitLegacy, MenuAndButtonForShiftLeftClick)
    9797{
    9898    buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagShift, WebCore::LeftButton, NSMenuTypeNone);
    9999}
    100100
    101 TEST(WebKit1, MenuAndButtonForShiftRightClick)
     101TEST(WebKitLegacy, MenuAndButtonForShiftRightClick)
    102102{
    103103    buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagShift, WebCore::RightButton, NSMenuTypeContextMenu);
    104104}
    105105
    106 TEST(WebKit1, MenuAndButtonForShiftMiddleClick)
     106TEST(WebKitLegacy, MenuAndButtonForShiftMiddleClick)
    107107{
    108108    buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagShift, WebCore::MiddleButton, NSMenuTypeNone);
    109109}
    110110
    111 TEST(WebKit1, MenuAndButtonForCommandLeftClick)
     111TEST(WebKitLegacy, MenuAndButtonForCommandLeftClick)
    112112{
    113113    buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagCommand, WebCore::LeftButton, NSMenuTypeNone);
    114114}
    115115
    116 TEST(WebKit1, MenuAndButtonForCommandRightClick)
     116TEST(WebKitLegacy, MenuAndButtonForCommandRightClick)
    117117{
    118118    buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagCommand, WebCore::RightButton, NSMenuTypeContextMenu);
    119119}
    120120
    121 TEST(WebKit1, MenuAndButtonForCommandMiddleClick)
     121TEST(WebKitLegacy, MenuAndButtonForCommandMiddleClick)
    122122{
    123123    buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagCommand, WebCore::MiddleButton, NSMenuTypeNone);
    124124}
    125125
    126 TEST(WebKit1, MenuAndButtonForAltLeftClick)
     126TEST(WebKitLegacy, MenuAndButtonForAltLeftClick)
    127127{
    128128    buildAndPerformTest(NSEventTypeLeftMouseDown, NSEventModifierFlagOption, WebCore::LeftButton, NSMenuTypeNone);
    129129}
    130130
    131 TEST(WebKit1, MenuAndButtonForAltRightClick)
     131TEST(WebKitLegacy, MenuAndButtonForAltRightClick)
    132132{
    133133    buildAndPerformTest(NSEventTypeRightMouseDown, NSEventModifierFlagOption, WebCore::RightButton, NSMenuTypeContextMenu);
    134134}
    135135
    136 TEST(WebKit1, MenuAndButtonForAltMiddleClick)
     136TEST(WebKitLegacy, MenuAndButtonForAltMiddleClick)
    137137{
    138138    buildAndPerformTest(NSEventTypeOtherMouseDown, NSEventModifierFlagOption, WebCore::MiddleButton, NSMenuTypeNone);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/NavigatorLanguage.mm

    r208601 r221505  
    9191];
    9292
    93 TEST(WebKit1, NavigatorLanguage)
     93TEST(WebKitLegacy, NavigatorLanguage)
    9494{
    9595    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMNode.mm

    r178293 r221505  
    4747namespace TestWebKitAPI {
    4848
    49 TEST(WebKit1, RenderedImageFromDOMNode)
     49TEST(WebKitLegacy, RenderedImageFromDOMNode)
    5050{
    5151    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/RenderedImageFromDOMRange.mm

    r178293 r221505  
    4747namespace TestWebKitAPI {
    4848
    49 TEST(WebKit1, RenderedImageFromDOMRange)
     49TEST(WebKitLegacy, RenderedImageFromDOMRange)
    5050{
    5151    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/SetAndUpdateCacheModel.mm

    r182434 r221505  
    3636namespace TestWebKitAPI {
    3737
    38 TEST(WebKit1, SetAndUpdateCacheModelInitialModel)
     38TEST(WebKitLegacy, SetAndUpdateCacheModelInitialModel)
    3939{
    4040    EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
    … …  
    4545}
    4646
    47 TEST(WebKit1, SetAndUpdateCacheModelStandardPreferenceChange)
     47TEST(WebKitLegacy, SetAndUpdateCacheModelStandardPreferenceChange)
    4848{
    4949    EXPECT_EQ((int)WebCacheModelDocumentViewer, (int)[WebView _cacheModel]);
    … …  
    5959}
    6060
    61 TEST(WebKit1, SetAndUpdateCacheModelPreferencesChangeMix)
     61TEST(WebKitLegacy, SetAndUpdateCacheModelPreferencesChangeMix)
    6262{
    6363    // On change, the cache model always take the highest value of any preference bound to a WebView.

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/SetDocumentURI.mm

    r204256 r221505  
    4848namespace TestWebKitAPI {
    4949
    50 TEST(WebKit1, SetDocumentURITestFile)
     50TEST(WebKitLegacy, SetDocumentURITestFile)
    5151{
    5252    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
    … …  
    6565}
    6666
    67 TEST(WebKit1, SetDocumentURITestURL)
     67TEST(WebKitLegacy, SetDocumentURITestURL)
    6868{
    6969    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
    … …  
    8585}
    8686
    87 TEST(WebKit1, SetDocumentURITestString)
     87TEST(WebKitLegacy, SetDocumentURITestString)
    8888{
    8989    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
    … …  
    101101}
    102102
    103 TEST(WebKit1, SetDocumentURITestNull)
     103TEST(WebKitLegacy, SetDocumentURITestNull)
    104104{
    105105    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/SimplifyMarkup.mm

    r178293 r221505  
    4848namespace TestWebKitAPI {
    4949
    50 TEST(WebKit1, SimplifyMarkupTest)
     50TEST(WebKitLegacy, SimplifyMarkupTest)
    5151{
    5252    RetainPtr<WebView> webView1 = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidFinishLoading.mm

    r178293 r221505  
    4747namespace TestWebKitAPI {
    4848
    49 TEST(WebKit1, StopLoadingFromDidFinishLoading)
     49TEST(WebKitLegacy, StopLoadingFromDidFinishLoading)
    5050{
    5151    AutodrainedPool pool;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/StopLoadingFromDidReceiveResponse.mm

    r178293 r221505  
    5454namespace TestWebKitAPI {
    5555
    56 TEST(WebKit1, StopLoadingFromDidReceiveResponse)
     56TEST(WebKitLegacy, StopLoadingFromDidReceiveResponse)
    5757{
    5858    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/StringByEvaluatingJavaScriptFromString.mm

    r149716 r221505  
    3030namespace TestWebKitAPI {
    3131
    32 TEST(WebKit1, StringByEvaluatingJavaScriptFromString)
     32TEST(WebKitLegacy, StringByEvaluatingJavaScriptFromString)
    3333{
    3434    // maps expected result <= JavaScript expression

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm

    r219050 r221505  
    3131namespace TestWebKitAPI {
    3232
    33 TEST(WebKit1, StringTruncator)
     33TEST(WebKitLegacy, StringTruncator)
    3434{
    3535    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/SubresourceErrorCrash.mm

    r101939 r221505  
    2828namespace TestWebKitAPI {
    2929
    30 TEST(WebKit1, SubresourceErrorCrash)
     30TEST(WebKitLegacy, SubresourceErrorCrash)
    3131{
    3232    WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:@"" groupName:@""];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/TypingStyleCrash.mm

    r175613 r221505  
    2828namespace TestWebKitAPI {
    2929
    30 TEST(WebKit1, TypingStyleCrash)
     30TEST(WebKitLegacy, TypingStyleCrash)
    3131{
    3232    WebView *webView = [[WebView alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebScriptObjectDescription.mm

    r199834 r221505  
    5959namespace TestWebKitAPI {
    6060
    61 TEST(WebKit1, WebScriptObjectDescription)
     61TEST(WebKitLegacy, WebScriptObjectDescription)
    6262{
    6363    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewCanPasteURL.mm

    r111080 r221505  
    3333namespace TestWebKitAPI {
    3434
    35 TEST(WebKit1, WebViewCanPasteURL)
     35TEST(WebKitLegacy, WebViewCanPasteURL)
    3636{
    3737    WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewCanPasteZeroPng.mm

    r122228 r221505  
    3333namespace TestWebKitAPI {
    3434
    35 TEST(WebKit1, WebViewCanPasteZeroPng)
     35TEST(WebKitLegacy, WebViewCanPasteZeroPng)
    3636{
    3737    WebView *webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:nil groupName:nil];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewCloseInsideDidFinishLoadForFrame.mm

    r186579 r221505  
    4949namespace TestWebKitAPI {
    5050
    51 TEST(WebKit1, WebViewCloseInsideDidFinishLoadForFrame)
     51TEST(WebKitLegacy, WebViewCloseInsideDidFinishLoadForFrame)
    5252{
    5353    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidCreateJavaScriptContext.mm

    r185487 r221505  
    137137namespace TestWebKitAPI {
    138138
    139 TEST(WebKit1, DidCreateJavaScriptContextSanity1)
     139TEST(WebKitLegacy, DidCreateJavaScriptContextSanity1)
    140140{
    141141    didFinishLoad = false;
    … …  
    163163}
    164164
    165 TEST(WebKit1, DidCreateJavaScriptContextSanity2)
     165TEST(WebKitLegacy, DidCreateJavaScriptContextSanity2)
    166166{
    167167    didCallWindowCallback = false;
    … …  
    186186}
    187187
    188 TEST(WebKit1, DidCreateJavaScriptContextCallJSFunctionFromObjCCallbackTest)
     188TEST(WebKitLegacy, DidCreateJavaScriptContextCallJSFunctionFromObjCCallbackTest)
    189189{
    190190    @autoreleasepool {
    … …  
    210210}
    211211
    212 TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromJSTest)
     212TEST(WebKitLegacy, DidCreateJavaScriptContextAddCustomPropertiesFromJSTest)
    213213{
    214214    didFindMyCustomProperty = false;
    … …  
    236236}
    237237
    238 TEST(WebKit1, DidCreateJavaScriptContextAddCustomPropertiesFromObjCTest)
     238TEST(WebKitLegacy, DidCreateJavaScriptContextAddCustomPropertiesFromObjCTest)
    239239{
    240240    didFindMyCustomProperty = false;
    … …  
    264264}
    265265
    266 TEST(WebKit1, DidCreateJavaScriptContextBackForwardCacheTest)
     266TEST(WebKitLegacy, DidCreateJavaScriptContextBackForwardCacheTest)
    267267{
    268268    didInsertMyCustomProperty = false;
    … …  
    307307}
    308308
    309 TEST(WebKit1, ReportExceptionTest)
     309TEST(WebKitLegacy, ReportExceptionTest)
    310310{
    311311    didReportException = false;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewDidRemoveFrameFromHierarchy.mm

    r178293 r221505  
    5151namespace TestWebKitAPI {
    5252
    53 TEST(WebKit1, DidRemoveFrameFromHierarchy)
     53TEST(WebKitLegacy, DidRemoveFrameFromHierarchy)
    5454{
    5555    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WebViewIconLoading.mm

    r219099 r221505  
    156156namespace TestWebKitAPI {
    157157
    158 TEST(WebKit1, IconLoadingDelegateDefaultFirst)
     158TEST(WebKitLegacy, IconLoadingDelegateDefaultFirst)
    159159{
    160160    [NSURLProtocol registerClass:[IconLoadingProtocol class]];
    … …  
    197197}
    198198
    199 TEST(WebKit1, IconLoadingDelegateCustomFirst)
     199TEST(WebKitLegacy, IconLoadingDelegateCustomFirst)
    200200{
    201201    [NSURLProtocol registerClass:[IconLoadingProtocol class]];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WillPerformClientRedirectToURLCrash.mm

    r178293 r221505  
    7373namespace TestWebKitAPI {
    7474
    75 TEST(WebKit1, WillPerformClientRedirectToURLCrash)
     75TEST(WebKitLegacy, WillPerformClientRedirectToURLCrash)
    7676{
    7777    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WillSendSubmitEvent.mm

    r168177 r221505  
    5858namespace TestWebKitAPI {
    5959
    60 TEST(WebKit1, WillSendSubmitEvent)
     60TEST(WebKitLegacy, WillSendSubmitEvent)
    6161{
    6262    @autoreleasepool {

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WindowlessWebViewWithMedia.mm

    r178293 r221505  
    6262}
    6363
    64 TEST(WebKit1, WindowlessWebViewWithMedia)
     64TEST(WebKitLegacy, WindowlessWebViewWithMedia)
    6565{
    6666    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/WordBoundaryTypingAttributes.mm

    r187449 r221505  
    4646namespace TestWebKitAPI {
    4747
    48 TEST(WebKit1, WordBoundaryTypingAttributes)
     48TEST(WebKitLegacy, WordBoundaryTypingAttributes)
    4949{
    5050    RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
Note: See TracChangeset for help on using the changeset viewer.