diff --git a/src/dom/test/test-dom-configuration-basic b/src/dom/test/test-dom-configuration-basic index cd217b1ef..dd118f406 100755 --- a/src/dom/test/test-dom-configuration-basic +++ b/src/dom/test/test-dom-configuration-basic @@ -17,17 +17,11 @@ test_normalize_output_equals () { src="$1"; shift out="$1"; shift - URI="test:$(echo "$desc" | sed ' - s/^[ \t]*\[[^]]*\][ \t]*//; - s/[:., \t][:., \t]*/-/g; - s/_/-/g; - # *cough* - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/; - s/[^a-zA-Z0-9-]//g;')" + URI="test:$(normalize "$desc")" - sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^ //' > output + sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" > output echo "#document: $URI" > expected - echo "$out" | sed -n '2,$p' >> expected + echo "$out" | sed -n '2,$p' | sed 's/^/ /' >> expected test_expect_success "$desc" 'cmp output expected' } diff --git a/src/dom/test/test-sgml-parser-basic b/src/dom/test/test-sgml-parser-basic index f19f158eb..989366beb 100755 --- a/src/dom/test/test-sgml-parser-basic +++ b/src/dom/test/test-sgml-parser-basic @@ -16,17 +16,11 @@ test_output_equals () { src="$1"; shift out="$1"; shift - URI="test:$(echo "$desc" | sed ' - s/^[ \t]*\[[^]]*\][ \t]*//; - s/[:., \t][:., \t]*/-/g; - s/_/-/g; - # *cough* - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/; - s/[^a-zA-Z0-9-]//g;')" + URI="test:$(normalize "$desc")" - sgml-parser --uri "$URI" --src "$src" | sed 's/^ //' > output + sgml-parser --uri "$URI" --src "$src" > output echo "#document: $URI" > expected - echo "$out" | sed -n '2,$p' >> expected + echo "$out" | sed -n '2,$p' | sed 's/^/ /' >> expected test_expect_success "$desc" 'cmp output expected' } diff --git a/src/dom/test/test-sgml-parser-incremental b/src/dom/test/test-sgml-parser-incremental index aa6ea64b1..81038b834 100755 --- a/src/dom/test/test-sgml-parser-incremental +++ b/src/dom/test/test-sgml-parser-incremental @@ -16,20 +16,13 @@ test_incremental_parsing () { src="$1"; shift out="$1"; shift - URI="test:$(echo "$desc" | sed ' - s/^[ \t]*\[[^]]*\][ \t]*//; - s/[:., \t][:., \t]*/-/g; - s/_/-/g; - # *cough* - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/; - s/[^a-zA-Z0-9-]//g;')" + URI="test:$(normalize "$desc")" echo "#document: $URI" > expected - echo "$out" | sed -n '2,$p' >> expected + echo "$out" | sed -n '2,$p' | sed -e 's/^/ /' >> expected for size in 1 2 3 4 5 6 7 8 9 10 15 20 25 50; do - echo -n "$src" | sgml-parser --uri "$URI" --stdin "$size" \ - | sed -e 's/^ //' > output + echo -n "$src" | sgml-parser --uri "$URI" --stdin "$size" > output test_run_ 'cmp output expected' if [ "$?" != 0 -o "$eval_ret" != 0 ] @@ -45,7 +38,7 @@ test_incremental_parsing () { test_incremental_parsing \ "Parse a small document." \ '

Hello World!

' \ - ' +' element: html element: body element: p diff --git a/test/libtest.sh b/test/libtest.sh index 12de5c920..a16e4577f 100755 --- a/test/libtest.sh +++ b/test/libtest.sh @@ -15,7 +15,7 @@ export LANG LC_ALL PAGER TZ # test_description='Description of this test... # This test checks if command xyzzy does the right thing... # ' -# . ./test-lib.sh +# . "$TEST_LIB error () { echo "* error: $*" @@ -27,6 +27,17 @@ say () { echo "* $*" } +normalize () { + echo "$@" | sed ' + s/^[ \t]*\[[^]]*\][ \t]*//; + s/[:., \t][:., \t]*/-/g; + s/_/-/g; + # *cough* + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/; + s/[^a-zA-Z0-9-]//g;' +} + + test "${test_description}" != "" || error "Test script did not set test_description."