author | Michael Krelin <hacker@klever.net> | 2007-09-14 22:52:54 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-09-14 22:52:54 (UTC) |
commit | 5cfe3f2743c2b2eb2689090516a4e667fd8ca29a (patch) (unidiff) | |
tree | dd039fad63f518b3befe22e8026385052dca11e8 /test | |
parent | 5f1d69ac7753243b93761944e9444f01d8a7e5dd (diff) | |
download | libopkele-5cfe3f2743c2b2eb2689090516a4e667fd8ca29a.zip libopkele-5cfe3f2743c2b2eb2689090516a4e667fd8ca29a.tar.gz libopkele-5cfe3f2743c2b2eb2689090516a4e667fd8ca29a.tar.bz2 |
test: added more test-cases and improved reporting of failures.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | test/Makefile.am | 5 | ||||
-rw-r--r-- | test/html/spaced-link-attrs.html | 8 | ||||
-rw-r--r-- | test/html/spaced-links.html | 8 | ||||
-rw-r--r-- | test/html/unclosed-head.html | 7 | ||||
-rw-r--r-- | test/test.cc | 7 |
5 files changed, 32 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 0dbba65..550078a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am | |||
@@ -2,7 +2,10 @@ noinst_PROGRAMS = test | |||
2 | 2 | ||
3 | INCLUDES = -I${top_srcdir}/include/ | 3 | INCLUDES = -I${top_srcdir}/include/ |
4 | 4 | ||
5 | test_SOURCES = test.cc | 5 | test_SOURCES = test.cc |
6 | test_LDADD = ${top_builddir}/lib/libopkele.la | 6 | test_LDADD = ${top_builddir}/lib/libopkele.la |
7 | 7 | ||
8 | EXTRA_DIST=$(addsuffix .html,$(addprefix html/, empty head-in-body hkn-delegate hkn-server hkn in-body)) | 8 | EXTRA_DIST=$(addsuffix .html,$(addprefix html/, \ |
9 | empty head-in-body hkn-delegate hkn-server hkn in-body \ | ||
10 | unclosed-head spaced-links spaced-link-attrs \ | ||
11 | )) | ||
diff --git a/test/html/spaced-link-attrs.html b/test/html/spaced-link-attrs.html new file mode 100644 index 0000000..33905c0 --- a/dev/null +++ b/test/html/spaced-link-attrs.html | |||
@@ -0,0 +1,8 @@ | |||
1 | <html> | ||
2 | <head> | ||
3 | <link rel=" openid.server " href=" http://www.klever.net/openid.server" /> | ||
4 | <link rel=" openid.delegate" href="http://hacker.klever.net/ " /> | ||
5 | </head> | ||
6 | <body> | ||
7 | </body> | ||
8 | </html> | ||
diff --git a/test/html/spaced-links.html b/test/html/spaced-links.html new file mode 100644 index 0000000..a958907 --- a/dev/null +++ b/test/html/spaced-links.html | |||
@@ -0,0 +1,8 @@ | |||
1 | <html> | ||
2 | <head> | ||
3 | < link rel = "openid.server" href = "http://www.klever.net/openid.server" /> | ||
4 | <link rel="openid.delegate" href='http://hacker.klever.net/' /> | ||
5 | </head> | ||
6 | <body> | ||
7 | </body> | ||
8 | </html> | ||
diff --git a/test/html/unclosed-head.html b/test/html/unclosed-head.html new file mode 100644 index 0000000..9c6f2ea --- a/dev/null +++ b/test/html/unclosed-head.html | |||
@@ -0,0 +1,7 @@ | |||
1 | <html> | ||
2 | <head> | ||
3 | <link rel="openid.server" href="http://www.klever.net/openid.server" /> | ||
4 | <link rel="openid.delegate" href="http://hacker.klever.net/" /> | ||
5 | <body> | ||
6 | </body> | ||
7 | </html> | ||
diff --git a/test/test.cc b/test/test.cc index f0526c6..10283e6 100644 --- a/test/test.cc +++ b/test/test.cc | |||
@@ -36,26 +36,29 @@ void test_retrieve_links(const string& f,bool success,const string& s="",const s | |||
36 | if(server!=s) | 36 | if(server!=s) |
37 | throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected server '"+s+"', got '"+server+"'"); | 37 | throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected server '"+s+"', got '"+server+"'"); |
38 | if(delegate!=d) | 38 | if(delegate!=d) |
39 | throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected delegate '"+d+"', got '"+delegate+"'"); | 39 | throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected delegate '"+d+"', got '"+delegate+"'"); |
40 | }catch(opkele::bad_input& obi) { | 40 | }catch(opkele::bad_input& obi) { |
41 | if(success) | 41 | if(success) |
42 | throw failed_test(OPKELE_CP_ "Test failed"); | 42 | throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'bad_input'["+obi.what()+"]"); |
43 | }catch(opkele::failed_assertion& ofa) { | 43 | }catch(opkele::failed_assertion& ofa) { |
44 | if(success) | 44 | if(success) |
45 | throw failed_test(OPKELE_CP_ "Test failed"); | 45 | throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'failed_assertion'["+ofa.what()+"]"); |
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | void test_retrieve_links() { | 49 | void test_retrieve_links() { |
50 | test_retrieve_links("empty.html",false); | 50 | test_retrieve_links("empty.html",false); |
51 | test_retrieve_links("in-body.html",false); | 51 | test_retrieve_links("in-body.html",false); |
52 | test_retrieve_links("head-in-body.html",false); | 52 | test_retrieve_links("head-in-body.html",false); |
53 | test_retrieve_links("hkn.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); | 53 | test_retrieve_links("hkn.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); |
54 | test_retrieve_links("hkn-server.html",true,"http://www.klever.net/openid.server"); | 54 | test_retrieve_links("hkn-server.html",true,"http://www.klever.net/openid.server"); |
55 | test_retrieve_links("hkn-delegate.html",false); | 55 | test_retrieve_links("hkn-delegate.html",false); |
56 | test_retrieve_links("unclosed-head.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); | ||
57 | test_retrieve_links("spaced-links.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); | ||
58 | test_retrieve_links("spaced-link-attrs.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); | ||
56 | } | 59 | } |
57 | 60 | ||
58 | main() { | 61 | main() { |
59 | try { | 62 | try { |
60 | test_retrieve_links(); | 63 | test_retrieve_links(); |
61 | }catch(failed_test& ft) { | 64 | }catch(failed_test& ft) { |