Nicer names for test files.

git-svn-id: file:///svn/unbound/trunk@1755 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index ca7f49acb4512a79eb48fe3730cea9ed93d52cad..521776968114815a8519e6e3f1b3c3b478dd2f36 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 11 August 2009: Wouter
        - Check for openssl compatible with gost if enabled.
        - updated unit test for GOST=211 code.
+         Nicer naming of test files.
 
 7 August 2009: Wouter
        - call OPENSSL_config() in unbound and unit test so that the

diff --git a/testcode/unitverify.c b/testcode/unitverify.c
index 24832aa0ba594d5eefdb4fccb0cbe327ec622b3d..b423a738b59c0e78f47e1f108a544aca67ee210c 100644 (file)
--- a/testcode/unitverify.c
+++ b/testcode/unitverify.c
@@ -475,21 +475,21 @@ verify_test()
        verifytest_file("testdata/test_signatures.7", "20070829144150");
        verifytest_file("testdata/test_signatures.8", "20070829144150");
 #if defined(HAVE_EVP_SHA256) && defined(USE_SHA2)
-       verifytest_file("testdata/test_signatures.9", "20070829144150");
-       verifytest_file("testdata/test_signatures.11", "20070829144150");
-       verifytest_file("testdata/test_signatures.14", "20090101000000");
+       verifytest_file("testdata/test_sigs.rsasha256", "20070829144150");
+       verifytest_file("testdata/test_sigs.sha1_and_256", "20070829144150");
+       verifytest_file("testdata/test_sigs.rsasha256_draft", "20090101000000");
 #endif
 #if defined(HAVE_EVP_SHA512) && defined(USE_SHA2)
-       verifytest_file("testdata/test_signatures.10", "20070829144150");
+       verifytest_file("testdata/test_sigs.rsasha512_draft", "20070829144150");
 #endif
-       verifytest_file("testdata/test_signatures.12", "20090107100022");
-       verifytest_file("testdata/test_signatures.13", "20080414005004");
+       verifytest_file("testdata/test_sigs.hinfo", "20090107100022");
+       verifytest_file("testdata/test_sigs.revoked", "20080414005004");
 #ifdef USE_GOST
        if(ldns_key_EVP_load_gost_id())
-         verifytest_file("testdata/test_signatures.15", "20090807060504");
+         verifytest_file("testdata/test_sigs.gost", "20090807060504");
        else printf("Warning: skipped GOST, openssl does not provide gost.\n");
 #endif
-       dstest_file("testdata/test_ds_sig.1");
+       dstest_file("testdata/test_ds.sha1");
        nsectest();
        nsec3_hash_test("testdata/test_nsec3_hash.1");
 }

diff --git a/testdata/Kexample.com.+211+41891.ds b/testdata/Kexample.com.+211+41891.ds
new file mode 100644 (file)
index 0000000..cce53f0
--- /dev/null
+++ b/testdata/Kexample.com.+211+41891.ds
@@ -0,0 +1 @@
+example.com.   3600    IN      DS      41891 211 203 2de06cf7fb43c0fe0ec74173260e4575f643eb66070cac006c341fe2a1abd083 ; xerev-byraz-lavyg-fabuz-vyfis-lybal-finyb-vocul-hetug-fapik-kucob-syreb-biruf-goliv-dumap-rogom-foxox

diff --git a/testdata/Kexample.com.+211+41891.key b/testdata/Kexample.com.+211+41891.key
new file mode 100644 (file)
index 0000000..4f4e8ba
--- /dev/null
+++ b/testdata/Kexample.com.+211+41891.key
@@ -0,0 +1 @@
+example.com.   3600    IN      DNSKEY  256 3 211 e6GeTsfJnBq4QeL4eNS3SUOYvjFW59ClXtWtAlNgJHcG6damdpIUEyWdMDhZBLJoFNsH4IF06VPK6e+OSA1VGw== ;{id = 41891 (zsk), size = 512b}

diff --git a/testdata/Kexample.com.+211+41891.private b/testdata/Kexample.com.+211+41891.private
new file mode 100644 (file)
index 0000000..2d74fa1
--- /dev/null
+++ b/testdata/Kexample.com.+211+41891.private
@@ -0,0 +1,3 @@
+Private-key-format: v1.2
+Algorithm: 211 (GOST)
+MEUCAQAwHAYGKoUDAgITMBIGByqFAwICIwEGByqFAwICHgEEIgIgZdfQ+s3ASjjFsne42OdGYxav0QKoL3p/wOX/3kySQ3Q=

diff --git a/testdata/test_ds_sig.1 b/testdata/test_ds.sha1
similarity index 100%
rename from testdata/test_ds_sig.1
rename to testdata/test_ds.sha1

diff --git a/testdata/test_signatures.15 b/testdata/test_sigs.gost
similarity index 100%
rename from testdata/test_signatures.15
rename to testdata/test_sigs.gost

diff --git a/testdata/test_signatures.12 b/testdata/test_sigs.hinfo
similarity index 100%
rename from testdata/test_signatures.12
rename to testdata/test_sigs.hinfo

diff --git a/testdata/test_signatures.13 b/testdata/test_sigs.revoked
similarity index 100%
rename from testdata/test_signatures.13
rename to testdata/test_sigs.revoked

diff --git a/testdata/test_signatures.9 b/testdata/test_sigs.rsasha256
similarity index 100%
rename from testdata/test_signatures.9
rename to testdata/test_sigs.rsasha256

diff --git a/testdata/test_signatures.14 b/testdata/test_sigs.rsasha256_draft
similarity index 100%
rename from testdata/test_signatures.14
rename to testdata/test_sigs.rsasha256_draft

diff --git a/testdata/test_signatures.10 b/testdata/test_sigs.rsasha512_draft
similarity index 100%
rename from testdata/test_signatures.10
rename to testdata/test_sigs.rsasha512_draft

diff --git a/testdata/test_signatures.11 b/testdata/test_sigs.sha1_and_256
similarity index 100%
rename from testdata/test_signatures.11
rename to testdata/test_sigs.sha1_and_256