| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/test-oauth-consumer.cc | 22 |
2 files changed, 8 insertions, 19 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index f0c0ea8..7cfe3a4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,5 @@ -noinst_PROGRAMS = test idiscover RP.cgi OP.cgi test-oauth-consumer +noinst_PROGRAMS = test idiscover test-oauth-consumer \ + ${_dependent_programs_} AM_CPPFLAGS=${CPPFLAGS_DEBUG} DEFAULT_INCLUDES = -I${top_builddir} @@ -21,6 +22,8 @@ if HAVE_SQLITE3 if HAVE_UUID if HAVE_KINGATE +_dependent_programs_ = RP.cgi OP.cgi + RP_cgi_SOURCES = RP.cc nodist_RP_cgi_SOURCES = RP-db.cc RP_cgi_LDADD = ${top_builddir}/lib/libopkele.la \ diff --git a/test/test-oauth-consumer.cc b/test/test-oauth-consumer.cc index 3b3ca70..b3ddef5 100644 --- a/test/test-oauth-consumer.cc +++ b/test/test-oauth-consumer.cc @@ -38,28 +38,14 @@ int main(int,char**) { opkele::util::curl_pick_t curl = opkele::util::curl_t::easy_init(); opkele::oauth::http_request_t hr("POST", "http://term.ie/oauth/example/echo_api.php"); - sc.prepare_request(hr, - opkele::fields_t(),test, - opkele::oauth::oauth_auth_header,"HMAC-SHA1", - &at,"realm"); - DOUT_("url: " << hr.url << endl - << "body: " << hr.body << endl - << "header: " << hr.authorize_header); - opkele::util::curl_slist_t rh; - rh.append("Authorization: "+hr.authorize_header); - CURLcode r; - (r=curl.misc_sets()) - || (r=curl.set_write()) - || (r=curl.easy_setopt(CURLOPT_HTTPHEADER,rh) ) - || (r=curl.easy_setopt(CURLOPT_URL,hr.url.c_str())) - || (r=curl.easy_setopt(CURLOPT_POST,1)) - || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,hr.body.c_str())) - || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,hr.body.size())); + CURLcode r = curl.misc_sets(); + r || (r=curl.set_write()); if(r) throw opkele::exception_curl(OPKELE_CP_ "failed to set curly options",r); + sc.prepare_request(hr,opkele::fields_t(),test,&at).setup_curl(curl); if( (r=curl.easy_perform()) ) throw opkele::exception_curl(OPKELE_CP_ "failed to perform curly request",r); - DOUT_("Response: " << endl << curl.response); + cout << "Response: " << curl.response << endl; #ifdef OPKELE_HAVE_KONFORKA }catch(konforka::exception& e) { |