xmpp4r 0.3.1 → 0.3.2

data/test/muc/tc_muc_simplemucclient.rb

@@ -6,6 +6,7 @@ $:.unshift File::dirname(__FILE__) + '/../../lib'
 require 'test/unit'
 require File::dirname(__FILE__) + '/../lib/clienttester'
 require 'xmpp4r/muc'
+require 'xmpp4r/semaphore'
 include Jabber
 
 class SimpleMUCClientTest < Test::Unit::TestCase
@@ -23,8 +24,8 @@ class SimpleMUCClientTest < Test::Unit::TestCase
     m = MUC::SimpleMUCClient.new(@client)
 
     block_args = []
-    wait = Mutex.new
-    block = lambda { |*a| block_args = a; wait.unlock }
+    wait = Semaphore.new
+    block = lambda { |*a| block_args = a; wait.run }
     m.on_room_message(&block)
     m.on_message(&block)
     m.on_private_message(&block)
@@ -49,6 +50,7 @@ class SimpleMUCClientTest < Test::Unit::TestCase
     }
     m.my_jid = 'hag66@shakespeare.lit/pda'
     assert_equal(m, m.join('darkcave@macbeth.shakespeare.lit/thirdwitch'))
+    wait_state
     assert(m.active?)
     assert_equal(3, m.roster.size)
 
@@ -62,9 +64,10 @@ class SimpleMUCClientTest < Test::Unit::TestCase
       send(msg.set_from('darkcave@macbeth.shakespeare.lit/thirdwitch').set_to('hag66@shakespeare.lit/pda'))
     }
     assert_nil(m.subject)
-    wait.lock
+    wait.wait
     m.subject = 'TestCasing room'
-    wait.lock
+    wait_state
+    wait.wait
     assert_equal([nil, 'thirdwitch', 'TestCasing room'], block_args)
     assert_equal('TestCasing room', m.subject)
   end

data/test/muc/tc_mucowner.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/ruby
+
+$:.unshift '../lib'
+
+require 'test/unit'
+require 'xmpp4r'
+require 'xmpp4r/muc'
+include Jabber
+
+class MUCOwnerTest < Test::Unit::TestCase
+  def test_parse
+    s = <<EOF
+<iq from='darkcave@macbeth.shakespeare.lit'
+    id='config1'
+    to='crone1@shakespeare.lit/desktop'
+    type='result'>
+  <query xmlns='http://jabber.org/protocol/muc#owner'>
+    <x xmlns='jabber:x:data' type='form'>
+      <title>Configuration for "darkcave" Room</title>
+      <instructions>
+        Complete this form to make changes to
+        the configuration of your room.
+      </instructions>
+      <field
+          type='hidden'
+          var='FORM_TYPE'>
+        <value>http://jabber.org/protocol/muc#roomconfig</value>
+      </field>
+      <field
+          label='Natural-Language Room Name'
+          type='text-single'
+          var='muc#roomconfig_roomname'>
+        <value>A Dark Cave</value>
+      </field>
+    </x>
+  </query>
+</iq>
+EOF
+    iq = Iq::import(REXML::Document.new(s).root)
+
+    assert_kind_of(Iq, iq)
+    assert_kind_of(MUC::IqQueryMUCOwner, iq.query)
+    assert_kind_of(Dataforms::XData, iq.query.x)
+    assert_kind_of(Dataforms::XData, iq.query.x('jabber:x:data'))
+    assert_kind_of(Dataforms::XData, iq.query.x(Dataforms::XData))
+
+    assert_equal(1, iq.query.x.fields.size)
+    assert_equal('Natural-Language Room Name', iq.query.x.fields[0].label)
+  end
+end

data/test/pubsub/tc_helper.rb

@@ -0,0 +1,227 @@
+#!/usr/bin/ruby
+
+$:.unshift File::dirname(__FILE__) + '/../../lib'
+
+require 'test/unit'
+require File::dirname(__FILE__) + '/../lib/clienttester'
+
+require 'xmpp4r'
+require 'xmpp4r/pubsub/helper/servicehelper'
+include Jabber
+
+
+class PubSub::ServiceHelperTest < Test::Unit::TestCase
+  include ClientTester
+
+  def test_create
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+    assert_kind_of(PubSub::ServiceHelper, h)
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:set, iq.type)
+      assert_equal(1, iq.children.size)
+      assert_equal('http://jabber.org/protocol/pubsub', iq.pubsub.namespace)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('create', iq.pubsub.children.first.name)
+      assert_equal('mynode', iq.pubsub.children.first.attributes['node'])
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+              <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+                <create node='#{iq.pubsub.children.first.attributes['node']}'/>
+              </pubsub>
+            </iq>")
+    }
+    assert_equal('mynode', h.create('mynode'))
+    wait_state
+  end
+
+  def test_delete
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:set, iq.type)
+      assert_equal(1, iq.children.size)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('delete', iq.pubsub.children.first.name)
+      assert_equal('mynode', iq.pubsub.children.first.attributes['node'])
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>")
+    }
+    h.delete('mynode')
+    wait_state
+  end
+
+  def test_publish
+    item1 = Jabber::PubSub::Item.new
+    item1.text = 'foobar'
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:set, iq.type)
+      assert_equal(1, iq.children.size)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('publish', iq.pubsub.children[0].name)
+      assert_equal(1, iq.pubsub.children[0].children.size)
+      assert_equal('item', iq.pubsub.children[0].children[0].name)
+      assert_nil(iq.pubsub.children[0].children[0].attributes['id'])
+      assert_equal(1, iq.pubsub.children[0].children[0].children.size)
+      assert_equal(item1.children.to_s, iq.pubsub.children[0].children[0].children[0].to_s)
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'/>")
+    }
+    h.publish('mynode', item1)
+    wait_state
+  end
+
+  def test_items
+    item1 = Jabber::PubSub::Item.new("1")
+    item1.text = 'foobar'
+    item2 = Jabber::PubSub::Item.new("2")
+    item2.text = 'barfoo'
+
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('items', iq.pubsub.children.first.name)
+      assert_equal('mynode', iq.pubsub.children.first.attributes['node'])
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+              <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+                <items node='mynode'>
+                  #{item1.to_s}
+                  #{item2.to_s}
+                </items>
+              </pubsub>
+            </iq>")
+    }
+
+    items = h.items('mynode')
+    assert_equal(2, items.size)
+    assert_kind_of(REXML::Text, items['1'])
+    assert_kind_of(REXML::Text, items['2'])
+    assert_equal(item1.children.to_s, items['1'].to_s)
+    assert_equal(item2.children.to_s, items['2'].to_s)
+    wait_state
+  end
+
+  def test_affiliations
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('affiliations', iq.pubsub.children.first.name)
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+              <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+               <affiliations>
+                  <affiliation node='node1' affiliation='owner'/>
+                  <affiliation node='node2' affiliation='publisher'/>
+                  <affiliation node='node5' affiliation='outcast'/>
+                  <affiliation node='node6' affiliation='owner'/>
+                </affiliations>
+              </pubsub>
+            </iq>")
+    }
+
+    a = h.affiliations
+    assert_kind_of(Hash, a)
+    assert_equal(4, a.size)
+    assert_equal(:owner, a['node1'])
+    assert_equal(:publisher, a['node2'])
+    assert_equal(:outcast, a['node5'])
+    assert_equal(:owner, a['node6'])
+    wait_state
+  end
+
+  def test_subscriptions
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('subscriptions', iq.pubsub.children.first.name)
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+              <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
+                <subscriptions node='princely_musings'>
+                  <subscription jid='hamlet@denmark.lit' subscription='subscribed'/>
+                  <subscription jid='polonius@denmark.lit' subscription='unconfigured'/>
+                  <subscription jid='bernardo@denmark.lit' subscription='subscribed' subid='123-abc'/>
+                  <subscription jid='bernardo@denmark.lit' subscription='subscribed' subid='004-yyy'/>
+                </subscriptions>
+              </pubsub>
+            </iq>")
+    }
+
+    s = h.subscriptions('mynode')
+    assert_kind_of(Array,s)
+    assert_equal(4,s.size)
+    assert_kind_of(REXML::Element,s[0])
+    assert_kind_of(REXML::Element,s[1])
+    assert_kind_of(REXML::Element,s[2])
+    assert_kind_of(REXML::Element,s[3])
+    wait_state
+  end
+
+  def test_get_all_subscriptions
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('subscriptions', iq.pubsub.children.first.name)
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+            <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+	        <subscriptions>
+		  <subscription node='node1' jid='francisco@denmark.lit' subscription='subscribed'/>
+		  <subscription node='node2' jid='francisco@denmark.lit' subscription='subscribed'/>
+		  <subscription node='node5' jid='francisco@denmark.lit' subscription='unconfigured'/>
+		  <subscription node='node6' jid='francisco@denmark.lit' subscription='pending'/>
+		</subscriptions>
+	     </pubsub>
+	     </iq>")
+    }
+
+    s = h.subscriptions
+    assert_kind_of(Array,s)
+    assert_equal(4,s.size)
+    assert_kind_of(REXML::Element,s[0])
+    assert_kind_of(REXML::Element,s[1])
+    assert_kind_of(REXML::Element,s[2])
+    assert_kind_of(REXML::Element,s[3])
+    wait_state
+  end
+
+  def test_subscribers
+    h = PubSub::ServiceHelper.new(@client,'pubsub.example.org')
+
+    state { |iq|
+      assert_kind_of(Jabber::Iq, iq)
+      assert_equal(:get, iq.type)
+      assert_equal(1, iq.pubsub.children.size)
+      assert_equal('subscriptions', iq.pubsub.children.first.name)
+      send("<iq type='result' to='#{iq.from}' from='#{iq.to}' id='#{iq.id}'>
+            <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+	        <subscriptions node='princely_musings'>
+		  <subscription jid='peter@denmark.lit' subscription='subscribed'/>
+		  <subscription jid='frank@denmark.lit' subscription='subscribed'/>
+		  <subscription jid='albrecht@denmark.lit' subscription='unconfigured'/>
+		  <subscription jid='hugo@denmark.lit' subscription='pending'/>
+		</subscriptions>
+	     </pubsub>
+	     </iq>")
+    }
+
+    s = h.subscribers('princely_musings')
+    assert_equal(4,s.size)
+    assert_kind_of(String,s[0])
+    assert_kind_of(String,s[1])
+    assert_kind_of(String,s[2])
+    assert_kind_of(String,s[3])
+    wait_state
+  end
+end

data/test/roster/tc_helper.rb

@@ -7,6 +7,7 @@ require File::dirname(__FILE__) + '/../lib/clienttester'
 
 require 'xmpp4r'
 require 'xmpp4r/roster/helper/roster'
+require 'xmpp4r/semaphore'
 include Jabber
 
 class Roster::HelperTest < Test::Unit::TestCase
@@ -29,14 +30,13 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
+    query_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
     h.add_query_callback { |iq|
-      query_waiter.unlock
+      query_waiter.run
     }
     wait_state
-    query_waiter.lock
+    query_waiter.wait
 
     assert_equal([nil], h.groups)
     jids = h.find_by_group(nil).collect { |item| item.jid }.sort
@@ -73,12 +73,11 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
+    query_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
-    h.add_query_callback { |iq| query_waiter.unlock }
+    h.add_query_callback { |iq| query_waiter.run }
     wait_state
-    query_waiter.lock
+    query_waiter.wait
 
     assert_equal([], h.groups)
     assert_nil(h['a@b.c'])
@@ -88,7 +87,7 @@ class Roster::HelperTest < Test::Unit::TestCase
               <item jid='a@b.c'/>
             </query>
           </iq>")
-    query_waiter.lock
+    query_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, h['a@b.c'])
     assert_equal(JID.new('a@b.c'), h['a@b.c'].jid)
@@ -101,7 +100,7 @@ class Roster::HelperTest < Test::Unit::TestCase
               <item jid='a@b.c' subscription='from' name='ABC' ask='subscribe'/>
             </query>
           </iq>")
-    query_waiter.lock
+    query_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, h['a@b.c'])
     assert_equal(JID.new('a@b.c'), h['a@b.c'].jid)
@@ -114,7 +113,7 @@ class Roster::HelperTest < Test::Unit::TestCase
               <item jid='a@b.c'/>
             </query>
           </iq>")
-    query_waiter.lock
+    query_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, h['a@b.c'])
     assert_equal(JID.new('a@b.c'), h['a@b.c'].jid)
@@ -127,7 +126,7 @@ class Roster::HelperTest < Test::Unit::TestCase
               <item jid='a@b.c' subscription='remove'/>
             </query>
           </iq>")
-    query_waiter.lock
+    query_waiter.wait
 
     assert_nil(h['a@b.c'])
   end
@@ -141,22 +140,25 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
-    presence_waiter = Mutex.new
-    presence_waiter.lock
+    query_waiter = Semaphore.new
+    presence_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
     h.add_query_callback { |iq|
-      query_waiter.unlock
+      query_waiter.run
     }
     cb_item, cb_op, cb_p = nil, nil, nil
     h.add_presence_callback { |item,oldpres,pres|
+      # HACK:
+      # if two stanzas are expected for one sent stanza,
+      # race conditions may appear here
+      Thread.pass
+
       cb_item, cb_op, cb_p = item, oldpres, pres
-      presence_waiter.unlock
+      presence_waiter.run
     }
 
     wait_state
-    query_waiter.lock
+    query_waiter.wait
 
     assert_equal(false, h['a@b.c'].online?)
     presences = 0
@@ -164,7 +166,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(0, presences)
 
     send("<presence from='a@b.c/r'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_nil(cb_op)
@@ -176,7 +178,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(1, presences)
 
     send("<presence from='a@b.c/r2'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_nil(cb_op)
@@ -188,7 +190,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(2, presences)
 
     send("<presence from='a@b.c/r'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_kind_of(Presence, cb_op)
@@ -201,7 +203,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(2, presences)
 
     send("<presence from='a@b.c/r' type='error'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_kind_of(Presence, cb_op)
@@ -214,7 +216,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(2, presences)
 
     send("<presence from='a@b.c/r2' type='unavailable'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_kind_of(Presence, cb_op)
@@ -227,7 +229,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(2, presences)
 
     send("<presence from='a@b.c/r'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_kind_of(Presence, cb_op)
@@ -240,7 +242,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(2, presences)
 
     send("<presence from='a@b.c/r2'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_kind_of(Presence, cb_op)
@@ -254,7 +256,7 @@ class Roster::HelperTest < Test::Unit::TestCase
 
     send("<presence from='a@b.c' type='error'/>")
     2.times {
-      presence_waiter.lock
+      presence_waiter.wait
 
       assert_kind_of(Roster::Helper::RosterItem, cb_item)
       assert_kind_of(Presence, cb_op)
@@ -267,7 +269,7 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(1, presences)
 
     send("<presence from='a@b.c/r'/>")
-    presence_waiter.lock
+    presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
     assert_nil(cb_op)
@@ -286,12 +288,11 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
+    query_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
-    h.add_query_callback { |iq| query_waiter.unlock }
+    h.add_query_callback { |iq| query_waiter.run }
     wait_state
-    query_waiter.lock
+    query_waiter.wait
 
     state { |iq|
       assert_kind_of(Iq, iq)
@@ -309,10 +310,11 @@ class Roster::HelperTest < Test::Unit::TestCase
       assert_kind_of(Presence, pres)
       assert_equal(:subscribe, pres.type)
       assert_equal(JID.new('contact@example.org'), pres.to)
+      Thread.pass
     }
     h.add('contact@example.org', 'MyContact', true)
     wait_state
-    query_waiter.lock
+    query_waiter.wait
     wait_state
   end
 
@@ -323,25 +325,33 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
+    query_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
-    h.add_query_callback { |iq| query_waiter.unlock }
+    h.add_query_callback { |iq| query_waiter.run }
     wait_state
-    query_waiter.lock
+    query_waiter.wait
+
+    state { |pres|
+      assert_kind_of(Presence, pres)
+      assert_equal(:subscribed, pres.type)
+    }
+    state { |iq|
+      assert_kind_of(Iq, iq)
+      assert_equal(:set, iq.type)
+      send("<iq type='result' id='#{iq.id}'/>")
+    }
 
-    cb_lock = Mutex.new
-    cb_lock.lock
+    cb_lock = Semaphore.new
     h.add_subscription_request_callback { |item,pres|
       assert_nil(item)
       assert_kind_of(Presence, pres)
       h.accept_subscription(pres.from)
-
-      cb_lock.unlock
+      cb_lock.run
     }
-
     send("<presence type='subscribe' from='contact@example.org' to='user@example.com'/>")
-    cb_lock.lock
+    skip_state
+    wait_state
+    cb_lock.wait
 
     state { |pres|
       assert_kind_of(Presence, pres)
@@ -358,32 +368,148 @@ class Roster::HelperTest < Test::Unit::TestCase
             </iq>")
     }
 
-    query_waiter = Mutex.new
-    query_waiter.lock
+    query_waiter = Semaphore.new
     h = Roster::Helper::new(@client)
-    h.add_query_callback { |iq| query_waiter.unlock }
+    h.add_query_callback { |iq| query_waiter.run }
     wait_state
-    query_waiter.lock
+    query_waiter.wait
 
-    cb_lock = Mutex.new
-    cb_lock.lock
+    state { |pres|
+      assert_kind_of(Presence, pres)
+      assert_equal(:unsubscribed, pres.type)
+      assert_equal(JID.new('contact@example.org'), pres.to)
+    }
+    cb_lock = Semaphore.new
     h.add_subscription_request_callback { |item,pres|
       assert_nil(item)
       assert_kind_of(Presence, pres)
       h.decline_subscription(pres.from)
 
-      cb_lock.unlock
+      cb_lock.run
     }
 
     send("<presence type='subscribe' from='contact@example.org' to='user@example.com'/>")
-    cb_lock.lock
+    wait_state
+    cb_lock.wait
+  end
 
-    state { |pres|
-      assert_kind_of(Presence, pres)
-      assert_equal(:unsubscribed, pres.type)
-      assert_equal(JID.new('contact@example.org'), pres.to)
+  def test_groupset
+    state { |iq|
+      send("<iq type='result'>
+              <query xmlns='jabber:iq:roster'>
+                <item jid='test@test' subscription='both'>
+                  <group>One</group>
+                  <group>Two</group>
+                </item>
+              </query>
+            </iq>")
+    }
+
+    query_waiter = Semaphore.new
+    h = Roster::Helper.new(@client)
+    h.add_query_callback { query_waiter.run }
+    wait_state
+    query_waiter.wait
+
+    assert_equal(1, h.items.size)
+    assert_equal(%w(One Two).sort, h['test@test'].groups.sort)
+
+    state { |iq|
+      send("<iq type='result' id='#{iq.id}'>#{iq.query}</iq>")
+    }
+    h['test@test'].groups = %w(One Two Three)
+    h['test@test'].send
+    wait_state
+    query_waiter.wait
+    assert_equal(%w(One Two Three).sort, h['test@test'].groups.sort)
+  end
+
+  def test_nameset
+    state { |iq|
+      send("<iq type='result'>
+              <query xmlns='jabber:iq:roster'>
+                <item jid='test@test' subscription='both'/>
+              </query>
+            </iq>")
+    }
+
+    query_waiter = Semaphore.new
+    h = Roster::Helper.new(@client)
+    h.add_query_callback { query_waiter.run }
+    wait_state
+    query_waiter.wait
+
+    assert_equal(1, h.items.size)
+    assert_nil(h['test@test'].iname)
+
+    state { |iq|
+      send("<iq type='result' id='#{iq.id}'>#{iq.query}</iq>")
     }
+    h['test@test'].iname = 'Unknown'
+    h['test@test'].send
     wait_state
+    query_waiter.wait
+    assert_equal('Unknown', h['test@test'].iname)
+
+    state { |iq|
+      send("<iq type='result' id='#{iq.id}'>#{iq.query}</iq>")
+    }
+    h['test@test'].iname = 'Known'
+    h['test@test'].send
+    wait_state
+    query_waiter.wait
+    assert_equal('Known', h['test@test'].iname)
+
+    state { |iq|
+      send("<iq type='result' id='#{iq.id}'>#{iq.query}</iq>")
+    }
+    h['test@test'].iname = nil
+    h['test@test'].send
+    wait_state
+    query_waiter.wait
+    assert_nil(h['test@test'].iname)
+  end
+
+  def test_update_callback
+    update_args = nil
+    update_waiter = Semaphore.new
+
+    h = Roster::Helper.new(@client)
+    h.add_update_callback { |*a|
+      update_args = a
+      update_waiter.run
+    }
+
+    send("<iq type='set'>
+            <query xmlns='jabber:iq:roster'>
+              <item jid='foo@bar' name='Foo'/>
+            </query>
+          </iq>")
+    update_waiter.wait
+    assert_nil(update_args[0])
+    assert_equal(JID.new('foo@bar'), update_args[1].jid)
+    assert_equal('Foo', update_args[1].iname)
+
+    send("<iq type='set'>
+            <query xmlns='jabber:iq:roster'>
+              <item jid='foo@bar'/>
+            </query>
+          </iq>")
+    update_waiter.wait
+    assert_equal(JID.new('foo@bar'), update_args[0].jid)
+    assert_equal('Foo', update_args[0].iname)
+    assert_equal(JID.new('foo@bar'), update_args[1].jid)
+    assert_nil(update_args[1].iname)
+
+    send("<iq type='set'>
+            <query xmlns='jabber:iq:roster'>
+              <item jid='foo@bar' subscription='remove'/>
+            </query>
+          </iq>")
+    update_waiter.wait
+    assert_equal(JID.new('foo@bar'), update_args[0].jid)
+    assert_nil(update_args[0].iname)
+    assert_nil(update_args[1])
   end
 end