Changeset 181031 in webkit


Ignore:
Timestamp:
Mar 4, 2015, 2:10:21 PM (10 years ago)
Author:
achristensen@apple.com
Message:

Move content extensions test to properly named directory.
​https://bugs.webkit.org/show_bug.cgi?id=142299

Reviewed by Tim Horton.

Tools:

  • WebKitTestRunner/mac/TestControllerMac.mm:

(WTR::TestController::platformConfigureViewForTest):

LayoutTests:

  • TestExpectations:
  • http/tests/contentextensions: Added.
  • http/tests/contentextensions/basic-filter-expected.txt: Copied from platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt.
  • http/tests/contentextensions/basic-filter.html: Copied from http/tests/usercontentfilter/basic-filter.html.
  • http/tests/contentextensions/basic-filter.html.hson: Copied from http/tests/usercontentfilter/basic-filter.html.json.
  • http/tests/contentextensions/block-cookies-basic-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-basic-expected.txt.
  • http/tests/contentextensions/block-cookies-basic.html: Copied from http/tests/usercontentfilter/block-cookies-basic.html.
  • http/tests/contentextensions/block-cookies-basic.html.json: Copied from http/tests/usercontentfilter/block-cookies-basic.html.json.
  • http/tests/contentextensions/block-cookies-send-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-send-expected.txt.
  • http/tests/contentextensions/block-cookies-send.html: Copied from http/tests/usercontentfilter/block-cookies-send.html.
  • http/tests/contentextensions/block-cookies-send.html.json: Copied from http/tests/usercontentfilter/block-cookies-send.html.json.
  • http/tests/contentextensions/css-display-none-expected.txt: Copied from http/tests/usercontentfilter/css-display-none-expected.txt.
  • http/tests/contentextensions/css-display-none.html: Copied from http/tests/usercontentfilter/css-display-none.html.
  • http/tests/contentextensions/css-display-none.html.json: Copied from http/tests/usercontentfilter/css-display-none.html.json.
  • http/tests/usercontentfilter/basic-filter.html: Removed.
  • http/tests/usercontentfilter/basic-filter.html.json: Removed.
  • http/tests/usercontentfilter/block-cookies-basic-expected.txt: Removed.
  • http/tests/usercontentfilter/block-cookies-basic.html: Removed.
  • http/tests/usercontentfilter/block-cookies-basic.html.json: Removed.
  • http/tests/usercontentfilter/block-cookies-send-expected.txt: Removed.
  • http/tests/usercontentfilter/block-cookies-send.html: Removed.
  • http/tests/usercontentfilter/block-cookies-send.html.json: Removed.
  • http/tests/usercontentfilter/css-display-none-expected.txt: Removed.
  • http/tests/usercontentfilter/css-display-none.html: Removed.
  • http/tests/usercontentfilter/css-display-none.html.json: Removed.
  • platform/mac-wk2/TestExpectations:
  • platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt: Removed.
Location:
trunk
Files:
1 added
5 edited
12 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r181021 r181031  
     12015-03-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move content extensions test to properly named directory.
     4        https://bugs.webkit.org/show_bug.cgi?id=142299
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestExpectations:
     9        * http/tests/contentextensions: Added.
     10        * http/tests/contentextensions/basic-filter-expected.txt: Copied from platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt.
     11        * http/tests/contentextensions/basic-filter.html: Copied from http/tests/usercontentfilter/basic-filter.html.
     12        * http/tests/contentextensions/basic-filter.html.hson: Copied from http/tests/usercontentfilter/basic-filter.html.json.
     13        * http/tests/contentextensions/block-cookies-basic-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-basic-expected.txt.
     14        * http/tests/contentextensions/block-cookies-basic.html: Copied from http/tests/usercontentfilter/block-cookies-basic.html.
     15        * http/tests/contentextensions/block-cookies-basic.html.json: Copied from http/tests/usercontentfilter/block-cookies-basic.html.json.
     16        * http/tests/contentextensions/block-cookies-send-expected.txt: Copied from http/tests/usercontentfilter/block-cookies-send-expected.txt.
     17        * http/tests/contentextensions/block-cookies-send.html: Copied from http/tests/usercontentfilter/block-cookies-send.html.
     18        * http/tests/contentextensions/block-cookies-send.html.json: Copied from http/tests/usercontentfilter/block-cookies-send.html.json.
     19        * http/tests/contentextensions/css-display-none-expected.txt: Copied from http/tests/usercontentfilter/css-display-none-expected.txt.
     20        * http/tests/contentextensions/css-display-none.html: Copied from http/tests/usercontentfilter/css-display-none.html.
     21        * http/tests/contentextensions/css-display-none.html.json: Copied from http/tests/usercontentfilter/css-display-none.html.json.
     22        * http/tests/usercontentfilter/basic-filter.html: Removed.
     23        * http/tests/usercontentfilter/basic-filter.html.json: Removed.
     24        * http/tests/usercontentfilter/block-cookies-basic-expected.txt: Removed.
     25        * http/tests/usercontentfilter/block-cookies-basic.html: Removed.
     26        * http/tests/usercontentfilter/block-cookies-basic.html.json: Removed.
     27        * http/tests/usercontentfilter/block-cookies-send-expected.txt: Removed.
     28        * http/tests/usercontentfilter/block-cookies-send.html: Removed.
     29        * http/tests/usercontentfilter/block-cookies-send.html.json: Removed.
     30        * http/tests/usercontentfilter/css-display-none-expected.txt: Removed.
     31        * http/tests/usercontentfilter/css-display-none.html: Removed.
     32        * http/tests/usercontentfilter/css-display-none.html.json: Removed.
     33        * platform/mac-wk2/TestExpectations:
     34        * platform/mac/http/tests/usercontentfilter/basic-filter-expected.txt: Removed.
     35
    1362015-03-04  Brent Fulgham  <bfulgham@apple.com>
    237

  • trunk/LayoutTests/TestExpectations

    r180922 r181031  
    486486webkit.org/b/141695 [ Debug ] fast/selectors/nth-last-child-of-register-requirement.html [ Slow ]
    487487
    488 # UserContentFilters are Mac-WK2-only for now
    489 http/tests/usercontentfilter [ Skip ]
     488# Content extensions are Mac-WK2-only for now
     489http/tests/contentextensions [ Skip ]

  • trunk/LayoutTests/platform/mac-wk2/TestExpectations

    r180793 r181031  
    514514########################################
    515515
    516 http/tests/usercontentfilter [ Pass ]
     516http/tests/contentextensions [ Pass ]

  • trunk/Tools/ChangeLog

    r181014 r181031  
     12015-03-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move content extensions test to properly named directory.
     4        https://bugs.webkit.org/show_bug.cgi?id=142299
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebKitTestRunner/mac/TestControllerMac.mm:
     9        (WTR::TestController::platformConfigureViewForTest):
     10
    1112015-03-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    212

  • trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r180636 r181031  
    9898    ensureViewSupportsOptions(viewOptions.get());
    9999
    100     if (!test.urlContains("usercontentfilter/"))
     100    if (!test.urlContains("contentextensions/"))
    101101        return;
    102102
    … …  
    105105
    106106    NSStringEncoding encoding;
    107     NSString *contentFilterString = [NSString stringWithContentsOfURL:filterURL usedEncoding:&encoding error:NULL];
    108     if (!contentFilterString)
     107    NSString *contentExtensionString = [NSString stringWithContentsOfURL:filterURL usedEncoding:&encoding error:NULL];
     108    if (!contentExtensionString)
    109109        return;
    110110
    111     WKRetainPtr<WKStringRef> name = adoptWK(WKStringCreateWithUTF8CString("TestContentFilter"));
    112     WKRetainPtr<WKStringRef> contentFilterStringWK = adoptWK(WKStringCreateWithCFString((CFStringRef)contentFilterString));
    113     WKRetainPtr<WKUserContentFilterRef> filter = adoptWK(WKUserContentFilterCreate(name.get(), contentFilterStringWK.get()));
     111    WKRetainPtr<WKStringRef> name = adoptWK(WKStringCreateWithUTF8CString("TestContentExtensions"));
     112    WKRetainPtr<WKStringRef> contentExtensionStringWK = adoptWK(WKStringCreateWithCFString((CFStringRef)contentExtensionString));
     113    WKRetainPtr<WKUserContentFilterRef> filter = adoptWK(WKUserContentFilterCreate(name.get(), contentExtensionStringWK.get()));
    114114
    115115    WKPageGroupAddUserContentFilter(WKPageGetPageGroup(TestController::singleton().mainWebView()->page()), filter.get());
Note: See TracChangeset for help on using the changeset viewer.