Revision 0ac7cc2a check-qstring.c

b/check-qstring.c
20 20
 * (with some violations to access 'private' data)
21 21
 */
22 22

  
23
START_TEST(qstring_from_str_test)
23
static void qstring_from_str_test(void)
24 24
{
25 25
    QString *qstring;
26 26
    const char *str = "QEMU";
27 27

  
28 28
    qstring = qstring_from_str(str);
29
    fail_unless(qstring != NULL);
30
    fail_unless(qstring->base.refcnt == 1);
31
    fail_unless(strcmp(str, qstring->string) == 0);
32
    fail_unless(qobject_type(QOBJECT(qstring)) == QTYPE_QSTRING);
29
    g_assert(qstring != NULL);
30
    g_assert(qstring->base.refcnt == 1);
31
    g_assert(strcmp(str, qstring->string) == 0);
32
    g_assert(qobject_type(QOBJECT(qstring)) == QTYPE_QSTRING);
33 33

  
34 34
    // destroy doesn't exit yet
35 35
    g_free(qstring->string);
36 36
    g_free(qstring);
37 37
}
38
END_TEST
39 38

  
40
START_TEST(qstring_destroy_test)
39
static void qstring_destroy_test(void)
41 40
{
42 41
    QString *qstring = qstring_from_str("destroy test");
43 42
    QDECREF(qstring);
44 43
}
45
END_TEST
46 44

  
47
START_TEST(qstring_get_str_test)
45
static void qstring_get_str_test(void)
48 46
{
49 47
    QString *qstring;
50 48
    const char *ret_str;
......
52 50

  
53 51
    qstring = qstring_from_str(str);
54 52
    ret_str = qstring_get_str(qstring);
55
    fail_unless(strcmp(ret_str, str) == 0);
53
    g_assert(strcmp(ret_str, str) == 0);
56 54

  
57 55
    QDECREF(qstring);
58 56
}
59
END_TEST
60 57

  
61
START_TEST(qstring_append_chr_test)
58
static void qstring_append_chr_test(void)
62 59
{
63 60
    int i;
64 61
    QString *qstring;
......
69 66
    for (i = 0; str[i]; i++)
70 67
        qstring_append_chr(qstring, str[i]);
71 68

  
72
    fail_unless(strcmp(str, qstring_get_str(qstring)) == 0);
69
    g_assert(strcmp(str, qstring_get_str(qstring)) == 0);
73 70
    QDECREF(qstring);
74 71
}
75
END_TEST
76 72

  
77
START_TEST(qstring_from_substr_test)
73
static void qstring_from_substr_test(void)
78 74
{
79 75
    QString *qs;
80 76

  
81 77
    qs = qstring_from_substr("virtualization", 3, 9);
82
    fail_unless(qs != NULL);
83
    fail_unless(strcmp(qstring_get_str(qs), "tualiza") == 0);
78
    g_assert(qs != NULL);
79
    g_assert(strcmp(qstring_get_str(qs), "tualiza") == 0);
84 80

  
85 81
    QDECREF(qs);
86 82
}
87
END_TEST
88 83

  
89 84

  
90
START_TEST(qobject_to_qstring_test)
85
static void qobject_to_qstring_test(void)
91 86
{
92 87
    QString *qstring;
93 88

  
94 89
    qstring = qstring_from_str("foo");
95
    fail_unless(qobject_to_qstring(QOBJECT(qstring)) == qstring);
90
    g_assert(qobject_to_qstring(QOBJECT(qstring)) == qstring);
96 91

  
97 92
    QDECREF(qstring);
98 93
}
99
END_TEST
100 94

  
101
static Suite *qstring_suite(void)
95
int main(int argc, char **argv)
102 96
{
103
    Suite *s;
104
    TCase *qstring_public_tcase;
97
    g_test_init(&argc, &argv, NULL);
105 98

  
106
    s = suite_create("QString test-suite");
99
    g_test_add_func("/public/from_str", qstring_from_str_test);
100
    g_test_add_func("/public/destroy", qstring_destroy_test);
101
    g_test_add_func("/public/get_str", qstring_get_str_test);
102
    g_test_add_func("/public/append_chr", qstring_append_chr_test);
103
    g_test_add_func("/public/from_substr", qstring_from_substr_test);
104
    g_test_add_func("/public/to_qstring", qobject_to_qstring_test);
107 105

  
108
    qstring_public_tcase = tcase_create("Public Interface");
109
    suite_add_tcase(s, qstring_public_tcase);
110
    tcase_add_test(qstring_public_tcase, qstring_from_str_test);
111
    tcase_add_test(qstring_public_tcase, qstring_destroy_test);
112
    tcase_add_test(qstring_public_tcase, qstring_get_str_test);
113
    tcase_add_test(qstring_public_tcase, qstring_append_chr_test);
114
    tcase_add_test(qstring_public_tcase, qstring_from_substr_test);
115
    tcase_add_test(qstring_public_tcase, qobject_to_qstring_test);
116

  
117
    return s;
118
}
119

  
120
int main(void)
121
{
122
	int nf;
123
	Suite *s;
124
	SRunner *sr;
125

  
126
	s = qstring_suite();
127
	sr = srunner_create(s);
128

  
129
	srunner_run_all(sr, CK_NORMAL);
130
	nf = srunner_ntests_failed(sr);
131
	srunner_free(sr);
132

  
133
	return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
106
    return g_test_run();
134 107
}

Also available in: Unified diff