Changeset 63871 in webkit


Ignore:
Timestamp:
Jul 21, 2010 6:08:36 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-07-21 Adam Barth <abarth@webkit.org>

Reviewed by Eric Seidel.

Let's pass the doctype01.dat tests again, please
https://bugs.webkit.org/show_bug.cgi?id=42794

The upstream results check the publicId and the systemId, so we need to
make dom2string smarter and print them.

  • html5lib/resources/dom2string.js: (dom2string):
  • html5lib/runner-expected-html5.txt:
  • html5lib/runner-expected.txt:
Location:
trunk/LayoutTests
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r63870 r63871  
     12010-07-21  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Let's pass the doctype01.dat tests again, please
     6        https://bugs.webkit.org/show_bug.cgi?id=42794
     7
     8        The upstream results check the publicId and the systemId, so we need to
     9        make dom2string smarter and print them.
     10
     11        * html5lib/resources/dom2string.js:
     12        (dom2string):
     13        * html5lib/runner-expected-html5.txt:
     14        * html5lib/runner-expected.txt:
     15
    1162010-07-21  Adam Barth  <abarth@webkit.org>
    217
  • trunk/LayoutTests/html5lib/resources/dom2string.js

    r59638 r63871  
    3434    switch (current.nodeType) {
    3535      case 10:
    36         str += '<!DOCTYPE ' + current.nodeName + '>';
     36        str += '<!DOCTYPE ' + current.nodeName;
     37        if (current.publicId || current.systemId) {
     38            str += ' "' + current.publicId + '"';
     39            str += ' "' + current.systemId + '"';
     40        }
     41        str += '>';
    3742        break;
    3843      case 8:
  • trunk/LayoutTests/html5lib/runner-expected-html5.txt

    r63870 r63871  
    666644
    676745
    68 47
    6968
    7069Test 27 of 51 in resources/tests6.dat failed. Input:
     
    109108| <head>
    110109| <body>
    111 
    112 Test 47 of 51 in resources/tests6.dat failed. Input:
    113 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
    114 Got:
    115 | <!DOCTYPE html>
    116 | <html>
    117 |   <head>
    118 |   <body>
    119 Expected:
    120 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
    121 | <html>
    122 |   <head>
    123 |   <body>
    124110resources/tests7.dat:
    12511124
     
    381367resources/webkit01.dat: PASS
    382368
    383 resources/doctype01.dat:
    384 14
    385 15
    386 16
    387 23
    388 24
    389 25
    390 26
    391 27
    392 29
    393 30
    394 32
    395 33
    396 34
    397 35
    398 36
    399 37
    400 
    401 Test 14 of 37 in resources/doctype01.dat failed. Input:
    402 <!DOCTYPE potato SYSTEM 'taco"'>Hello
    403 Got:
    404 | <!DOCTYPE potato>
    405 | <html>
    406 |   <head>
    407 |   <body>
    408 |     "Hello"
    409 Expected:
    410 | <!DOCTYPE potato "" "taco"">
    411 | <html>
    412 |   <head>
    413 |   <body>
    414 |     "Hello"
    415 
    416 Test 15 of 37 in resources/doctype01.dat failed. Input:
    417 <!DOCTYPE potato SYSTEM "taco">Hello
    418 Got:
    419 | <!DOCTYPE potato>
    420 | <html>
    421 |   <head>
    422 |   <body>
    423 |     "Hello"
    424 Expected:
    425 | <!DOCTYPE potato "" "taco">
    426 | <html>
    427 |   <head>
    428 |   <body>
    429 |     "Hello"
    430 
    431 Test 16 of 37 in resources/doctype01.dat failed. Input:
    432 <!DOCTYPE potato SYSTEM "tai'co">Hello
    433 Got:
    434 | <!DOCTYPE potato>
    435 | <html>
    436 |   <head>
    437 |   <body>
    438 |     "Hello"
    439 Expected:
    440 | <!DOCTYPE potato "" "tai'co">
    441 | <html>
    442 |   <head>
    443 |   <body>
    444 |     "Hello"
    445 
    446 Test 23 of 37 in resources/doctype01.dat failed. Input:
    447 <!DOCTYPE potato PUBLIC "go'of">Hello
    448 Got:
    449 | <!DOCTYPE potato>
    450 | <html>
    451 |   <head>
    452 |   <body>
    453 |     "Hello"
    454 Expected:
    455 | <!DOCTYPE potato "go'of" "">
    456 | <html>
    457 |   <head>
    458 |   <body>
    459 |     "Hello"
    460 
    461 Test 24 of 37 in resources/doctype01.dat failed. Input:
    462 <!DOCTYPE potato PUBLIC 'go'of'>Hello
    463 Got:
    464 | <!DOCTYPE potato>
    465 | <html>
    466 |   <head>
    467 |   <body>
    468 |     "Hello"
    469 Expected:
    470 | <!DOCTYPE potato "go" "">
    471 | <html>
    472 |   <head>
    473 |   <body>
    474 |     "Hello"
    475 
    476 Test 25 of 37 in resources/doctype01.dat failed. Input:
    477 <!DOCTYPE potato PUBLIC 'go:hh   of' >Hello
    478 Got:
    479 | <!DOCTYPE potato>
    480 | <html>
    481 |   <head>
    482 |   <body>
    483 |     "Hello"
    484 Expected:
    485 | <!DOCTYPE potato "go:hh   of" "">
    486 | <html>
    487 |   <head>
    488 |   <body>
    489 |     "Hello"
    490 
    491 Test 26 of 37 in resources/doctype01.dat failed. Input:
    492 <!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
    493 Got:
    494 | <!DOCTYPE potato>
    495 | <html>
    496 |   <head>
    497 |   <body>
    498 |     "Hello"
    499 Expected:
    500 | <!DOCTYPE potato "W3C-//dfdf" "">
    501 | <html>
    502 |   <head>
    503 |   <body>
    504 |     "Hello"
    505 
    506 Test 27 of 37 in resources/doctype01.dat failed. Input:
    507 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
    508    "http://www.w3.org/TR/html4/strict.dtd">Hello
    509 Got:
    510 | <!DOCTYPE html>
    511 | <html>
    512 |   <head>
    513 |   <body>
    514 |     "Hello"
    515 Expected:
    516 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    517 | <html>
    518 |   <head>
    519 |   <body>
    520 |     "Hello"
    521 
    522 Test 29 of 37 in resources/doctype01.dat failed. Input:
    523 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    524 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    525 Got:
    526 | <!DOCTYPE html>
    527 | <html>
    528 |   <head>
    529 |   <body>
    530 Expected:
    531 | <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    532 | <html>
    533 |   <head>
    534 |   <body>
    535 
    536 Test 30 of 37 in resources/doctype01.dat failed. Input:
    537 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
    538 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    539 Got:
    540 | <!DOCTYPE html>
    541 | <html>
    542 |   <head>
    543 |   <body>
    544 Expected:
    545 | <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    546 | <html>
    547 |   <head>
    548 |   <body>
    549 
    550 Test 32 of 37 in resources/doctype01.dat failed. Input:
    551 <!DOCTYPE html PUBLIC
    552   "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
    553     "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
    554 Got:
    555 | <!DOCTYPE html>
    556 | <html>
    557 |   <head>
    558 |   <body>
    559 Expected:
    560 | <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
    561 | <html>
    562 |   <head>
    563 |   <body>
    564 
    565 Test 33 of 37 in resources/doctype01.dat failed. Input:
    566 <!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
    567 Got:
    568 | <!DOCTYPE html>
    569 | <html>
    570 |   <head>
    571 |   <body>
    572 |     <b>
    573 |       "Mine!"
    574 Expected:
    575 | <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
    576 | <html>
    577 |   <head>
    578 |   <body>
    579 |     <b>
    580 |       "Mine!"
    581 
    582 Test 34 of 37 in resources/doctype01.dat failed. Input:
    583 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
    584 Got:
    585 | <!DOCTYPE html>
    586 | <html>
    587 |   <head>
    588 |   <body>
    589 Expected:
    590 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    591 | <html>
    592 |   <head>
    593 |   <body>
    594 
    595 Test 35 of 37 in resources/doctype01.dat failed. Input:
    596 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
    597 Got:
    598 | <!DOCTYPE html>
    599 | <html>
    600 |   <head>
    601 |   <body>
    602 Expected:
    603 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    604 | <html>
    605 |   <head>
    606 |   <body>
    607 
    608 Test 36 of 37 in resources/doctype01.dat failed. Input:
    609 <!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
    610 Got:
    611 | <!DOCTYPE html>
    612 | <html>
    613 |   <head>
    614 |   <body>
    615 Expected:
    616 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    617 | <html>
    618 |   <head>
    619 |   <body>
    620 
    621 Test 37 of 37 in resources/doctype01.dat failed. Input:
    622 <!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
    623 Got:
    624 | <!DOCTYPE html>
    625 | <html>
    626 |   <head>
    627 |   <body>
    628 Expected:
    629 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    630 | <html>
    631 |   <head>
    632 |   <body>
     369resources/doctype01.dat: PASS
     370
    633371resources/scriptdata01.dat: PASS
    634372
  • trunk/LayoutTests/html5lib/runner-expected.txt

    r63858 r63871  
    1221122145
    1222122246
    1223 47
    1224122348
    1225122449
     
    13801379|   <frameset>
    13811380|   " "
    1382 
    1383 Test 47 of 51 in resources/tests6.dat failed. Input:
    1384 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
    1385 Got:
    1386 | <!DOCTYPE html>
    1387 | <html>
    1388 |   <head>
    1389 |   <body>
    1390 Expected:
    1391 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
    1392 | <html>
    1393 |   <head>
    1394 |   <body>
    13951381
    13961382Test 48 of 51 in resources/tests6.dat failed. Input:
     
    65676553|         <nobr>
    65686554resources/doctype01.dat:
    6569 14
    6570 15
    6571 16
    6572 23
    6573 24
    6574 25
    6575 26
    6576 27
    6577 29
    6578 30
    6579655531
    6580 32
    6581 33
    6582 34
    6583 35
    6584 36
    6585 37
    6586 
    6587 Test 14 of 37 in resources/doctype01.dat failed. Input:
    6588 <!DOCTYPE potato SYSTEM 'taco"'>Hello
    6589 Got:
    6590 | <!DOCTYPE potato>
    6591 | <html>
    6592 |   <head>
    6593 |   <body>
    6594 |     "Hello"
    6595 Expected:
    6596 | <!DOCTYPE potato "" "taco"">
    6597 | <html>
    6598 |   <head>
    6599 |   <body>
    6600 |     "Hello"
    6601 
    6602 Test 15 of 37 in resources/doctype01.dat failed. Input:
    6603 <!DOCTYPE potato SYSTEM "taco">Hello
    6604 Got:
    6605 | <!DOCTYPE potato>
    6606 | <html>
    6607 |   <head>
    6608 |   <body>
    6609 |     "Hello"
    6610 Expected:
    6611 | <!DOCTYPE potato "" "taco">
    6612 | <html>
    6613 |   <head>
    6614 |   <body>
    6615 |     "Hello"
    6616 
    6617 Test 16 of 37 in resources/doctype01.dat failed. Input:
    6618 <!DOCTYPE potato SYSTEM "tai'co">Hello
    6619 Got:
    6620 | <!DOCTYPE potato>
    6621 | <html>
    6622 |   <head>
    6623 |   <body>
    6624 |     "Hello"
    6625 Expected:
    6626 | <!DOCTYPE potato "" "tai'co">
    6627 | <html>
    6628 |   <head>
    6629 |   <body>
    6630 |     "Hello"
    6631 
    6632 Test 23 of 37 in resources/doctype01.dat failed. Input:
    6633 <!DOCTYPE potato PUBLIC "go'of">Hello
    6634 Got:
    6635 | <!DOCTYPE potato>
    6636 | <html>
    6637 |   <head>
    6638 |   <body>
    6639 |     "Hello"
    6640 Expected:
    6641 | <!DOCTYPE potato "go'of" "">
    6642 | <html>
    6643 |   <head>
    6644 |   <body>
    6645 |     "Hello"
    6646 
    6647 Test 24 of 37 in resources/doctype01.dat failed. Input:
    6648 <!DOCTYPE potato PUBLIC 'go'of'>Hello
    6649 Got:
    6650 | <!DOCTYPE potato>
    6651 | <html>
    6652 |   <head>
    6653 |   <body>
    6654 |     "Hello"
    6655 Expected:
    6656 | <!DOCTYPE potato "go" "">
    6657 | <html>
    6658 |   <head>
    6659 |   <body>
    6660 |     "Hello"
    6661 
    6662 Test 25 of 37 in resources/doctype01.dat failed. Input:
    6663 <!DOCTYPE potato PUBLIC 'go:hh   of' >Hello
    6664 Got:
    6665 | <!DOCTYPE potato>
    6666 | <html>
    6667 |   <head>
    6668 |   <body>
    6669 |     "Hello"
    6670 Expected:
    6671 | <!DOCTYPE potato "go:hh   of" "">
    6672 | <html>
    6673 |   <head>
    6674 |   <body>
    6675 |     "Hello"
    6676 
    6677 Test 26 of 37 in resources/doctype01.dat failed. Input:
    6678 <!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
    6679 Got:
    6680 | <!DOCTYPE potato>
    6681 | <html>
    6682 |   <head>
    6683 |   <body>
    6684 |     "Hello"
    6685 Expected:
    6686 | <!DOCTYPE potato "W3C-//dfdf" "">
    6687 | <html>
    6688 |   <head>
    6689 |   <body>
    6690 |     "Hello"
    6691 
    6692 Test 27 of 37 in resources/doctype01.dat failed. Input:
    6693 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
    6694    "http://www.w3.org/TR/html4/strict.dtd">Hello
    6695 Got:
    6696 | <!DOCTYPE html>
    6697 | <html>
    6698 |   <head>
    6699 |   <body>
    6700 |     "Hello"
    6701 Expected:
    6702 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    6703 | <html>
    6704 |   <head>
    6705 |   <body>
    6706 |     "Hello"
    6707 
    6708 Test 29 of 37 in resources/doctype01.dat failed. Input:
    6709 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    6710 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    6711 Got:
    6712 | <!DOCTYPE html>
    6713 | <html>
    6714 |   <head>
    6715 |   <body>
    6716 Expected:
    6717 | <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    6718 | <html>
    6719 |   <head>
    6720 |   <body>
    6721 
    6722 Test 30 of 37 in resources/doctype01.dat failed. Input:
    6723 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
    6724 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    6725 Got:
    6726 | <!DOCTYPE html>
    6727 | <html>
    6728 |   <head>
    6729 |   <body>
    6730 Expected:
    6731 | <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    6732 | <html>
    6733 |   <head>
    6734 |   <body>
    67356556
    67366557Test 31 of 37 in resources/doctype01.dat failed. Input:
     
    67516572|   <body>
    67526573|     "]>"
    6753 
    6754 Test 32 of 37 in resources/doctype01.dat failed. Input:
    6755 <!DOCTYPE html PUBLIC
    6756   "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
    6757     "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
    6758 Got:
    6759 | <!DOCTYPE html>
    6760 | <html>
    6761 |   <head>
    6762 |   <body>
    6763 Expected:
    6764 | <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
    6765 | <html>
    6766 |   <head>
    6767 |   <body>
    6768 
    6769 Test 33 of 37 in resources/doctype01.dat failed. Input:
    6770 <!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
    6771 Got:
    6772 | <!DOCTYPE html>
    6773 | <html>
    6774 |   <head>
    6775 |   <body>
    6776 |     <b>
    6777 |       "Mine!"
    6778 Expected:
    6779 | <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
    6780 | <html>
    6781 |   <head>
    6782 |   <body>
    6783 |     <b>
    6784 |       "Mine!"
    6785 
    6786 Test 34 of 37 in resources/doctype01.dat failed. Input:
    6787 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
    6788 Got:
    6789 | <!DOCTYPE html>
    6790 | <html>
    6791 |   <head>
    6792 |   <body>
    6793 Expected:
    6794 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    6795 | <html>
    6796 |   <head>
    6797 |   <body>
    6798 
    6799 Test 35 of 37 in resources/doctype01.dat failed. Input:
    6800 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
    6801 Got:
    6802 | <!DOCTYPE html>
    6803 | <html>
    6804 |   <head>
    6805 |   <body>
    6806 Expected:
    6807 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    6808 | <html>
    6809 |   <head>
    6810 |   <body>
    6811 
    6812 Test 36 of 37 in resources/doctype01.dat failed. Input:
    6813 <!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
    6814 Got:
    6815 | <!DOCTYPE html>
    6816 | <html>
    6817 |   <head>
    6818 |   <body>
    6819 Expected:
    6820 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    6821 | <html>
    6822 |   <head>
    6823 |   <body>
    6824 
    6825 Test 37 of 37 in resources/doctype01.dat failed. Input:
    6826 <!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
    6827 Got:
    6828 | <!DOCTYPE html>
    6829 | <html>
    6830 |   <head>
    6831 |   <body>
    6832 Expected:
    6833 | <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
    6834 | <html>
    6835 |   <head>
    6836 |   <body>
    68376574resources/scriptdata01.dat: PASS
    68386575
Note: See TracChangeset for help on using the changeset viewer.