summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--test/idiscover.cc1
-rw-r--r--test/test.cc1
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 @@
1#include <iostream> 1#include <iostream>
2#include <stdexcept> 2#include <stdexcept>
3#include <iterator> 3#include <iterator>
4#include <algorithm> 4#include <algorithm>
5#include <unistd.h>
5using namespace std; 6using namespace std;
6#include <opkele/exception.h> 7#include <opkele/exception.h>
7#include <opkele/discovery.h> 8#include <opkele/discovery.h>
8#include <opkele/util.h> 9#include <opkele/util.h>
9#include <opkele/util-internal.h> 10#include <opkele/util-internal.h>
10 11
11namespace opkele { 12namespace opkele {
12 ostream& operator<<(ostream& o,const opkele::openid_endpoint_t& oep) { 13 ostream& operator<<(ostream& o,const opkele::openid_endpoint_t& oep) {
13 o 14 o
14 << " URI: " << oep.uri << endl 15 << " URI: " << oep.uri << endl
15 << " Claimed ID: " << oep.claimed_id << endl 16 << " Claimed ID: " << oep.claimed_id << endl
16 << " Local ID: " << oep.local_id << endl; 17 << " Local ID: " << oep.local_id << endl;
17 return o; 18 return o;
18 } 19 }
19} 20}
20 21
21int main(int argc,char **argv) { 22int main(int argc,char **argv) {
22 try { 23 try {
23 if(argc<2) 24 if(argc<2)
24 throw opkele::exception(OPKELE_CP_ "Please, give me something to resolve"); 25 throw opkele::exception(OPKELE_CP_ "Please, give me something to resolve");
25 for(int a=1;a<argc;++a) { 26 for(int a=1;a<argc;++a) {
26 cout << "==============================================================" << endl 27 cout << "==============================================================" << endl
27 << "User-supplied ID: " << argv[a] << endl 28 << "User-supplied ID: " << argv[a] << endl
28 << "Endpoints:" << endl 29 << "Endpoints:" << endl
29 << " --" << endl; 30 << " --" << endl;
30 string normalized = opkele::idiscover( 31 string normalized = opkele::idiscover(
31 ostream_iterator<opkele::openid_endpoint_t>(cout," --\n") 32 ostream_iterator<opkele::openid_endpoint_t>(cout," --\n")
32 ,argv[a]); 33 ,argv[a]);
33 cout << "Normalized ID: " << normalized << endl; 34 cout << "Normalized ID: " << normalized << endl;
34 } 35 }
35 }catch(exception& e) { 36 }catch(exception& e) {
36 cerr << "oops, caught " << opkele::util::abi_demangle(typeid(e).name()) << endl 37 cerr << "oops, caught " << opkele::util::abi_demangle(typeid(e).name()) << endl
37 << " .what(): " << e.what() << endl; 38 << " .what(): " << e.what() << endl;
38 _exit(1); 39 _exit(1);
39 } 40 }
40 _exit(0); 41 _exit(0);
41} 42}
diff --git a/test/test.cc b/test/test.cc
index 2143ac0..770e0c6 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,50 +1,51 @@
1#include <iostream> 1#include <iostream>
2#include <stdexcept> 2#include <stdexcept>
3#include <unistd.h>
3using namespace std; 4using namespace std;
4#include <opkele/exception.h> 5#include <opkele/exception.h>
5#include <opkele/util.h> 6#include <opkele/util.h>
6 7
7#include "config.h" 8#include "config.h"
8 9
9class failed_test : public opkele::exception { 10class failed_test : public opkele::exception {
10 public: 11 public:
11 failed_test(OPKELE_E_PARS) 12 failed_test(OPKELE_E_PARS)
12 : exception(OPKELE_E_CONS) { } 13 : exception(OPKELE_E_CONS) { }
13}; 14};
14 15
15void test_rfc_3986_normalize_uri(const string &ouri,bool success,const string& nuri="") { 16void test_rfc_3986_normalize_uri(const string &ouri,bool success,const string& nuri="") {
16 try { 17 try {
17 string n = opkele::util::rfc_3986_normalize_uri(ouri); 18 string n = opkele::util::rfc_3986_normalize_uri(ouri);
18 if(!success) 19 if(!success)
19 throw failed_test(OPKELE_CP_ "Normalized URI when it shouldn't ('"+ouri+"' normalization resulted in '"+n+"')"); 20 throw failed_test(OPKELE_CP_ "Normalized URI when it shouldn't ('"+ouri+"' normalization resulted in '"+n+"')");
20 if(n!=nuri) 21 if(n!=nuri)
21 throw failed_test(OPKELE_CP_ "rfc_3986_test_failed for '"+ouri+"' failed, expected '"+nuri+"', got '"+n+"'"); 22 throw failed_test(OPKELE_CP_ "rfc_3986_test_failed for '"+ouri+"' failed, expected '"+nuri+"', got '"+n+"'");
22 }catch(opkele::bad_input& obi) { 23 }catch(opkele::bad_input& obi) {
23 if(success) 24 if(success)
24 throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'bad_input'["+obi.what()+"]"); 25 throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'bad_input'["+obi.what()+"]");
25 }catch(opkele::not_implemented& oni) { 26 }catch(opkele::not_implemented& oni) {
26 if(success) 27 if(success)
27 throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'not_implemented'["+oni.what()+"]"); 28 throw failed_test(OPKELE_CP_ "Test '"+ouri+"' failed due to 'not_implemented'["+oni.what()+"]");
28 } 29 }
29} 30}
30 31
31void test_rfc_3986_normalize_uri() { 32void test_rfc_3986_normalize_uri() {
32 test_rfc_3986_normalize_uri( 33 test_rfc_3986_normalize_uri(
33 "invalid", false ); 34 "invalid", false );
34 test_rfc_3986_normalize_uri( 35 test_rfc_3986_normalize_uri(
35 "http://", false ); 36 "http://", false );
36 test_rfc_3986_normalize_uri( 37 test_rfc_3986_normalize_uri(
37 "http:/hacker.klever.net/", false ); 38 "http:/hacker.klever.net/", false );
38 test_rfc_3986_normalize_uri( 39 test_rfc_3986_normalize_uri(
39 "hTTp://hacker.klever.net#uh?oh", true, "http://hacker.klever.net/#uh?oh" ); 40 "hTTp://hacker.klever.net#uh?oh", true, "http://hacker.klever.net/#uh?oh" );
40 test_rfc_3986_normalize_uri( 41 test_rfc_3986_normalize_uri(
41 "http://hacker.klever.net?uh#oh", true, "http://hacker.klever.net/?uh#oh" ); 42 "http://hacker.klever.net?uh#oh", true, "http://hacker.klever.net/?uh#oh" );
42 test_rfc_3986_normalize_uri( 43 test_rfc_3986_normalize_uri(
43 "http://hacker.klever.net:80/", true, "http://hacker.klever.net/" ); 44 "http://hacker.klever.net:80/", true, "http://hacker.klever.net/" );
44 test_rfc_3986_normalize_uri( 45 test_rfc_3986_normalize_uri(
45 "http://hacker.klever.net:80?uh", true, "http://hacker.klever.net/?uh" ); 46 "http://hacker.klever.net:80?uh", true, "http://hacker.klever.net/?uh" );
46 test_rfc_3986_normalize_uri( 47 test_rfc_3986_normalize_uri(
47 "http://hacker.klever.net:80#uh", true, "http://hacker.klever.net/#uh" ); 48 "http://hacker.klever.net:80#uh", true, "http://hacker.klever.net/#uh" );
48 test_rfc_3986_normalize_uri( 49 test_rfc_3986_normalize_uri(
49 "https://hacker.klever.net:443", true, "https://hacker.klever.net/" ); 50 "https://hacker.klever.net:443", true, "https://hacker.klever.net/" );
50 test_rfc_3986_normalize_uri( 51 test_rfc_3986_normalize_uri(