diff options
author | James Booth <boothj5@gmail.com> | 2016-04-26 23:56:12 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2016-04-26 23:56:12 +0100 |
commit | d4aa73159e7b50b18815920b29d68b38a03d58a8 (patch) | |
tree | 69a653058eeb3041096b186f492fb3b0658bf1dd /tests/unittests | |
parent | 0ff29b3d2edafbc74df5e4d0e6be61952b20f2c2 (diff) | |
parent | 043a673fe15075d06776a460ff35f03b0225c04c (diff) | |
download | profani-tty-d4aa73159e7b50b18815920b29d68b38a03d58a8.tar.gz |
Merge branch 'master' into subcmds
Diffstat (limited to 'tests/unittests')
-rw-r--r-- | tests/unittests/test_cmd_pgp.c | 1 | ||||
-rw-r--r-- | tests/unittests/tools/stub_http_upload.c | 63 | ||||
-rw-r--r-- | tests/unittests/xmpp/stub_xmpp.c | 7 |
3 files changed, 68 insertions, 3 deletions
diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c index b1d0ab52..68d48b0c 100644 --- a/tests/unittests/test_cmd_pgp.c +++ b/tests/unittests/test_cmd_pgp.c @@ -9,6 +9,7 @@ #include "config.h" #include "command/commands.h" +#include "xmpp/xmpp.h" #include "ui/stub_ui.h" diff --git a/tests/unittests/tools/stub_http_upload.c b/tests/unittests/tools/stub_http_upload.c new file mode 100644 index 00000000..cb7688cf --- /dev/null +++ b/tests/unittests/tools/stub_http_upload.c @@ -0,0 +1,63 @@ +/* + * http_upload.h + * + * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef TOOLS_HTTP_UPLOAD_H +#define TOOLS_HTTP_UPLOAD_H + +#include <curl/curl.h> + +// forward -> ui/win_types.h +typedef struct prof_win_t ProfWin; + +typedef struct http_upload_t { + char *filename; + off_t filesize; + curl_off_t bytes_sent; + char *mime_type; + char *get_url; + char *put_url; + ProfWin *window; + pthread_t worker; + int cancel; +} HTTPUpload; + +//GSList *upload_processes; + +void* http_file_put(void *userdata) {} + +char* file_mime_type(const char* const file_name) {} +off_t file_size(const char* const file_name) {} +int is_regular_file(const char *filename) {} + +#endif diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c index 3ba7f2b3..6437de86 100644 --- a/tests/unittests/xmpp/stub_xmpp.c +++ b/tests/unittests/xmpp/stub_xmpp.c @@ -71,7 +71,7 @@ jabber_send_stanza(const char *const stanza) } // message functions -char* message_send_chat(const char * const barejid, const char * const msg) +char* message_send_chat(const char * const barejid, const char * const msg, const char *const oob_url) { check_expected(barejid); check_expected(msg); @@ -90,8 +90,8 @@ char* message_send_chat_pgp(const char * const barejid, const char * const msg) return NULL; } -void message_send_private(const char * const fulljid, const char * const msg) {} -void message_send_groupchat(const char * const roomjid, const char * const msg) {} +void message_send_private(const char * const fulljid, const char * const msg, const char *const oob_url) {} +void message_send_groupchat(const char * const roomjid, const char * const msg, const char *const oob_url) {} void message_send_groupchat_subject(const char * const roomjid, const char * const subject) {} void message_send_inactive(const char * const barejid) {} @@ -158,6 +158,7 @@ void iq_room_list_request(gchar *conferencejid) void iq_disco_info_request(gchar *jid) {} void iq_disco_items_request(gchar *jid) {} void iq_set_autoping(int seconds) {} +void iq_http_upload_request(HTTPUpload *upload) {} void iq_confirm_instant_room(const char * const room_jid) {} void iq_destroy_room(const char * const room_jid) {} void iq_request_room_config_form(const char * const room_jid) {} |