Converted tests 558 & 559 to use the unit test framework as 1305

Test 558 was just a subset of 559 which is something that can be
easily added later.

4 files changed, 28 insertions, 90 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3f8196d57..2967e7cf6 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -59,7 +59,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1064 test1065 test1066 test1067 test1068 test1069 test1070 test1071   \
  test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079   \
  test1080 test1081 test1082 test1083 test1084 test1085 test633 test634	   \
- test635 test636 test637 test558 test559 test1086 test1087 test1088	   \
+ test635 test636 test637 test1086 test1087 test1088	   \
  test574 test575 test576 test577 test1113 test1114 test1089 test1090	   \
  test1091 test1092 test1093 test1094 test1095 test1096 test1097 test560	   \
  test561 test1098 test1099 test562 test563 test1100 test564 test1101	   \
@@ -70,7 +70,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test313 test1115 test578 test579 test1116 test1200 test1201 test1202	   \
  test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
  test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
- test1304
+ test1304 test1305
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1305 b/tests/data/test1305
new file mode 100644
index 000000000..4efe321e1
--- /dev/null
+++ b/tests/data/test1305
@@ -0,0 +1,26 @@
+<testcase>
+<info>
+<keywords>
+unittest
+hash
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+ <name>
+internal hash create/add/destroy testing
+ </name>
+<tool>
+unit1305
+</tool>
+</client>
+
+</testcase>
diff --git a/tests/data/test558 b/tests/data/test558
deleted file mode 100644
index 5b69ea027..000000000
--- a/tests/data/test558
+++ /dev/null
@@ -1,44 +0,0 @@
-<testcase>
-#
-# Server-side
-<reply>
-</reply>
-
-# Client-side
-<client>
-<server>
-none
-</server>
-# tool is what to use instead of 'curl'
-<tool>
-lib558
-</tool>
-# precheck is a command line to run before the test,
-# to see if we can execute the test or not
-<precheck>
-./libtest/lib558 check
-</precheck>
-
-<name>
-internal hash create/destroy testing
-</name>
-<command>
-nothing
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<stdout mode="text">
-easy handle init OK
-creating hash...
-hash creation OK
-destroying hash...
-hash destruction OK
-destroying easy handle...
-easy handle destruction OK
-</stdout>
-</verify>
-
-</testcase>
diff --git a/tests/data/test559 b/tests/data/test559
deleted file mode 100644
index ecaf54c7e..000000000
--- a/tests/data/test559
+++ /dev/null
@@ -1,44 +0,0 @@
-<testcase>
-#
-# Server-side
-<reply>
-</reply>
-
-# Client-side
-<client>
-<server>
-none
-</server>
-# tool is what to use instead of 'curl'
-<tool>
-lib559
-</tool>
-# precheck is a command line to run before the test,
-# to see if we can execute the test or not
-<precheck>
-./libtest/lib559 check
-</precheck>
-
-<name>
-internal hash create/add/destroy testing
-</name>
-<command>
-nothing
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<stdout mode="text">
-easy handle init OK
-creating hash...
-hash creation OK
-destroying hash...
-hash destruction OK
-destroying easy handle...
-easy handle destruction OK
-</stdout>
-</verify>
-
-</testcase>