From 11e123345721c49d0aa1fa205de94025f34a9c59 Mon Sep 17 00:00:00 2001 From: Anthony Gedeon Date: Mon, 25 Oct 2021 18:16:09 -0500 Subject: [PATCH] fix(test): remove Render testcase since OuterHtml handles Render internally --- utilities_test.go | 92 ++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 53 deletions(-) diff --git a/utilities_test.go b/utilities_test.go index 88a468d..deaf34e 100644 --- a/utilities_test.go +++ b/utilities_test.go @@ -24,49 +24,6 @@ var allNodes = ` ` -func assertMatchNodes(t testing.TB, doc *Document) { - t.Helper() - - n0 := doc.Nodes[0] - nDT := n0.FirstChild - sMeta := doc.Find("meta") - sP := doc.Find("p") - nP := sP.Get(0) - nComment := nP.FirstChild - nText := nComment.NextSibling - sHeaders := doc.Find(".header") - - cases := []struct { - node *html.Node - sel *Selection - want string - }{ - {nDT, nil, ""}, // render makes DOCTYPE all caps - {nil, sMeta, ``}, // and auto-closes the meta - {nil, sP, `

- This is some text. -

`}, - {nComment, nil, ""}, - {nText, nil, ` - This is some text. - `}, - {nil, sHeaders, `

`}, - } - for i, c := range cases { - if c.sel == nil { - c.sel = newSingleSelection(c.node, doc) - } - got, err := OuterHtml(c.sel) - if err != nil { - t.Fatal(err) - } - - if got != c.want { - t.Errorf("%d: want %q, got %q", i, c.want, got) - } - } -} - func TestNodeName(t *testing.T) { doc, err := NewDocumentFromReader(strings.NewReader(allNodes)) if err != nil { @@ -123,19 +80,48 @@ func TestNodeNameMultiSel(t *testing.T) { t.Errorf("want %v, got %v", in, out) } } - -func TestRender(t *testing.T) { - doc, err := NewDocumentFromReader(strings.NewReader(allNodes)) - if err != nil { - t.Fatal(err) - } - assertMatchNodes(t, doc) -} - func TestOuterHtml(t *testing.T) { doc, err := NewDocumentFromReader(strings.NewReader(allNodes)) if err != nil { t.Fatal(err) } - assertMatchNodes(t, doc) + + n0 := doc.Nodes[0] + nDT := n0.FirstChild + sMeta := doc.Find("meta") + sP := doc.Find("p") + nP := sP.Get(0) + nComment := nP.FirstChild + nText := nComment.NextSibling + sHeaders := doc.Find(".header") + + cases := []struct { + node *html.Node + sel *Selection + want string + }{ + {nDT, nil, ""}, // render makes DOCTYPE all caps + {nil, sMeta, ``}, // and auto-closes the meta + {nil, sP, `

+ This is some text. +

`}, + {nComment, nil, ""}, + {nText, nil, ` + This is some text. + `}, + {nil, sHeaders, `

`}, + } + for i, c := range cases { + if c.sel == nil { + c.sel = newSingleSelection(c.node, doc) + } + got, err := OuterHtml(c.sel) + if err != nil { + t.Fatal(err) + } + + if got != c.want { + t.Errorf("%d: want %q, got %q", i, c.want, got) + } + } }