Changeset 1fc2958

Timestamp:

2006-06-16T12:07:51Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

125b35d

Parents:

c2fa827

Message:

Add checks for nick functions as well, fix bug where nick lengths weren't
being honored.

Files:

• nick.c (modified) (2 diffs)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_nick.c (added)
• tests/check_util.c (modified) (2 diffs)

nick.c

@@ -163 +163 @@
         int i, j;
         
-        for( i = j = 0; nick[i] && i < MAX_NICK_LENGTH; i++ )
+        for( i = j = 0; nick[i] && j < MAX_NICK_LENGTH; i++ )
         {
                 if( strchr( nick_lc_chars, nick[i] ) || 
@@ -172 +172 @@
                 }
         }
-        while( j < MAX_NICK_LENGTH )
+        while( j <= MAX_NICK_LENGTH )
                 nick[j++] = '\0';
 }

tests/Makefile

@@ -6 +6 @@
         ./check
 
-check: check.o check_util.o ../util.o
+main_objs = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o url.o user.o util.o 
+
+check: check.o check_util.o check_nick.o $(addprefix ../, $(main_objs)) ../protocols/protocols.o
         @echo '*' Linking $@
         @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)

tests/check.c

@@ -3 +3 @@
 #include <gmodule.h>
 #include <check.h>
+#include "bitlbee.h"
+
+global_t global;        /* Against global namespace pollution */
+
+double gettime()
+{
+        struct timeval time[1];
+
+        gettimeofday( time, 0 );
+        return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
+}
 
 /* From check_util.c */
 Suite *util_suite(void);
+
+/* From check_nick.c */
+Suite *nick_suite(void);
 
 int main (void)
@@ -11 +25 @@
         int nf;
         SRunner *sr = srunner_create(util_suite());
+        srunner_add_suite(sr, nick_suite());
         srunner_run_all (sr, CK_NORMAL);
         nf = srunner_ntests_failed(sr);

tests/check_util.c

@@ -25 +25 @@
 END_TEST
 
+START_TEST(test_strip_newlines)
+{
+        int i;
+        const char *get[] = { "Test", "Test\r\n", "Test\nX\n", NULL };
+        const char *expected[] = { "Test", "Test  ", "Test X ", NULL };
+
+        for (i = 0; get[i]; i++) {
+                char copy[20], *ret;
+                strcpy(copy, get[i]);
+                ret = strip_newlines(copy);
+                fail_unless (strcmp(copy, expected[i]) == 0, 
+                                         "(%d) strip_newlines broken: %s -> %s (expected: %s)", 
+                                         i, get[i], copy, expected[i]);
+                fail_unless (copy == ret, "Original string not returned"); 
+        }
+}
+END_TEST
+
 Suite *util_suite (void)
 {
@@ -31 +49 @@
         suite_add_tcase (s, tc_core);
         tcase_add_test (tc_core, test_strip_linefeed);
+        tcase_add_test (tc_core, test_strip_newlines);
         return s;
 }