author | qdii <qdii@reblochon.be> | 2012-11-02 13:49:03 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-11-02 13:49:03 (UTC) |
commit | 648ae5dbd90e062f3432f809a846d50d994b86d4 (patch) (side-by-side diff) | |
tree | d9cbb0276d9a51db9243449866f01828dba36ab7 | |
parent | 824440e52ce8ddf1c45487d20d8996d08d0f96b5 (diff) | |
download | libopkele-648ae5dbd90e062f3432f809a846d50d994b86d4.zip libopkele-648ae5dbd90e062f3432f809a846d50d994b86d4.tar.gz libopkele-648ae5dbd90e062f3432f809a846d50d994b86d4.tar.bz2 |
Function _exit was referenced in the code, but <unistd.h> was not included, causing compilation to fail.
-rw-r--r-- | test/idiscover.cc | 1 | ||||
-rw-r--r-- | test/test.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/idiscover.cc b/test/idiscover.cc index 4b1e90c..8a5a3fb 100644 --- a/test/idiscover.cc +++ b/test/idiscover.cc @@ -1,41 +1,42 @@ #include <iostream> #include <stdexcept> #include <iterator> #include <algorithm> +#include <unistd.h> using namespace std; #include <opkele/exception.h> #include <opkele/discovery.h> #include <opkele/util.h> #include <opkele/util-internal.h> namespace opkele { ostream& operator<<(ostream& o,const opkele::openid_endpoint_t& oep) { o << " URI: " << oep.uri << endl << " Claimed ID: " << oep.claimed_id << endl << " Local ID: " << oep.local_id << endl; return o; } } int main(int argc,char **argv) { try { if(argc<2) throw opkele::exception(OPKELE_CP_ "Please, give me something to resolve"); for(int a=1;a<argc;++a) { cout << "==============================================================" << endl << "User-supplied ID: " << argv[a] << endl << "Endpoints:" << endl << " --" << endl; string normalized = opkele::idiscover( ostream_iterator<opkele::openid_endpoint_t>(cout," --\n") ,argv[a]); cout << "Normalized ID: " << normalized << endl; } }catch(exception& e) { cerr << "oops, caught " << opkele::util::abi_demangle(typeid(e).name()) << endl << " .what(): " << e.what() << endl; _exit(1); } _exit(0); } diff --git a/test/test.cc b/test/test.cc index 2143ac0..770e0c6 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,106 +1,107 @@ #include <iostream> #include <stdexcept> +#include <unistd.h> using namespace std; #include <opkele/exception.h> #include <opkele/util.h> #include "config.h" class failed_test : public opkele::exception { public: failed_test(OPKELE_E_PARS) : exception(OPKELE_E_CONS) { } }; void test_rfc_3986_normalize_uri(const string &ouri,bool success,const string& nuri="") { try { string n = opkele::util::rfc_3986_normalize_uri(ouri); if(!success) throw failed_test(OPKELE_CP_ "Normalized URI when it shouldn't ('"+ouri+"' normalization resulted in '"+n+"')"); if(n!=nuri) throw failed_test(OPKELE_CP_ "rfc_3986_test_failed for '"+ouri+"' failed, expected '"+nuri+"', got '"+n+"'"); }catch(opkele::bad_input& obi) { if(success) throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'bad_input'["+obi.what()+"]"); }catch(opkele::not_implemented& oni) { if(success) throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'not_implemented'["+oni.what()+"]"); } } void test_rfc_3986_normalize_uri() { test_rfc_3986_normalize_uri( "invalid", false ); test_rfc_3986_normalize_uri( "http://", false ); test_rfc_3986_normalize_uri( "http:/hacker.klever.net/", false ); test_rfc_3986_normalize_uri( "hTTp://hacker.klever.net#uh?oh", true, "http://hacker.klever.net/#uh?oh" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net?uh#oh", true, "http://hacker.klever.net/?uh#oh" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net:80/", true, "http://hacker.klever.net/" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net:80?uh", true, "http://hacker.klever.net/?uh" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net:80#uh", true, "http://hacker.klever.net/#uh" ); test_rfc_3986_normalize_uri( "https://hacker.klever.net:443", true, "https://hacker.klever.net/" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net:?oh", true, "http://hacker.klever.net/?oh" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah%2E", true, "http://hacker.klever.net/ah." ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%2E/", true, "http://hacker.klever.net/ah/" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%2b/", true, "http://hacker.klever.net/ah/%2B/" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/./oh?eh", true, "http://hacker.klever.net/ah/oh?eh" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/../oh?", true, "http://hacker.klever.net/oh?" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah//oh?", true, "http://hacker.klever.net/ah/oh?" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/?", true, "http://hacker.klever.net/ah/?" ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%", false ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%a", false ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%zx", false ); test_rfc_3986_normalize_uri( "http://hacker.klever.net/ah/%5x", false ); test_rfc_3986_normalize_uri( "Http://Hacker.Klever.Net:", true, "http://hacker.klever.net/" ); test_rfc_3986_normalize_uri( "http://www.xxx.com/openid/1", true, "http://www.xxx.com/openid/1" ); } void test_w3c_to_time(const char *w3c,time_t expected) { time_t t = opkele::util::w3c_to_time(w3c); if(t!=expected) { char tmp[512]; snprintf(tmp,sizeof(tmp)-1, "test failed for %s, expected %lu, got %lu (expected-got == %lu)", w3c, (unsigned long)expected, (unsigned long)t, (unsigned long)(expected-t) ); throw failed_test(OPKELE_CP_ tmp); } } void test_w3c_to_time() { test_w3c_to_time("2008-06-29T12:33:44",1214742824); } int main() { try { test_w3c_to_time(); test_rfc_3986_normalize_uri(); }catch(failed_test& ft) { cerr << "Test failed: " << ft.what() << endl; }catch(exception& e) { cerr << "oops: " << e.what() << endl; _exit(1); } _exit(0); } |