Move URI normalization to the test library

src/dom/test/test-dom-configuration-basic

@@ -17,13 +17,7 @@ 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
 	echo "#document: $URI" > expected

src/dom/test/test-sgml-parser-basic

@@ -16,13 +16,7 @@ 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
 	echo "#document: $URI" > expected

src/dom/test/test-sgml-parser-incremental

@@ -16,13 +16,7 @@ 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

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."