Changeset 638feab for tests/check_jabber_util.c

Timestamp:

2010-03-18T14:38:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5605be9

Parents:

6ce01be (diff), 842cd8d (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:

Merging in Jabber resource selection fix. This adds the activity_timeout
setting, which makes BitlBee send a message to bare JIDs if there was no
recent seen activity from any of the person's resources. This should fix
most issues with messages going to the wrong resource (i.e. someone's
mobile phone instead of something more sensible).

File:

• tests/check_jabber_util.c (modified) (3 diffs)

tests/check_jabber_util.c

@@ -14 +14 @@
         
         budw1 = jabber_buddy_add( ic, "wilmer@gaast.net/BitlBee" );
-        budw1->last_act = time( NULL ) - 100;
+        budw1->last_msg = time( NULL ) - 100;
         budw2 = jabber_buddy_add( ic, "WILMER@gaast.net/Telepathy" );
         budw2->priority = 2;
-        budw2->last_act = time( NULL );
+        budw2->last_msg = time( NULL );
         budw3 = jabber_buddy_add( ic, "wilmer@GAAST.NET/bitlbee" );
-        budw3->last_act = time( NULL ) - 200;
+        budw3->last_msg = time( NULL ) - 200;
         budw3->priority = 4;
         /* TODO(wilmer): Shouldn't this just return budw3? */
@@ -60 +60 @@
         fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/Telepathy" ) );
         fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/telepathy" ) );
-        fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 );
+        
+        /* Test activity_timeout and GET_BUDDY_BARE_OK. */
+        fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) == budw1 );
+        budw1->last_msg -= 50;
+        fail_unless( ( bud = jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) ) != NULL );
+        fail_unless( strcmp( bud->full_jid, "wilmer@gaast.net" ) == 0 );
         
         fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) );
         fail_unless( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) == budw1 );
         
+        fail_if( jabber_buddy_remove( ic, "wilmer@gaast.net" ) );
+        fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/bitlbee" ) );
+        fail_unless( jabber_buddy_remove( ic, "wilmer@gaast.net/BitlBee" ) );
+        fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", GET_BUDDY_BARE_OK ) );
+        
         /* Check if remove_bare() indeed gets rid of all. */
+        /* disable this one for now.
         fail_unless( jabber_buddy_remove_bare( ic, "wilmer@gaast.net" ) );
         fail_if( jabber_buddy_by_jid( ic, "wilmer@gaast.net", 0 ) );
+        */
 
         fail_if( jabber_buddy_remove( ic, "nekkid@lamejab.net/Illegal" ) );
         fail_unless( jabber_buddy_remove( ic, "nekkid@lamejab.net" ) );
         fail_if( jabber_buddy_by_jid( ic, "nekkid@lamejab.net", 0 ) );
+        
+        /* Fixing a bug in this branch that caused information to get lost when
+           removing the first full JID from a list. */
+        jabber_buddy_add( ic, "bugtest@google.com/A" );
+        jabber_buddy_add( ic, "bugtest@google.com/B" );
+        jabber_buddy_add( ic, "bugtest@google.com/C" );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/A" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/B" ) );
+        fail_unless( jabber_buddy_remove( ic, "bugtest@google.com/C" ) );
 }
 
@@ -85 +106 @@
         jd->buddies = g_hash_table_new( g_str_hash, g_str_equal );
         set_add( &ic->acc->set, "resource_select", "priority", NULL, ic->acc );
+        set_add( &ic->acc->set, "activity_timeout", "120", NULL, ic->acc );
         
         suite_add_tcase (s, tc_core);