Changeset 3e6764a

Timestamp:

2008-06-21T23:34:11Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

98de2cc

Parents:

edc767b

Message:

Added jabber_util unittests (buddy_add/_by_jid only ATM).

Files:

• protocols/jabber/jabber_util.c (modified) (1 diff)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_jabber_sasl.c (modified) (1 diff)
• tests/check_jabber_util.c (added)

protocols/jabber/jabber_util.c

@@ -525 +525 @@
                    matches), removing it is simple. (And the hash reference
                    should be removed too!) */
-                if( bud->next == NULL && ( ( s == NULL || bud->resource == NULL ) || g_strcasecmp( bud->resource, s + 1 ) == 0 ) )
+                if( bud->next == NULL &&
+                    ( ( s == NULL && bud->resource == NULL ) ||
+                      ( bud->resource && s && g_strcasecmp( bud->resource, s + 1 ) == 0 ) ) )
                 {
                         g_hash_table_remove( jd->buddies, bud->bare_jid );

tests/Makefile

@@ -13 +13 @@
 main_objs = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o check_jabber_sasl.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o check_jabber_sasl.o check_jabber_util.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -69 +69 @@
 Suite *jabber_sasl_suite(void);
 
+/* From check_jabber_sasl.c */
+Suite *jabber_util_suite(void);
+
 int main (int argc, char **argv)
 {
@@ -115 +118 @@
         srunner_add_suite(sr, set_suite());
         srunner_add_suite(sr, jabber_sasl_suite());
+        srunner_add_suite(sr, jabber_util_suite());
         if (no_fork)
                 srunner_set_fork_status(sr, CK_NOFORK);

tests/check_jabber_sasl.c

@@ -5 +5 @@
 #include <string.h>
 #include <stdio.h>
-#include "arc.h"
 
 char *sasl_get_part( char *data, char *field );