From d624f0c92281f73879b573213acf736170a68145 Mon Sep 17 00:00:00 2001 From: Andrew Balholm Date: Thu, 16 Aug 2012 09:31:22 +1000 Subject: [PATCH] exp/html: simplify testing code Now that the parser passes all tests in the test suite, it is no longer necessary to keep track of which tests pass and which don't. So remove the testlogs directory and the code that uses it. R=nigeltao CC=golang-dev https://golang.org/cl/6453124 --- src/pkg/exp/html/parse_test.go | 101 ++------- src/pkg/exp/html/testlogs/adoption01.dat.log | 13 -- src/pkg/exp/html/testlogs/adoption02.dat.log | 2 - src/pkg/exp/html/testlogs/comments01.dat.log | 13 -- src/pkg/exp/html/testlogs/doctype01.dat.log | 37 ---- src/pkg/exp/html/testlogs/entities01.dat.log | 67 ------ src/pkg/exp/html/testlogs/entities02.dat.log | 25 --- .../exp/html/testlogs/html5test-com.dat.log | 24 --- src/pkg/exp/html/testlogs/inbody01.dat.log | 4 - src/pkg/exp/html/testlogs/isindex.dat.log | 3 - ...ing-spec-changes-plain-text-unsafe.dat.log | 1 - .../testlogs/pending-spec-changes.dat.log | 3 - .../html/testlogs/plain-text-unsafe.dat.log | 33 --- .../exp/html/testlogs/scriptdata01.dat.log | 26 --- src/pkg/exp/html/testlogs/tables01.dat.log | 17 -- src/pkg/exp/html/testlogs/tests1.dat.log | 114 ----------- src/pkg/exp/html/testlogs/tests10.dat.log | 54 ----- src/pkg/exp/html/testlogs/tests11.dat.log | 9 - src/pkg/exp/html/testlogs/tests12.dat.log | 2 - src/pkg/exp/html/testlogs/tests14.dat.log | 7 - src/pkg/exp/html/testlogs/tests15.dat.log | 14 -- src/pkg/exp/html/testlogs/tests16.dat.log | 191 ------------------ src/pkg/exp/html/testlogs/tests17.dat.log | 13 -- src/pkg/exp/html/testlogs/tests18.dat.log | 20 -- src/pkg/exp/html/testlogs/tests19.dat.log | 104 ---------- src/pkg/exp/html/testlogs/tests2.dat.log | 61 ------ src/pkg/exp/html/testlogs/tests20.dat.log | 39 ---- src/pkg/exp/html/testlogs/tests21.dat.log | 22 -- src/pkg/exp/html/testlogs/tests22.dat.log | 5 - src/pkg/exp/html/testlogs/tests23.dat.log | 5 - src/pkg/exp/html/testlogs/tests24.dat.log | 8 - src/pkg/exp/html/testlogs/tests25.dat.log | 20 -- src/pkg/exp/html/testlogs/tests26.dat.log | 15 -- src/pkg/exp/html/testlogs/tests3.dat.log | 24 --- src/pkg/exp/html/testlogs/tests4.dat.log | 7 - src/pkg/exp/html/testlogs/tests5.dat.log | 16 -- src/pkg/exp/html/testlogs/tests6.dat.log | 52 ----- src/pkg/exp/html/testlogs/tests7.dat.log | 30 --- src/pkg/exp/html/testlogs/tests8.dat.log | 9 - src/pkg/exp/html/testlogs/tests9.dat.log | 27 --- .../html/testlogs/tests_innerHTML_1.dat.log | 85 -------- src/pkg/exp/html/testlogs/tricky01.dat.log | 9 - src/pkg/exp/html/testlogs/webkit01.dat.log | 49 ----- src/pkg/exp/html/testlogs/webkit02.dat.log | 13 -- 44 files changed, 14 insertions(+), 1379 deletions(-) delete mode 100644 src/pkg/exp/html/testlogs/adoption01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/adoption02.dat.log delete mode 100644 src/pkg/exp/html/testlogs/comments01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/doctype01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/entities01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/entities02.dat.log delete mode 100644 src/pkg/exp/html/testlogs/html5test-com.dat.log delete mode 100644 src/pkg/exp/html/testlogs/inbody01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/isindex.dat.log delete mode 100644 src/pkg/exp/html/testlogs/pending-spec-changes-plain-text-unsafe.dat.log delete mode 100644 src/pkg/exp/html/testlogs/pending-spec-changes.dat.log delete mode 100644 src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log delete mode 100644 src/pkg/exp/html/testlogs/scriptdata01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tables01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests1.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests10.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests11.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests12.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests14.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests15.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests16.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests17.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests18.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests19.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests2.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests20.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests21.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests22.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests23.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests24.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests25.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests26.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests3.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests4.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests5.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests6.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests7.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests8.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests9.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log delete mode 100644 src/pkg/exp/html/testlogs/tricky01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/webkit01.dat.log delete mode 100644 src/pkg/exp/html/testlogs/webkit02.dat.log diff --git a/src/pkg/exp/html/parse_test.go b/src/pkg/exp/html/parse_test.go index a68ef12d40..b24f8f4e68 100644 --- a/src/pkg/exp/html/parse_test.go +++ b/src/pkg/exp/html/parse_test.go @@ -9,7 +9,6 @@ import ( "bytes" "errors" "exp/html/atom" - "flag" "fmt" "io" "io/ioutil" @@ -21,8 +20,6 @@ import ( "testing" ) -var updateLogs = flag.Bool("update-logs", false, "Update the log files that show the test results") - // readParseTest reads a single test case from r. func readParseTest(r *bufio.Reader) (text, want, context string, err error) { line, err := r.ReadSlice('\n') @@ -202,32 +199,6 @@ func dump(n *Node) (string, error) { } const testDataDir = "testdata/webkit/" -const testLogDir = "testlogs/" - -type parseTestResult int - -const ( - // parseTestFailed indicates that an error occurred during parsing or that - // the parse tree did not match the expected result. - parseTestFailed parseTestResult = iota - // parseTestParseOnly indicates that the first stage of the test (parsing) - // passed, but rendering and re-parsing did not. - parseTestParseOnly - // parseTestPassed indicates that both stages of the test passed. - parseTestPassed -) - -func (r parseTestResult) String() string { - switch r { - case parseTestFailed: - return "FAIL" - case parseTestParseOnly: - return "PARSE" - case parseTestPassed: - return "PASS" - } - return "invalid parseTestResult value" -} func TestParser(t *testing.T) { testFiles, err := filepath.Glob(testDataDir + "*.dat") @@ -242,20 +213,6 @@ func TestParser(t *testing.T) { defer f.Close() r := bufio.NewReader(f) - logName := testLogDir + tf[len(testDataDir):] + ".log" - var lf *os.File - var lbr *bufio.Reader - if *updateLogs { - lf, err = os.Create(logName) - } else { - lf, err = os.Open(logName) - lbr = bufio.NewReader(lf) - } - if err != nil { - t.Fatal(err) - } - defer lf.Close() - for i := 0; ; i++ { text, want, context, err := readParseTest(r) if err == io.EOF { @@ -265,46 +222,20 @@ func TestParser(t *testing.T) { t.Fatal(err) } - var expectedResult parseTestResult - if !*updateLogs { - var expectedText, expectedResultString string - _, err = fmt.Fscanf(lbr, "%s %q\n", &expectedResultString, &expectedText) - if err != nil { - t.Fatal(err) - } - if expectedText != text { - t.Fatalf("Log does not match tests: log has %q, tests have %q", expectedText, text) - } - switch expectedResultString { - case "FAIL": - // Skip this test. - continue - case "PARSE": - expectedResult = parseTestParseOnly - case "PASS": - expectedResult = parseTestPassed - default: - t.Fatalf("Log has invalid test result: %q", expectedResultString) - } - } + err = testParseCase(text, want, context) - result, err := testParseCase(text, want, context) - - if *updateLogs { - fmt.Fprintf(lf, "%s %q\n", result, text) - } else if result < expectedResult { + if err != nil { t.Errorf("%s test #%d %q, %s", tf, i, text, err) } } } } -// testParseCase tests one test case from the test files. It returns a -// parseTestResult indicating how much of the test passed. If the result -// is not parseTestPassed, it also returns an error that explains the failure. +// testParseCase tests one test case from the test files. If the test does not +// pass, it returns an error that explains the failure. // text is the HTML to be parsed, want is a dump of the correct parse tree, // and context is the name of the context node, if any. -func testParseCase(text, want, context string) (result parseTestResult, err error) { +func testParseCase(text, want, context string) (err error) { defer func() { if x := recover(); x != nil { switch e := x.(type) { @@ -320,7 +251,7 @@ func testParseCase(text, want, context string) (result parseTestResult, err erro if context == "" { doc, err = Parse(strings.NewReader(text)) if err != nil { - return parseTestFailed, err + return err } } else { contextNode := &Node{ @@ -330,7 +261,7 @@ func testParseCase(text, want, context string) (result parseTestResult, err erro } nodes, err := ParseFragment(strings.NewReader(text), contextNode) if err != nil { - return parseTestFailed, err + return err } doc = &Node{ Type: DocumentNode, @@ -342,21 +273,17 @@ func testParseCase(text, want, context string) (result parseTestResult, err erro got, err := dump(doc) if err != nil { - return parseTestFailed, err + return err } // Compare the parsed tree to the #document section. if got != want { - return parseTestFailed, fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want) + return fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want) } if renderTestBlacklist[text] || context != "" { - return parseTestPassed, nil + return nil } - // Set result so that if a panic occurs during the render and re-parse - // the calling function will know that the parsing phase was successful. - result = parseTestParseOnly - // Check that rendering and re-parsing results in an identical tree. pr, pw := io.Pipe() go func() { @@ -364,17 +291,17 @@ func testParseCase(text, want, context string) (result parseTestResult, err erro }() doc1, err := Parse(pr) if err != nil { - return parseTestParseOnly, err + return err } got1, err := dump(doc1) if err != nil { - return parseTestParseOnly, err + return err } if got != got1 { - return parseTestParseOnly, fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1) + return fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1) } - return parseTestPassed, nil + return nil } // Some test input result in parse trees are not 'well-formed' despite diff --git a/src/pkg/exp/html/testlogs/adoption01.dat.log b/src/pkg/exp/html/testlogs/adoption01.dat.log deleted file mode 100644 index e710d38be6..0000000000 --- a/src/pkg/exp/html/testlogs/adoption01.dat.log +++ /dev/null @@ -1,13 +0,0 @@ -PASS "

" -PASS "1

23

" -PASS "1" -PASS "123" -PASS "1
2
34
5
" -PASS "1

23

" -PASS "

" -PASS "

" -PASS "

" -PASS "

123

45" -PASS "
13
2
" -PASS "AC
B
" -PASS "
" diff --git a/src/pkg/exp/html/testlogs/adoption02.dat.log b/src/pkg/exp/html/testlogs/adoption02.dat.log deleted file mode 100644 index 288019434a..0000000000 --- a/src/pkg/exp/html/testlogs/adoption02.dat.log +++ /dev/null @@ -1,2 +0,0 @@ -PASS "12

34" -PASS "

" diff --git a/src/pkg/exp/html/testlogs/comments01.dat.log b/src/pkg/exp/html/testlogs/comments01.dat.log deleted file mode 100644 index a72fc7a67e..0000000000 --- a/src/pkg/exp/html/testlogs/comments01.dat.log +++ /dev/null @@ -1,13 +0,0 @@ -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "FOOBAZ" -PASS "Hi" -PASS "" -PASS "BAZ" diff --git a/src/pkg/exp/html/testlogs/doctype01.dat.log b/src/pkg/exp/html/testlogs/doctype01.dat.log deleted file mode 100644 index 9654bca5f8..0000000000 --- a/src/pkg/exp/html/testlogs/doctype01.dat.log +++ /dev/null @@ -1,37 +0,0 @@ -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "Hello" -PASS "" -PASS "" -PASS "\n]>" -PASS "" -PASS "Mine!" -PASS "" -PASS "" -PASS "" -PASS "" diff --git a/src/pkg/exp/html/testlogs/entities01.dat.log b/src/pkg/exp/html/testlogs/entities01.dat.log deleted file mode 100644 index 2f10bfe08d..0000000000 --- a/src/pkg/exp/html/testlogs/entities01.dat.log +++ /dev/null @@ -1,67 +0,0 @@ -PASS "FOO>BAR" -PASS "FOO>BAR" -PASS "FOO> BAR" -PASS "FOO>;;BAR" -PASS "I'm ¬it; I tell you" -PASS "I'm ∉ I tell you" -PASS "FOO& BAR" -PASS "FOO&" -PASS "FOO&&&>BAR" -PASS "FOO)BAR" -PASS "FOOABAR" -PASS "FOOABAR" -PASS "FOO&#BAR" -PASS "FOO&#ZOO" -PASS "FOOºR" -PASS "FOO&#xZOO" -PASS "FOO&#XZOO" -PASS "FOO)BAR" -PASS "FOO䆺R" -PASS "FOOAZOO" -PASS "FOO�ZOO" -PASS "FOOxZOO" -PASS "FOOyZOO" -PASS "FOO€ZOO" -PASS "FOOZOO" -PASS "FOO‚ZOO" -PASS "FOOƒZOO" -PASS "FOO„ZOO" -PASS "FOO…ZOO" -PASS "FOO†ZOO" -PASS "FOO‡ZOO" -PASS "FOOˆZOO" -PASS "FOO‰ZOO" -PASS "FOOŠZOO" -PASS "FOO‹ZOO" -PASS "FOOŒZOO" -PASS "FOOZOO" -PASS "FOOŽZOO" -PASS "FOOZOO" -PASS "FOOZOO" -PASS "FOO‘ZOO" -PASS "FOO’ZOO" -PASS "FOO“ZOO" -PASS "FOO”ZOO" -PASS "FOO•ZOO" -PASS "FOO–ZOO" -PASS "FOO—ZOO" -PASS "FOO˜ZOO" -PASS "FOO™ZOO" -PASS "FOOšZOO" -PASS "FOO›ZOO" -PASS "FOOœZOO" -PASS "FOOZOO" -PASS "FOOžZOO" -PASS "FOOŸZOO" -PASS "FOO ZOO" -PASS "FOO퟿ZOO" -PASS "FOO�ZOO" -PASS "FOO�ZOO" -PASS "FOO�ZOO" -PASS "FOO�ZOO" -PASS "FOOZOO" -PASS "FOO􏿾ZOO" -PASS "FOO􈟔ZOO" -PASS "FOO􏿿ZOO" -PASS "FOO�ZOO" -PASS "FOO�ZOO" diff --git a/src/pkg/exp/html/testlogs/entities02.dat.log b/src/pkg/exp/html/testlogs/entities02.dat.log deleted file mode 100644 index 9321b0f0f9..0000000000 --- a/src/pkg/exp/html/testlogs/entities02.dat.log +++ /dev/null @@ -1,25 +0,0 @@ -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
" -PASS "
ZZ£_id=23
" -PASS "
ZZ&prod_id=23
" -PASS "
ZZ£_id=23
" -PASS "
ZZ∏_id=23
" -PASS "
ZZ£=23
" -PASS "
ZZ&prod=23
" diff --git a/src/pkg/exp/html/testlogs/html5test-com.dat.log b/src/pkg/exp/html/testlogs/html5test-com.dat.log deleted file mode 100644 index 5b921de88c..0000000000 --- a/src/pkg/exp/html/testlogs/html5test-com.dat.log +++ /dev/null @@ -1,24 +0,0 @@ -PASS "" -PASS "
" -PASS "
" -PASS "
" -PASS "" -PASS "" -PASS "⟨⟩" -PASS "'" -PASS "ⅈ" -PASS "𝕂" -PASS "∉" -PASS "" -PASS "" -PASS "" -PASS "-->" -PASS "-->" -PASS "-->" -PASS "-->" -PASS "
  • A
  • B
" -PASS "
" -PASS "AB

CD" -PASS "

" -PASS "" -PASS "" diff --git a/src/pkg/exp/html/testlogs/inbody01.dat.log b/src/pkg/exp/html/testlogs/inbody01.dat.log deleted file mode 100644 index f0695812ba..0000000000 --- a/src/pkg/exp/html/testlogs/inbody01.dat.log +++ /dev/null @@ -1,4 +0,0 @@ -PASS "