Changeset b79308b for tests

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

Location:

tests

Files:

• Makefile (modified) (1 diff)
• check.c (modified) (2 diffs)
• check_arc.c (modified) (6 diffs)
• check_help.c (modified) (2 diffs)
• check_irc.c (modified) (1 diff)
• check_jabber_sasl.c (added)

tests/Makefile

@@ -11 +11 @@
 distclean: clean
 
-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 
+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
+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: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -66 +66 @@
 Suite *set_suite(void);
 
+/* From check_jabber_sasl.c */
+Suite *jabber_sasl_suite(void);
+
 int main (int argc, char **argv)
 {
@@ -111 +114 @@
         srunner_add_suite(sr, crypting_suite());
         srunner_add_suite(sr, set_suite());
+        srunner_add_suite(sr, jabber_sasl_suite());
         if (no_fork)
                 srunner_set_fork_status(sr, CK_NOFORK);

tests/check_arc.c

@@ -7 +7 @@
 #include "arc.h"
 
-char *password = "TotT";
+char *password = "ArcVier";
 
 char *clear_tests[] =
@@ -14 +14 @@
         "ItllBeBitlBee",
         "One more boring password",
+        "Hoi hoi",
         NULL
 };
@@ -28 +29 @@
                 int len;
                 
-                len = arc_encode( clear_tests[i], 0, &crypted, password );
+                len = arc_encode( clear_tests[i], 0, &crypted, password, 12 );
                 len = arc_decode( crypted, len, &decrypted, password );
                 
@@ -41 +42 @@
 struct
 {
-        unsigned char crypted[24];
+        unsigned char crypted[30];
         int len;
         char *decrypted;
 } decrypt_tests[] = {
+        /* One block with padding. */
         {
                 {
-                        0xc3, 0x0d, 0x43, 0xc3, 0xee, 0x80, 0xe2, 0x8c, 0x0b, 0x29, 0x32, 0x7e,
-                        0x38, 0x05, 0x82, 0x10, 0x21, 0x1c, 0x4a, 0x00, 0x2c
-                }, 21, "Debugging sucks"
+                        0x3f, 0x79, 0xb0, 0xf5, 0x91, 0x56, 0xd2, 0x1b, 0xd1, 0x4b, 0x67, 0xac,
+                        0xb1, 0x31, 0xc9, 0xdb, 0xf9, 0xaa
+                }, 18, "short pass"
         },
+        
+        /* Two blocks with padding. */
         {
                 {
-                        0xb0, 0x00, 0x57, 0x0d, 0x0d, 0x0d, 0x70, 0xe1, 0xc0, 0x00, 0xa4, 0x25,
-                        0x7d, 0xbe, 0x03, 0xcc, 0x24, 0xd1, 0x0c
-                }, 19, "Testing rocks"
+                        0xf9, 0xa6, 0xec, 0x5d, 0xc7, 0x06, 0xb8, 0x6b, 0x63, 0x9f, 0x2d, 0xb5,
+                        0x7d, 0xaa, 0x32, 0xbb, 0xd8, 0x08, 0xfd, 0x81, 0x2e, 0xca, 0xb4, 0xd7,
+                        0x2f, 0x36, 0x9c, 0xac, 0xa0, 0xbc
+                }, 30, "longer password"
         },
+
+        /* This string is exactly two "blocks" long, to make sure unpadded strings also decrypt
+           properly. */
         {
                 {
-                        0xb6, 0x92, 0x59, 0xe4, 0xf9, 0xc1, 0x7a, 0xf6, 0xf3, 0x18, 0xea, 0x28,
-                        0x73, 0x6d, 0xb3, 0x0a, 0x6f, 0x0a, 0x2b, 0x43, 0x57, 0xe9, 0x3e, 0x63
-                }, 24, "OSCAR is creepy..."
-        }
+                        0x95, 0x4d, 0xcf, 0x4d, 0x5e, 0x6c, 0xcf, 0xef, 0xb9, 0x80, 0x00, 0xef,
+                        0x25, 0xe9, 0x17, 0xf6, 0x29, 0x6a, 0x82, 0x79, 0x1c, 0xca, 0x68, 0xb5,
+                        0x4e, 0xd0, 0xc1, 0x41, 0x8e, 0xe6
+                }, 30, "OSCAR is really creepy.."
+        },
+        { "", 0, NULL }
 };
 
@@ -69 +79 @@
         int i;
         
-        for( i = 0; clear_tests[i]; i++ )
+        for( i = 0; decrypt_tests[i].len; i++ )
         {
                 tcase_fn_start (decrypt_tests[i].decrypted, __FILE__, __LINE__);
@@ -79 +89 @@
                 
                 fail_if( strcmp( decrypt_tests[i].decrypted, decrypted ) != 0,
-                         "%s didn't decrypt properly", clear_tests[i] );
+                         "`%s' didn't decrypt properly", decrypt_tests[i].decrypted );
                 
                 g_free( decrypted );

tests/check_help.c

@@ -7 +7 @@
 #include "help.h"
 
-START_TEST(test_help_none)
+START_TEST(test_help_initfree)
         help_t *h, *r;
         r = help_init(&h, "/dev/null");
         fail_if(r == NULL);
         fail_if(r != h);
+        
+        help_free(&h);
+        fail_if(h != NULL);
 END_TEST
 
@@ -25 +28 @@
         TCase *tc_core = tcase_create("Core");
         suite_add_tcase (s, tc_core);
-        tcase_add_test (tc_core, test_help_none);
+        tcase_add_test (tc_core, test_help_initfree);
         tcase_add_test (tc_core, test_help_nonexistent);
         return s;

tests/check_irc.c

@@ -37 +37 @@
         irc = irc_new(g_io_channel_unix_get_fd(ch1));
 
-        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\n"
-                        "USER a a a a\r\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
+        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
+                        "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
         fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);