1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00

Move URI normalization to the test library

This commit is contained in:
Jonas Fonseca 2006-01-28 15:03:19 +01:00 committed by Jonas Fonseca
parent 7c7541f4d1
commit 03c467bcbf
4 changed files with 15 additions and 22 deletions

View File

@ -17,13 +17,7 @@ test_normalize_output_equals () {
src="$1"; shift src="$1"; shift
out="$1"; shift out="$1"; shift
URI="test:$(echo "$desc" | sed ' URI="test:$(normalize "$desc")"
s/^[ \t]*\[[^]]*\][ \t]*//;
s/[:., \t][:., \t]*/-/g;
s/_/-/g;
# *cough*
y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
s/[^a-zA-Z0-9-]//g;')"
sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^ //' > output sgml-parser --src "$src" --normalize "$config" --uri "$URI" --src "$src" | sed 's/^ //' > output
echo "#document: $URI" > expected echo "#document: $URI" > expected

View File

@ -16,13 +16,7 @@ test_output_equals () {
src="$1"; shift src="$1"; shift
out="$1"; shift out="$1"; shift
URI="test:$(echo "$desc" | sed ' URI="test:$(normalize "$desc")"
s/^[ \t]*\[[^]]*\][ \t]*//;
s/[:., \t][:., \t]*/-/g;
s/_/-/g;
# *cough*
y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
s/[^a-zA-Z0-9-]//g;')"
sgml-parser --uri "$URI" --src "$src" | sed 's/^ //' > output sgml-parser --uri "$URI" --src "$src" | sed 's/^ //' > output
echo "#document: $URI" > expected echo "#document: $URI" > expected

View File

@ -16,13 +16,7 @@ test_incremental_parsing () {
src="$1"; shift src="$1"; shift
out="$1"; shift out="$1"; shift
URI="test:$(echo "$desc" | sed ' URI="test:$(normalize "$desc")"
s/^[ \t]*\[[^]]*\][ \t]*//;
s/[:., \t][:., \t]*/-/g;
s/_/-/g;
# *cough*
y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;
s/[^a-zA-Z0-9-]//g;')"
echo "#document: $URI" > expected echo "#document: $URI" > expected
echo "$out" | sed -n '2,$p' >> expected echo "$out" | sed -n '2,$p' >> expected

View File

@ -15,7 +15,7 @@ export LANG LC_ALL PAGER TZ
# test_description='Description of this test... # test_description='Description of this test...
# This test checks if command xyzzy does the right thing... # This test checks if command xyzzy does the right thing...
# ' # '
# . ./test-lib.sh # . "$TEST_LIB
error () { error () {
echo "* error: $*" echo "* error: $*"
@ -27,6 +27,17 @@ say () {
echo "* $*" 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}" != "" || test "${test_description}" != "" ||
error "Test script did not set test_description." error "Test script did not set test_description."