URI: 
       transform: Clean up the var naming mess in chain_test - hugo - [fork] hugo port for 9front
  HTML git clone git@git.drkhsh.at/hugo.git
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
   DIR README
   DIR LICENSE
       ---
   DIR commit c7869fd772ac36e649499a20a1cdfb349fca3f74
   DIR parent a6de8dfb42176484eba258a3dc87c7f1684a7b7f
  HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
       Date:   Wed, 23 Mar 2016 20:03:13 +0100
       
       transform: Clean up the var naming mess in chain_test
       
       Diffstat:
         M transform/chain_test.go             |     120 ++++++++++++++++----------------
       
       1 file changed, 60 insertions(+), 60 deletions(-)
       ---
   DIR diff --git a/transform/chain_test.go b/transform/chain_test.go
       @@ -22,93 +22,93 @@ import (
                "testing"
        )
        
       -const H5_JS_CONTENT_DOUBLE_QUOTE = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"/foobar\">Follow up</a></article></body></html>"
       -const H5_JS_CONTENT_SINGLE_QUOTE = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='/foobar'>Follow up</a></article></body></html>"
       -const H5_JS_CONTENT_ABS_URL = "<!DOCTYPE html><html><head><script src=\"http://user@host:10234/foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"https://host/foobar\">foobar</a>. Follow up</article></body></html>"
       -const H5_JS_CONTENT_ABS_URL_SCHEMALESS = "<!DOCTYPE html><html><head><script src=\"//host/foobar.js\"></script><script src='//host2/barfoo.js'></head><body><nav><h1>title</h1></nav><article>content <a href=\"//host/foobar\">foobar</a>. <a href='//host2/foobar'>Follow up</a></article></body></html>"
       -const CORRECT_OUTPUT_SRC_HREF_DQ = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"http://base/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"http://base/foobar\">Follow up</a></article></body></html>"
       -const CORRECT_OUTPUT_SRC_HREF_SQ = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='http://base/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='http://base/foobar'>Follow up</a></article></body></html>"
       +const h5JsContentDoubleQuote = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"/foobar\">Follow up</a></article></body></html>"
       +const h5JsContentSingleQuote = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='/foobar'>Follow up</a></article></body></html>"
       +const h5JsContentAbsURL = "<!DOCTYPE html><html><head><script src=\"http://user@host:10234/foobar.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"https://host/foobar\">foobar</a>. Follow up</article></body></html>"
       +const h5JsContentAbsURLSchemaless = "<!DOCTYPE html><html><head><script src=\"//host/foobar.js\"></script><script src='//host2/barfoo.js'></head><body><nav><h1>title</h1></nav><article>content <a href=\"//host/foobar\">foobar</a>. <a href='//host2/foobar'>Follow up</a></article></body></html>"
       +const corectOutputSrcHrefDq = "<!DOCTYPE html><html><head><script src=\"foobar.js\"></script><script src=\"http://base/barfoo.js\"></script></head><body><nav><h1>title</h1></nav><article>content <a href=\"foobar\">foobar</a>. <a href=\"http://base/foobar\">Follow up</a></article></body></html>"
       +const corectOutputSrcHrefSq = "<!DOCTYPE html><html><head><script src='foobar.js'></script><script src='http://base/barfoo.js'></script></head><body><nav><h1>title</h1></nav><article>content <a href='foobar'>foobar</a>. <a href='http://base/foobar'>Follow up</a></article></body></html>"
        
       -const H5_XML_CONTENT_ABS_URL = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;/foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;/foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
       -const CORRECT_OUTPUT_SRC_HREF_IN_XML = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;http://base/foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;http://base/foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
       -const H5_XML_CONTENT_GUARDED = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;//foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;//foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
       +const h5XMLXontentAbsURL = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;/foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;/foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
       +const correctOutputSrcHrefInXML = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;http://base/foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;http://base/foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
       +const h5XMLContentGuarded = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?><feed xmlns=\"http://www.w3.org/2005/Atom\"><entry><content type=\"html\">&lt;p&gt;&lt;a href=&#34;//foobar&#34;&gt;foobar&lt;/a&gt;&lt;/p&gt; &lt;p&gt;A video: &lt;iframe src=&#39;//foo&#39;&gt;&lt;/iframe&gt;&lt;/p&gt;</content></entry></feed>"
        
        // additional sanity tests for replacements testing
       -const REPLACE_1 = "No replacements."
       -const REPLACE_2 = "ᚠᛇᚻ ᛒᛦᚦ ᚠᚱᚩᚠᚢᚱ\nᚠᛁᚱᚪ ᚷᛖᚻᚹᛦᛚᚳᚢᛗ"
       -const REPLACE_3 = `End of file: src="/`
       -const REPLACE_4 = `End of file: srcset="/`
       -const REPLACE_5 = `Srcsett with no closing quote: srcset="/img/small.jpg do be do be do.`
       +const replace1 = "No replacements."
       +const replace2 = "ᚠᛇᚻ ᛒᛦᚦ ᚠᚱᚩᚠᚢᚱ\nᚠᛁᚱᚪ ᚷᛖᚻᚹᛦᛚᚳᚢᛗ"
       +const replace3 = `End of file: src="/`
       +const replace4 = `End of file: srcset="/`
       +const replace5 = `Srcsett with no closing quote: srcset="/img/small.jpg do be do be do.`
        
        // Issue: 816, schemaless links combined with others
       -const REPLACE_SCHEMALESS_HTML = `Pre. src='//schemaless' src='/normal'  <a href="//schemaless">Schemaless</a>. <a href="/normal">normal</a>. Post.`
       -const REPLACE_SCHEMALESS_HTML_CORRECT = `Pre. src='//schemaless' src='http://base/normal'  <a href="//schemaless">Schemaless</a>. <a href="http://base/normal">normal</a>. Post.`
       -const REPLACE_SCHEMALESS_XML = `Pre. src=&#39;//schemaless&#39; src=&#39;/normal&#39;  <a href=&#39;//schemaless&#39;>Schemaless</a>. <a href=&#39;/normal&#39;>normal</a>. Post.`
       -const REPLACE_SCHEMALESS_XML_CORRECT = `Pre. src=&#39;//schemaless&#39; src=&#39;http://base/normal&#39;  <a href=&#39;//schemaless&#39;>Schemaless</a>. <a href=&#39;http://base/normal&#39;>normal</a>. Post.`
       +const replaceSchemalessHTML = `Pre. src='//schemaless' src='/normal'  <a href="//schemaless">Schemaless</a>. <a href="/normal">normal</a>. Post.`
       +const replaceSchemalessHTMLCorrect = `Pre. src='//schemaless' src='http://base/normal'  <a href="//schemaless">Schemaless</a>. <a href="http://base/normal">normal</a>. Post.`
       +const replaceSchemalessXML = `Pre. src=&#39;//schemaless&#39; src=&#39;/normal&#39;  <a href=&#39;//schemaless&#39;>Schemaless</a>. <a href=&#39;/normal&#39;>normal</a>. Post.`
       +const replaceSchemalessXMLCorrect = `Pre. src=&#39;//schemaless&#39; src=&#39;http://base/normal&#39;  <a href=&#39;//schemaless&#39;>Schemaless</a>. <a href=&#39;http://base/normal&#39;>normal</a>. Post.`
        
        // srcset=
       -const SRCSET_BASIC = `Pre. <img srcset="/img/small.jpg 200w, /img/medium.jpg 300w, /img/big.jpg 700w" alt="text" src="/img/foo.jpg">`
       -const SRCSET_BASIC_CORRECT = `Pre. <img srcset="http://base/img/small.jpg 200w, http://base/img/medium.jpg 300w, http://base/img/big.jpg 700w" alt="text" src="http://base/img/foo.jpg">`
       -const SRCSET_SINGLE_QUOTE = `Pre. <img srcset='/img/small.jpg 200w, /img/big.jpg 700w' alt="text" src="/img/foo.jpg"> POST.`
       -const SRCSET_SINGLE_QUOTE_CORRECT = `Pre. <img srcset='http://base/img/small.jpg 200w, http://base/img/big.jpg 700w' alt="text" src="http://base/img/foo.jpg"> POST.`
       -const SRCSET_XML_BASIC = `Pre. <img srcset=&#34;/img/small.jpg 200w, /img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;/img/foo.jpg&#34;>`
       -const SRCSET_XML_BASIC_CORRECT = `Pre. <img srcset=&#34;http://base/img/small.jpg 200w, http://base/img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;http://base/img/foo.jpg&#34;>`
       -const SRCSET_XML_SINGLE_QUOTE = `Pre. <img srcset=&#34;/img/small.jpg 200w, /img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;/img/foo.jpg&#34;>`
       -const SRCSET_XML_SINGLE_QUOTE_CORRECT = `Pre. <img srcset=&#34;http://base/img/small.jpg 200w, http://base/img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;http://base/img/foo.jpg&#34;>`
       -const SRCSET_VARIATIONS = `Pre. 
       +const srcsetBasic = `Pre. <img srcset="/img/small.jpg 200w, /img/medium.jpg 300w, /img/big.jpg 700w" alt="text" src="/img/foo.jpg">`
       +const srcsetBasicCorrect = `Pre. <img srcset="http://base/img/small.jpg 200w, http://base/img/medium.jpg 300w, http://base/img/big.jpg 700w" alt="text" src="http://base/img/foo.jpg">`
       +const srcsetSingleQuote = `Pre. <img srcset='/img/small.jpg 200w, /img/big.jpg 700w' alt="text" src="/img/foo.jpg"> POST.`
       +const srcsetSingleQuoteCorrect = `Pre. <img srcset='http://base/img/small.jpg 200w, http://base/img/big.jpg 700w' alt="text" src="http://base/img/foo.jpg"> POST.`
       +const srcsetXMLBasic = `Pre. <img srcset=&#34;/img/small.jpg 200w, /img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;/img/foo.jpg&#34;>`
       +const srcsetXMLBasicCorrect = `Pre. <img srcset=&#34;http://base/img/small.jpg 200w, http://base/img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;http://base/img/foo.jpg&#34;>`
       +const srcsetXMLSingleQuote = `Pre. <img srcset=&#34;/img/small.jpg 200w, /img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;/img/foo.jpg&#34;>`
       +const srcsetXMLSingleQuoteCorrect = `Pre. <img srcset=&#34;http://base/img/small.jpg 200w, http://base/img/big.jpg 700w&#34; alt=&#34;text&#34; src=&#34;http://base/img/foo.jpg&#34;>`
       +const srcsetVariations = `Pre. 
        Missing start quote: <img srcset=/img/small.jpg 200w, /img/big.jpg 700w" alt="text"> src='/img/foo.jpg'> FOO. 
        <img srcset='/img.jpg'> 
        schemaless: <img srcset='//img.jpg' src='//basic.jpg'>
        schemaless2: <img srcset="//img.jpg" src="//basic.jpg2> POST
        `
       -const SRCSET_VARIATIONS_CORRECT = `Pre. 
       +const srcsetVariationsCorrect = `Pre. 
        Missing start quote: <img srcset=/img/small.jpg 200w, /img/big.jpg 700w" alt="text"> src='http://base/img/foo.jpg'> FOO. 
        <img srcset='http://base/img.jpg'> 
        schemaless: <img srcset='//img.jpg' src='//basic.jpg'>
        schemaless2: <img srcset="//img.jpg" src="//basic.jpg2> POST
        `
       -const SRCSET_XML_VARIATIONS = `Pre. 
       +const srcsetXMLVariations = `Pre. 
        Missing start quote: &lt;img srcset=/img/small.jpg 200w /img/big.jpg 700w&quot; alt=&quot;text&quot;&gt; src=&#39;/img/foo.jpg&#39;&gt; FOO. 
        &lt;img srcset=&#39;/img.jpg&#39;&gt; 
        schemaless: &lt;img srcset=&#39;//img.jpg&#39; src=&#39;//basic.jpg&#39;&gt;
        schemaless2: &lt;img srcset=&quot;//img.jpg&quot; src=&quot;//basic.jpg2&gt; POST
        `
       -const SRCSET_XML_VARIATIONS_CORRECT = `Pre. 
       +const srcsetXMLVariationsCorrect = `Pre. 
        Missing start quote: &lt;img srcset=/img/small.jpg 200w /img/big.jpg 700w&quot; alt=&quot;text&quot;&gt; src=&#39;http://base/img/foo.jpg&#39;&gt; FOO. 
        &lt;img srcset=&#39;http://base/img.jpg&#39;&gt; 
        schemaless: &lt;img srcset=&#39;//img.jpg&#39; src=&#39;//basic.jpg&#39;&gt;
        schemaless2: &lt;img srcset=&quot;//img.jpg&quot; src=&quot;//basic.jpg2&gt; POST
        `
        
       -const REL_PATH_VARIATIONS = `PRE. a href="/img/small.jpg" POST.`
       -const REL_PATH_VARIATIONS_CORRECT = `PRE. a href="../../img/small.jpg" POST.`
       +const relPathVariations = `PRE. a href="/img/small.jpg" POST.`
       +const relPathVariationsCorrect = `PRE. a href="../../img/small.jpg" POST.`
        
        const testBaseURL = "http://base/"
        
       -var abs_url_bench_tests = []test{
       -        {H5_JS_CONTENT_DOUBLE_QUOTE, CORRECT_OUTPUT_SRC_HREF_DQ},
       -        {H5_JS_CONTENT_SINGLE_QUOTE, CORRECT_OUTPUT_SRC_HREF_SQ},
       -        {H5_JS_CONTENT_ABS_URL, H5_JS_CONTENT_ABS_URL},
       -        {H5_JS_CONTENT_ABS_URL_SCHEMALESS, H5_JS_CONTENT_ABS_URL_SCHEMALESS},
       +var absURLlBenchTests = []test{
       +        {h5JsContentDoubleQuote, corectOutputSrcHrefDq},
       +        {h5JsContentSingleQuote, corectOutputSrcHrefSq},
       +        {h5JsContentAbsURL, h5JsContentAbsURL},
       +        {h5JsContentAbsURLSchemaless, h5JsContentAbsURLSchemaless},
        }
        
       -var xml_abs_url_bench_tests = []test{
       -        {H5_XML_CONTENT_ABS_URL, CORRECT_OUTPUT_SRC_HREF_IN_XML},
       -        {H5_XML_CONTENT_GUARDED, H5_XML_CONTENT_GUARDED},
       +var xmlAbsURLBenchTests = []test{
       +        {h5XMLXontentAbsURL, correctOutputSrcHrefInXML},
       +        {h5XMLContentGuarded, h5XMLContentGuarded},
        }
        
       -var sanity_tests = []test{{REPLACE_1, REPLACE_1}, {REPLACE_2, REPLACE_2}, {REPLACE_3, REPLACE_3}, {REPLACE_4, REPLACE_4}, {REPLACE_5, REPLACE_5}}
       -var extra_tests_html = []test{{REPLACE_SCHEMALESS_HTML, REPLACE_SCHEMALESS_HTML_CORRECT}}
       -var abs_url_tests = append(abs_url_bench_tests, append(sanity_tests, extra_tests_html...)...)
       -var extra_tests_xml = []test{{REPLACE_SCHEMALESS_XML, REPLACE_SCHEMALESS_XML_CORRECT}}
       -var xml_abs_url_tests = append(xml_abs_url_bench_tests, append(sanity_tests, extra_tests_xml...)...)
       -var srcset_tests = []test{{SRCSET_BASIC, SRCSET_BASIC_CORRECT}, {SRCSET_SINGLE_QUOTE, SRCSET_SINGLE_QUOTE_CORRECT}, {SRCSET_VARIATIONS, SRCSET_VARIATIONS_CORRECT}}
       -var srcset_xml_tests = []test{
       -        {SRCSET_XML_BASIC, SRCSET_XML_BASIC_CORRECT},
       -        {SRCSET_XML_SINGLE_QUOTE, SRCSET_XML_SINGLE_QUOTE_CORRECT},
       -        {SRCSET_XML_VARIATIONS, SRCSET_XML_VARIATIONS_CORRECT}}
       +var sanityTests = []test{{replace1, replace1}, {replace2, replace2}, {replace3, replace3}, {replace3, replace3}, {replace5, replace5}}
       +var extraTestsHTML = []test{{replaceSchemalessHTML, replaceSchemalessHTMLCorrect}}
       +var absURLTests = append(absURLlBenchTests, append(sanityTests, extraTestsHTML...)...)
       +var extraTestsXML = []test{{replaceSchemalessXML, replaceSchemalessXMLCorrect}}
       +var xmlAbsURLTests = append(xmlAbsURLBenchTests, append(sanityTests, extraTestsXML...)...)
       +var srcsetTests = []test{{srcsetBasic, srcsetBasicCorrect}, {srcsetSingleQuote, srcsetSingleQuoteCorrect}, {srcsetVariations, srcsetVariationsCorrect}}
       +var srcsetXMLTests = []test{
       +        {srcsetXMLBasic, srcsetXMLBasicCorrect},
       +        {srcsetXMLSingleQuote, srcsetXMLSingleQuoteCorrect},
       +        {srcsetXMLVariations, srcsetXMLVariationsCorrect}}
        
       -var relurl_tests = []test{{REL_PATH_VARIATIONS, REL_PATH_VARIATIONS_CORRECT}}
       +var relurlTests = []test{{relPathVariations, relPathVariationsCorrect}}
        
        func TestChainZeroTransformers(t *testing.T) {
                tr := NewChain()
       @@ -153,7 +153,7 @@ func BenchmarkAbsURL(b *testing.B) {
        
                b.ResetTimer()
                for i := 0; i < b.N; i++ {
       -                apply(b.Errorf, tr, abs_url_bench_tests)
       +                apply(b.Errorf, tr, absURLlBenchTests)
                }
        }
        
       @@ -162,7 +162,7 @@ func BenchmarkAbsURLSrcset(b *testing.B) {
        
                b.ResetTimer()
                for i := 0; i < b.N; i++ {
       -                apply(b.Errorf, tr, srcset_tests)
       +                apply(b.Errorf, tr, srcsetTests)
                }
        }
        
       @@ -171,34 +171,34 @@ func BenchmarkXMLAbsURLSrcset(b *testing.B) {
        
                b.ResetTimer()
                for i := 0; i < b.N; i++ {
       -                apply(b.Errorf, tr, srcset_xml_tests)
       +                apply(b.Errorf, tr, srcsetXMLTests)
                }
        }
        
        func TestAbsURL(t *testing.T) {
                tr := NewChain(AbsURL)
        
       -        apply(t.Errorf, tr, abs_url_tests)
       +        apply(t.Errorf, tr, absURLTests)
        
        }
        
        func TestRelativeURL(t *testing.T) {
                tr := NewChain(AbsURL)
        
       -        applyWithPath(t.Errorf, tr, relurl_tests, helpers.GetDottedRelativePath(filepath.FromSlash("/post/sub/")))
       +        applyWithPath(t.Errorf, tr, relurlTests, helpers.GetDottedRelativePath(filepath.FromSlash("/post/sub/")))
        
        }
        
        func TestAbsURLSrcSet(t *testing.T) {
                tr := NewChain(AbsURL)
        
       -        apply(t.Errorf, tr, srcset_tests)
       +        apply(t.Errorf, tr, srcsetTests)
        }
        
        func TestAbsXMLURLSrcSet(t *testing.T) {
                tr := NewChain(AbsURLInXML)
        
       -        apply(t.Errorf, tr, srcset_xml_tests)
       +        apply(t.Errorf, tr, srcsetXMLTests)
        }
        
        func BenchmarkXMLAbsURL(b *testing.B) {
       @@ -206,13 +206,13 @@ func BenchmarkXMLAbsURL(b *testing.B) {
        
                b.ResetTimer()
                for i := 0; i < b.N; i++ {
       -                apply(b.Errorf, tr, xml_abs_url_bench_tests)
       +                apply(b.Errorf, tr, xmlAbsURLBenchTests)
                }
        }
        
        func TestXMLAbsURL(t *testing.T) {
                tr := NewChain(AbsURLInXML)
       -        apply(t.Errorf, tr, xml_abs_url_tests)
       +        apply(t.Errorf, tr, xmlAbsURLTests)
        }
        
        func TestNewEmptyTransforms(t *testing.T) {