| 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) (side-by-side diff) | |
| 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 @@ -1,8 +1,11 @@ noinst_PROGRAMS = test INCLUDES = -I${top_srcdir}/include/ test_SOURCES = test.cc test_LDADD = ${top_builddir}/lib/libopkele.la -EXTRA_DIST=$(addsuffix .html,$(addprefix html/, empty head-in-body hkn-delegate hkn-server hkn in-body)) +EXTRA_DIST=$(addsuffix .html,$(addprefix html/, \ + empty head-in-body hkn-delegate hkn-server hkn in-body \ + unclosed-head spaced-links spaced-link-attrs \ + )) 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 @@ +<html> + <head> + <link rel=" openid.server " href=" http://www.klever.net/openid.server" /> + <link rel=" openid.delegate" href="http://hacker.klever.net/ " /> + </head> + <body> + </body> +</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 @@ +<html> + <head> + < link rel = "openid.server" href = "http://www.klever.net/openid.server" /> + <link rel="openid.delegate" href='http://hacker.klever.net/' /> + </head> + <body> + </body> +</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 @@ +<html> + <head> + <link rel="openid.server" href="http://www.klever.net/openid.server" /> + <link rel="openid.delegate" href="http://hacker.klever.net/" /> + <body> + </body> +</html> diff --git a/test/test.cc b/test/test.cc index f0526c6..10283e6 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,68 +1,71 @@ #include <iostream> #include <stdexcept> using namespace std; #include <opkele/exception.h> #include <opkele/consumer.h> #include "config.h" class failed_test : public opkele::exception { public: failed_test(OPKELE_E_PARS) : exception(OPKELE_E_CONS) { } }; class dummy_consumer_t : public opkele::consumer_t { public: virtual opkele::assoc_t store_assoc(const string& server,const string& handle,const opkele::secret_t& secret,int expires_in) { throw opkele::not_implemented(OPKELE_CP_ "Not implemented"); } virtual opkele::assoc_t retrieve_assoc(const string& server,const string& handle) { throw opkele::not_implemented(OPKELE_CP_ "Not implemented"); } virtual void invalidate_assoc(const string& server,const string& handle) { throw opkele::not_implemented(OPKELE_CP_ "Not implemented"); } }; void test_retrieve_links(const string& f,bool success,const string& s="",const string& d="") { dummy_consumer_t dc; string server, delegate; try { dc.retrieve_links("file://" OPKELE_SRC_DIR "/test/html/"+f,server,delegate); if(!success) throw failed_test(OPKELE_CP_ "Retrieved links when it shouldn't"); if(server!=s) throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected server '"+s+"', got '"+server+"'"); if(delegate!=d) throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected delegate '"+d+"', got '"+delegate+"'"); }catch(opkele::bad_input& obi) { if(success) - throw failed_test(OPKELE_CP_ "Test failed"); + throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'bad_input'["+obi.what()+"]"); }catch(opkele::failed_assertion& ofa) { if(success) - throw failed_test(OPKELE_CP_ "Test failed"); + throw failed_test(OPKELE_CP_ "Test '"+f+"' failed due to 'failed_assertion'["+ofa.what()+"]"); } } void test_retrieve_links() { test_retrieve_links("empty.html",false); test_retrieve_links("in-body.html",false); test_retrieve_links("head-in-body.html",false); test_retrieve_links("hkn.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); test_retrieve_links("hkn-server.html",true,"http://www.klever.net/openid.server"); test_retrieve_links("hkn-delegate.html",false); + test_retrieve_links("unclosed-head.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); + test_retrieve_links("spaced-links.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); + test_retrieve_links("spaced-link-attrs.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/"); } main() { try { test_retrieve_links(); }catch(failed_test& ft) { cerr << "Test failed: " << ft.what() << endl; }catch(exception& e) { cerr << "oops: " << e.what() << endl; _exit(1); } _exit(0); } |