-rw-r--r-- | test/test.cc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/test/test.cc b/test/test.cc index 35f58ab..4bb2969 100644 --- a/test/test.cc +++ b/test/test.cc | |||
@@ -16,7 +16,7 @@ void test_rfc_3986_normalize_uri(const string &ouri,bool success,const string& n | |||
16 | try { | 16 | try { |
17 | string n = opkele::util::rfc_3986_normalize_uri(ouri); | 17 | string n = opkele::util::rfc_3986_normalize_uri(ouri); |
18 | if(!success) | 18 | if(!success) |
19 | throw failed_test(OPKELE_CP_ "Normalized URI when it shouldn't"); | 19 | throw failed_test(OPKELE_CP_ "Normalized URI when it shouldn't ('"+ouri+"' normalization resulted in '"+n+"')"); |
20 | if(n!=nuri) | 20 | if(n!=nuri) |
21 | throw failed_test(OPKELE_CP_ "rfc_3986_test_failed for '"+ouri+"' failed, expected '"+nuri+"', got '"+n+"'"); | 21 | throw failed_test(OPKELE_CP_ "rfc_3986_test_failed for '"+ouri+"' failed, expected '"+nuri+"', got '"+n+"'"); |
22 | }catch(opkele::bad_input& obi) { | 22 | }catch(opkele::bad_input& obi) { |
@@ -32,8 +32,6 @@ void test_rfc_3986_normalize_uri() { | |||
32 | test_rfc_3986_normalize_uri( | 32 | test_rfc_3986_normalize_uri( |
33 | "invalid", false ); | 33 | "invalid", false ); |
34 | test_rfc_3986_normalize_uri( | 34 | test_rfc_3986_normalize_uri( |
35 | "ftp://hacker.klever.net/", false ); | ||
36 | test_rfc_3986_normalize_uri( | ||
37 | "http://", false ); | 35 | "http://", false ); |
38 | test_rfc_3986_normalize_uri( | 36 | test_rfc_3986_normalize_uri( |
39 | "http:/hacker.klever.net/", false ); | 37 | "http:/hacker.klever.net/", false ); |
@@ -77,8 +75,24 @@ void test_rfc_3986_normalize_uri() { | |||
77 | "Http://Hacker.Klever.Net:", true, "http://hacker.klever.net/" ); | 75 | "Http://Hacker.Klever.Net:", true, "http://hacker.klever.net/" ); |
78 | } | 76 | } |
79 | 77 | ||
78 | void test_w3c_to_time(const char *w3c,time_t expected) { | ||
79 | time_t t = opkele::util::w3c_to_time(w3c); | ||
80 | if(t!=expected) { | ||
81 | char tmp[512]; snprintf(tmp,sizeof(tmp)-1, | ||
82 | "test failed for %s, expected %lu, got %lu (expected-got == %lu)", | ||
83 | w3c, (unsigned long)expected, (unsigned long)t, | ||
84 | (unsigned long)(expected-t) ); | ||
85 | throw failed_test(OPKELE_CP_ tmp); | ||
86 | } | ||
87 | } | ||
88 | |||
89 | void test_w3c_to_time() { | ||
90 | test_w3c_to_time("2008-06-29T12:33:44",1214742824); | ||
91 | } | ||
92 | |||
80 | int main() { | 93 | int main() { |
81 | try { | 94 | try { |
95 | test_w3c_to_time(); | ||
82 | test_rfc_3986_normalize_uri(); | 96 | test_rfc_3986_normalize_uri(); |
83 | }catch(failed_test& ft) { | 97 | }catch(failed_test& ft) { |
84 | cerr << "Test failed: " << ft.what() << endl; | 98 | cerr << "Test failed: " << ft.what() << endl; |