3 files changed, 101 insertions, 113 deletions
diff --git a/tests/otr/mock_otr.c b/tests/otr/mock_otr.c
deleted file mode 100644
index 25409197..00000000
--- a/tests/otr/mock_otr.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-
-#include "config.h"
-
-#ifdef HAVE_LIBOTR
-#include "otr/otr.h"
-#endif
-#include "config/account.h"
-
-#ifdef HAVE_LIBOTR
-static void
-_mock_otr_keygen(ProfAccount *account)
-{
-    check_expected(account);
-}
-
-static char *
-_mock_otr_libotr_version(void)
-{
-    return mock_ptr_type(char *);
-}
-
-static char *
-_mock_otr_get_my_fingerprint(void)
-{
-    return mock_ptr_type(char *);
-}
-
-static char *
-_mock_otr_get_their_fingerprint(const char * const recipient)
-{
-    check_expected(recipient);
-    return mock_ptr_type(char *);
-}
-
-static gboolean
-_mock_otr_key_loaded(void)
-{
-    return (gboolean)mock();
-}
-
-static char *
-_mock_otr_start_query(void)
-{
-    return mock_ptr_type(char *);
-}
-
-void
-otr_keygen_expect(ProfAccount *account)
-{
-    otr_keygen = _mock_otr_keygen;
-    expect_memory(_mock_otr_keygen, account, account, sizeof(ProfAccount));
-}
-
-void
-otr_libotr_version_returns(char *version)
-{
-    otr_libotr_version = _mock_otr_libotr_version;
-    will_return(_mock_otr_libotr_version, version);
-}
-
-void
-otr_get_my_fingerprint_returns(char *fingerprint)
-{
-    otr_get_my_fingerprint = _mock_otr_get_my_fingerprint;
-    will_return(_mock_otr_get_my_fingerprint, fingerprint);
-}
-
-void
-otr_get_their_fingerprint_expect_and_return(char *recipient, char *fingerprint)
-{
-    otr_get_their_fingerprint = _mock_otr_get_their_fingerprint;
-    expect_string(_mock_otr_get_their_fingerprint, recipient, recipient);
-    will_return(_mock_otr_get_their_fingerprint, fingerprint);
-}
-
-void
-otr_key_loaded_returns(gboolean loaded)
-{
-    otr_key_loaded = _mock_otr_key_loaded;
-    will_return(_mock_otr_key_loaded, loaded);
-}
-
-void
-otr_start_query_returns(char *query)
-{
-    otr_start_query = _mock_otr_start_query;
-    will_return(_mock_otr_start_query, query);
-}
-#endif
diff --git a/tests/otr/mock_otr.h b/tests/otr/mock_otr.h
deleted file mode 100644
index ab28ed6c..00000000
--- a/tests/otr/mock_otr.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MOCK_OTR_H
-#define MOCK_OTR_H
-
-#include "config/account.h"
-
-void otr_keygen_expect(ProfAccount *account);
-void otr_key_loaded_returns(gboolean loaded);
-
-void otr_libotr_version_returns(char *version);
-
-void otr_get_my_fingerprint_returns(char *fingerprint);
-void otr_get_their_fingerprint_expect_and_return(char *recipient, char *fingerprint);
-
-void otr_start_query_returns(char *query);
-
-#endif
diff --git a/tests/otr/stub_otr.c b/tests/otr/stub_otr.c
new file mode 100644
index 00000000..82994034
--- /dev/null
+++ b/tests/otr/stub_otr.c
@@ -0,0 +1,101 @@
+#include <libotr/proto.h>
+#include <libotr/message.h>
+#include <glib.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "config/account.h"
+
+#include "otr/otr.h"
+
+OtrlUserState otr_userstate(void)
+{
+    return NULL;
+}
+
+OtrlMessageAppOps* otr_messageops(void)
+{
+    return NULL;
+}
+
+GHashTable* otr_smpinitators(void)
+{
+    return NULL;
+}
+
+void otr_init(void) {}
+void otr_shutdown(void) {}
+
+char* otr_libotr_version(void)
+{
+    return (char*)mock();
+}
+
+char* otr_start_query(void)
+{
+    return (char*)mock();
+}
+
+void otr_poll(void) {}
+void otr_on_connect(ProfAccount *account) {}
+
+void otr_keygen(ProfAccount *account)
+{
+    check_expected(account);
+}
+
+gboolean otr_key_loaded(void)
+{
+    return (gboolean)mock();
+}
+
+gboolean otr_is_secure(const char * const recipient)
+{
+    return FALSE;
+}
+
+gboolean otr_is_trusted(const char * const recipient)
+{
+    return FALSE;
+}
+
+void otr_trust(const char * const recipient) {}
+void otr_untrust(const char * const recipient) {}
+
+void otr_smp_secret(const char * const recipient, const char *secret) {}
+void otr_smp_question(const char * const recipient, const char *question, const char *answer) {}
+void otr_smp_answer(const char * const recipient, const char *answer) {}
+
+void otr_end_session(const char * const recipient) {}
+
+char * otr_get_my_fingerprint(void)
+{
+    return (char *)mock();
+}
+
+char * otr_get_their_fingerprint(const char * const recipient)
+{
+    check_expected(recipient);
+    return (char *)mock();
+}
+
+char * otr_encrypt_message(const char * const to, const char * const message)
+{
+    return NULL;
+}
+
+char * otr_decrypt_message(const char * const from, const char * const message,
+    gboolean *was_decrypted)
+{
+    return NULL;
+}
+
+void otr_free_message(char *message) {}
+
+prof_otrpolicy_t otr_get_policy(const char * const recipient)
+{
+    return PROF_OTRPOLICY_MANUAL;
+}
\ No newline at end of file