Changeset 6ff651b for tests/check_irc.c


Ignore:
Timestamp:
2019-11-19T12:51:39Z (4 years ago)
Author:
Dima <dgoldin+github@…>
Branches:
master
Children:
b504415
Parents:
bcd8f52
Message:

Fixing tests for libcheck 0.13.0

Since libcheck 0.13 it's mandatory to wrap the unit-test code
in a block. This updates the tests to comply with this.

This fix is backwards compatible with libcheck 0.12.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/check_irc.c

    rbcd8f52 r6ff651b  
    99
    1010START_TEST(test_connect)
    11 GIOChannel * ch1, *ch2;
    12 irc_t *irc;
    13 char *raw;
    14 fail_unless(g_io_channel_pair(&ch1, &ch2));
     11{
     12    GIOChannel * ch1, *ch2;
     13    irc_t *irc;
     14    char *raw;
     15    fail_unless(g_io_channel_pair(&ch1, &ch2));
    1516
    16 irc = irc_new(g_io_channel_unix_get_fd(ch1));
     17    irc = irc_new(g_io_channel_unix_get_fd(ch1));
    1718
    18 irc_free(irc);
     19    irc_free(irc);
    1920
    20 fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
     21    fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
    2122
    22 fail_if(strcmp(raw, "") != 0);
     23    fail_if(strcmp(raw, "") != 0);
    2324
    24 g_free(raw);
     25    g_free(raw);
     26}
    2527END_TEST
    2628
    2729START_TEST(test_login)
    28 GIOChannel * ch1, *ch2;
    29 irc_t *irc;
    30 char *raw;
    31 fail_unless(g_io_channel_pair(&ch1, &ch2));
     30{
     31    GIOChannel * ch1, *ch2;
     32    irc_t *irc;
     33    char *raw;
     34    fail_unless(g_io_channel_pair(&ch1, &ch2));
    3235
    33 g_io_channel_set_flags(ch1, G_IO_FLAG_NONBLOCK, NULL);
    34 g_io_channel_set_flags(ch2, G_IO_FLAG_NONBLOCK, NULL);
     36    g_io_channel_set_flags(ch1, G_IO_FLAG_NONBLOCK, NULL);
     37    g_io_channel_set_flags(ch2, G_IO_FLAG_NONBLOCK, NULL);
    3538
    36 irc = irc_new(g_io_channel_unix_get_fd(ch1));
     39    irc = irc_new(g_io_channel_unix_get_fd(ch1));
    3740
    38 fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
    39                                      "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
    40 fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);
     41    fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
     42                "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
     43    fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);
    4144
    42 g_main_iteration(FALSE);
    43 irc_free(irc);
     45    g_main_iteration(FALSE);
     46    irc_free(irc);
    4447
    45 fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
     48    fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
    4649
    47 fail_unless(strstr(raw, "001") != NULL);
    48 fail_unless(strstr(raw, "002") != NULL);
    49 fail_unless(strstr(raw, "003") != NULL);
    50 fail_unless(strstr(raw, "004") != NULL);
    51 fail_unless(strstr(raw, "005") != NULL);
     50    fail_unless(strstr(raw, "001") != NULL);
     51    fail_unless(strstr(raw, "002") != NULL);
     52    fail_unless(strstr(raw, "003") != NULL);
     53    fail_unless(strstr(raw, "004") != NULL);
     54    fail_unless(strstr(raw, "005") != NULL);
    5255
    53 g_free(raw);
     56    g_free(raw);
     57}
    5458END_TEST
    5559
Note: See TracChangeset for help on using the changeset viewer.