test: added more test-cases and improved reporting of failures.

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 5 insertions, 2 deletions

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);
 }