pidgin/pidgin

start implement the _new_xfer test, stopping here as there a lot more auxiliary work that needs to be done to make it work

2017-11-26, Gary Kramlich
98227c37cd17
Parents 518362268798
Children 1e1822eeeb54
start implement the _new_xfer test, stopping here as there a lot more auxiliary work that needs to be done to make it work
2 files changed, 50 insertions(+), 35 deletions(-)
  • +39 -26
    libpurple/tests/test_protocol_xfer.c
  • +11 -9
    libpurple/xfer.c
    • --- a/libpurple/tests/test_protocol_xfer.c Sun Nov 26 01:30:28 2017 -0600
    +++ b/libpurple/tests/test_protocol_xfer.c Sun Nov 26 02:15:23 2017 -0600
    @@ -30,13 +30,6 @@
    #include "test_ui.h"
    /******************************************************************************
    - * Junk
    - *****************************************************************************/
    -typedef struct {
    - gint dummy;
    -} TestPurpleProtocolXferFixture;
    -
    -/******************************************************************************
    * PurpleProtcolXfer Implementations
    *****************************************************************************/
    static GType test_purple_protocol_xfer_get_type(void);
    @@ -53,17 +46,24 @@
    static gboolean
    -test_purple_protocol_xfer_can_receive(PurpleProtocolXfer *xfer, PurpleConnection *c, const gchar *who) {
    - TestPurpleProtocolXfer *test_xfer = (TestPurpleProtocolXfer *)xfer;
    +test_purple_protocol_xfer_can_receive(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who) {
    + TestPurpleProtocolXfer *test_xfer = (TestPurpleProtocolXfer *)prplxfer;
    return test_xfer->can_send;
    }
    +static PurpleXfer *
    +test_purple_protocol_xfer_new_xfer(PurpleProtocolXfer *prplxfer, PurpleConnection *c, const gchar *who) {
    + PurpleAccount *a = purple_connection_get_account(c);
    +
    + return purple_xfer_new(a, PURPLE_XFER_TYPE_SEND, who);
    +}
    +
    static void
    test_purple_protocol_xfer_iface_init(PurpleProtocolXferInterface *iface) {
    iface->can_receive = test_purple_protocol_xfer_can_receive;
    iface->send = NULL;
    - iface->new_xfer = NULL;
    + iface->new_xfer = test_purple_protocol_xfer_new_xfer;
    }
    G_DEFINE_TYPE_WITH_CODE(
    @@ -85,18 +85,10 @@
    }
    /******************************************************************************
    - * Helpers
    - *****************************************************************************/
    -static void
    -test_purple_protocol_xfer_setup(TestPurpleProtocolXferFixture *fixture, gconstpointer data) {
    - test_ui_purple_init();
    -}
    -
    -/******************************************************************************
    * Tests
    *****************************************************************************/
    static void
    -test_purple_protocol_xfer_can_receive_func(TestPurpleProtocolXferFixture *fixture, gconstpointer data) {
    +test_purple_protocol_xfer_can_receive_func(void) {
    TestPurpleProtocolXfer *xfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL);
    PurpleAccount *a = purple_account_new("testing", "testing");
    PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
    @@ -121,25 +113,46 @@
    g_assert_true(actual);
    }
    +static void
    +test_purple_protocol_xfer_new_func(void) {
    + TestPurpleProtocolXfer *prplxfer = g_object_new(test_purple_protocol_xfer_get_type(), NULL);
    + PurpleAccount *a = purple_account_new("testing", "testing");
    + PurpleConnection *c = g_object_new(PURPLE_TYPE_CONNECTION, "account", a, NULL);
    + PurpleXfer *xfer = NULL;
    +
    + xfer = purple_protocol_xfer_new_xfer(PURPLE_PROTOCOL_XFER(prplxfer), c, "foo");
    + g_assert_true(PURPLE_IS_XFER(xfer));
    + g_assert_cmpstr("foo", ==, purple_xfer_get_remote_user(xfer));
    +}
    +
    /******************************************************************************
    * Main
    *****************************************************************************/
    gint
    main(gint argc, gchar **argv) {
    + gint res = 0;
    +
    g_test_init(&argc, &argv, NULL);
    #if GLIB_CHECK_VERSION(2, 38, 0)
    g_test_set_nonfatal_assertions();
    #endif /* GLIB_CHECK_VERSION(2, 38, 0) */
    - g_test_add(
    + test_ui_purple_init();
    +
    + g_test_add_func(
    "/protocol-xfer/can-receive",
    - TestPurpleProtocolXferFixture,
    - NULL,
    - test_purple_protocol_xfer_setup,
    - test_purple_protocol_xfer_can_receive_func,
    - NULL
    + test_purple_protocol_xfer_can_receive_func
    );
    - return g_test_run();
    + g_test_add_func(
    + "/protocol-xfer/new",
    + test_purple_protocol_xfer_new_func
    + );
    +
    + res = g_test_run();
    +
    + purple_core_quit();
    +
    + return res;
    }
    --- a/libpurple/xfer.c Sun Nov 26 01:30:28 2017 -0600
    +++ b/libpurple/xfer.c Sun Nov 26 02:15:23 2017 -0600
    @@ -2360,21 +2360,23 @@
    g_return_val_if_fail(who != NULL, NULL);
    protocol = purple_protocols_find(purple_account_get_protocol_id(account));
    -
    - g_return_val_if_fail(PURPLE_IS_PROTOCOL(protocol), NULL);
    -
    - if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, FACTORY_IFACE, xfer_new))
    - xfer = purple_protocol_factory_iface_xfer_new(protocol, account, type,
    - who);
    - else
    + if (PURPLE_IS_PROTOCOL_XFER(protocol)) {
    + PurpleConnection *connection = purple_account_get_connection(account);
    +
    + xfer = purple_protocol_xfer_new_xfer(
    + PURPLE_PROTOCOL_XFER(protocol),
    + connection,
    + /* TODO: this should support the type */
    + who
    + );
    + } else {
    xfer = g_object_new(PURPLE_TYPE_XFER,
    "account", account,
    "type", type,
    "remote-user", who,
    NULL
    );
    -
    - g_return_val_if_fail(xfer != NULL, NULL);
    + }
    return xfer;
    }