xmpp4r 0.3.2 → 0.4

data/test/tc_rexml.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-$:.unshift '../lib'
+$:.unshift File::dirname(__FILE__) + '/../lib'
 
 require 'test/unit'
 require 'xmpp4r/rexmladdons'
@@ -51,10 +51,89 @@ class REXMLTest < Test::Unit::TestCase
     e.attributes['x'] = '&'
     assert_equal('&', e.attributes['x'])
     e.attributes['x'] = '&amp;'
-    assert_equal('&', e.attributes['x']) # this one should not be escaped
+    # bug in REXML 3.1.6 unescaped the ampersand
+    # assert_equal('&', e.attributes['x'])
+    # substituting a test that works with 3.1.5, 3.1.6, and 3.1.7
+    assert_equal('&amp;amp;', e.attribute('x').to_s)
     e.attributes['x'] = '&nbsp'
     assert_equal('&nbsp', e.attributes['x'])
     e.attributes['x'] = '&nbsp;'
     assert_equal('&nbsp;', e.attributes['x'])
   end
+
+  # test '==(o)'
+
+  def test_passing_in_non_rexml_element_as_self
+    o = Object.new
+    assert_not_equal(o, REXML::Element.new('foo'))
+  end
+
+  def test_passing_in_non_rexml_element_as_comparison_object
+    o = Object.new
+    assert_not_equal(REXML::Element.new('foo'), o)
+  end
+
+  def test_element_equal_simple
+    assert_equal(REXML::Element.new('foo'), REXML::Element.new('foo'))
+  end
+
+  def test_element_not_equal_simple
+    assert_not_equal(REXML::Element.new('foo'), REXML::Element.new('bar'))
+  end
+
+  def test_element_equal_when_all_are_same
+    e1 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e1.attributes['a:bar'] = 'baz'
+    e2 = REXML::Element.new('foo')
+    e2.add_namespace('a', 'urn:test:foo')
+    e2.attributes['a:bar'] = 'baz'
+
+    assert_equal(e1, e2)
+  end
+
+  def test_element_not_equal_when_namespace_name_differs
+    e1 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e1.attributes['a:bar'] = 'baz'
+    e2 = REXML::Element.new('foo')
+    e2.add_namespace('b', 'urn:test:foo')
+    e2.attributes['a:bar'] = 'baz'
+
+    assert_not_equal(e1, e2)
+  end
+
+  def test_element_not_equal_when_namespace_value_differs
+    e1 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e1.attributes['a:bar'] = 'baz'
+    e2 = REXML::Element.new('foo')
+    e2.add_namespace('a', 'urn:test:bar')
+    e2.attributes['a:bar'] = 'baz'
+
+    assert_not_equal(e1, e2)
+  end
+
+  def test_element_not_equal_when_attribute_name_differs
+    e1 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e1.attributes['a:bar'] = 'baz'
+    e2 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e2.attributes['b:bar'] = 'baz'
+
+    assert_not_equal(e1, e2)
+  end
+
+  def test_element_not_equal_when_attribute_value_differs
+    e1 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e1.attributes['a:bar'] = 'baz'
+    e2 = REXML::Element.new('foo')
+    e1.add_namespace('a', 'urn:test:foo')
+    e2.attributes['a:bar'] = 'bar'
+
+    assert_not_equal(e1, e2)
+  end
+
 end

data/test/tc_stream.rb

@@ -10,19 +10,21 @@ require 'xmpp4r/semaphore'
 include Jabber
 
 class StreamTest < Test::Unit::TestCase
+  STREAM = '<stream:stream xmlns:stream="http://etherx.jabber.org/streams">'
+
   def setup
-    @tmpfile = Tempfile::new("StreamSendTest")
+    @tmpfile = Tempfile.new("StreamSendTest")
     @tmpfilepath = @tmpfile.path()
     @tmpfile.unlink
-    @servlisten = UNIXServer::new(@tmpfilepath)
+    @servlisten = UNIXServer.new(@tmpfilepath)
     thServer = Thread.new { @server = @servlisten.accept }
-    @iostream = UNIXSocket::new(@tmpfilepath)
+    @iostream = UNIXSocket.new(@tmpfilepath)
     n = 0
     while not defined? @server and n < 10
       sleep 0.1
       n += 1
     end
-    @stream = Stream::new
+    @stream = Stream.new
     @stream.start(@iostream)
   end
 
@@ -38,13 +40,13 @@ class StreamTest < Test::Unit::TestCase
     called = false
     @stream.add_xml_callback { called = true }
     assert(!called)
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     assert(called)
   end
 
   def test_process100
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
 
     done = Semaphore.new
@@ -70,7 +72,7 @@ class StreamTest < Test::Unit::TestCase
   end
 
   def test_send
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
 
     Thread.new {
@@ -92,7 +94,7 @@ class StreamTest < Test::Unit::TestCase
   end
 
   def test_send_nested
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     finished = Semaphore.new
 
@@ -117,7 +119,7 @@ class StreamTest < Test::Unit::TestCase
       called_outer += 1
       assert_kind_of(Iq, reply)
       assert_equal(:result, reply.type)
-      
+
       if reply.id == '1'
         @stream.send(Iq.new(:set)) do |reply2|
           called_inner += 1
@@ -144,7 +146,7 @@ class StreamTest < Test::Unit::TestCase
   end
 
   def test_send_in_callback
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     finished = Semaphore.new
 
@@ -165,7 +167,7 @@ class StreamTest < Test::Unit::TestCase
   end
 
   def test_bidi
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     finished = Semaphore.new
     ok = true
@@ -199,7 +201,7 @@ class StreamTest < Test::Unit::TestCase
     n = 0
     @stream.add_message_callback { n += 1 }
     assert_equal(0, n)
-    @server.puts('<stream:stream><message/>')
+    @server.puts("#{STREAM}<message/>")
     @server.flush
     sleep delay
     assert_equal(1, n)
@@ -215,7 +217,7 @@ class StreamTest < Test::Unit::TestCase
     @server.flush
     sleep delay
     assert_equal(2, n)
-    @server.puts('<message><stream:stream><message/></stream:stream>')
+    @server.puts("<message>#{STREAM}<message/></stream:stream>")
     @server.flush
     sleep delay
     assert_equal(2, n)

data/test/tc_streamComponent.rb

@@ -13,6 +13,7 @@ include Jabber
 
 class StreamComponentTest < Test::Unit::TestCase
   @@SOCKET_PORT = 65224
+  STREAM = 'stream:stream xmlns:stream="http://etherx.jabber.org/streams"'
 
   def setup
     servlisten = TCPServer.new(@@SOCKET_PORT)
@@ -22,21 +23,21 @@ class StreamComponentTest < Test::Unit::TestCase
       serversock = servlisten.accept
       servlisten.close
       serversock.sync = true
-      @server = Stream.new(true)
+      @server = Stream.new
       @server.add_xml_callback do |xml|
         if xml.prefix == 'stream' and xml.name == 'stream'
-          @server.send('<stream:stream xmlns="jabber:component:accept">')
+          @server.send("<#{STREAM} xmlns='jabber:component:accept'>")
           true
         else
           false
         end
       end
       @server.start(serversock)
-      
+
       serverwait.run
     end
 
-    @stream = Component::new('test')
+    @stream = Component.new('test')
     @stream.connect('localhost', @@SOCKET_PORT)
 
     serverwait.wait
@@ -62,7 +63,7 @@ class StreamComponentTest < Test::Unit::TestCase
       assert_kind_of(Iq, iq)
       stanzas += 1
       iq_lock.run
-    } 
+    }
     @stream.add_presence_callback { |pres|
       assert_kind_of(Presence, pres)
       stanzas += 1

data/test/tc_streamError.rb

@@ -9,6 +9,7 @@ include Jabber
 
 class ConnectionErrorTest < Test::Unit::TestCase
   @@SOCKET_PORT = 65225
+  STREAM = '<stream:stream xmlns:stream="http://etherx.jabber.org/streams">'
 
   def setup
     servlisten = TCPServer.new(@@SOCKET_PORT)
@@ -19,11 +20,11 @@ class ConnectionErrorTest < Test::Unit::TestCase
       @server = servlisten.accept
       servlisten.close
       @server.sync = true
-      
+
       serverwait.run
     end
 
-    @conn = TCPSocket::new('localhost', @@SOCKET_PORT)
+    @conn = TCPSocket.new('localhost', @@SOCKET_PORT)
 
     serverwait.wait
   end
@@ -34,11 +35,11 @@ class ConnectionErrorTest < Test::Unit::TestCase
   end
 
   def test_connectionError_start_withexcblock
-    @stream = Stream::new
+    @stream = Stream.new
     error = false
     @stream.on_exception do |e, o, w|
       # strange exception, it's caused by REXML, actually
-      assert_equal(NameError, e.class)
+      assert_kind_of(StandardError, e)
       assert_equal(Jabber::Stream, o.class)
       assert_equal(:start, w)
       error = true
@@ -46,7 +47,7 @@ class ConnectionErrorTest < Test::Unit::TestCase
     assert(!error)
     begin
       # wrong port on purpose
-      conn = TCPSocket::new('localhost', 1)
+      conn = TCPSocket.new('localhost', 1)
     rescue
     end
     @stream.start(conn)
@@ -57,16 +58,21 @@ class ConnectionErrorTest < Test::Unit::TestCase
   end
 
   def test_connectionError_parse_withexcblock
-    @stream = Stream::new
+    @stream = Stream.new
     error = false
     @stream.start(@conn)
     @stream.on_exception do |e, o, w|
-      assert_equal(REXML::ParseException, e.class)
-      assert_equal(Jabber::Stream, o.class)
-      assert_equal(:parser, w)
-      error = true
+      if w == :disconnected
+        assert_equal(nil, e)
+        assert_equal(Jabber::Stream, o.class)
+      else
+        assert_equal(REXML::ParseException, e.class)
+        assert_equal(Jabber::Stream, o.class)
+        assert_equal(:parser, w)
+        error = true
+      end
     end
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     assert(!error)
     @server.puts('</blop>')
@@ -78,7 +84,7 @@ class ConnectionErrorTest < Test::Unit::TestCase
   end
 
   def test_connectionError_send_withexcblock
-    @stream = Stream::new
+    @stream = Stream.new
     error = 0
     @stream.start(@conn)
     @stream.on_exception do |exc, o, w|
@@ -94,7 +100,7 @@ class ConnectionErrorTest < Test::Unit::TestCase
       end
       error += 1
     end
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     assert_equal(0, error)
     @server.close
@@ -109,9 +115,9 @@ class ConnectionErrorTest < Test::Unit::TestCase
   end
 
   def test_connectionError_send_withoutexcblock
-    @stream = Stream::new
+    @stream = Stream.new
     @stream.start(@conn)
-    @server.puts('<stream:stream>')
+    @server.puts(STREAM)
     @server.flush
     assert_raise(Errno::EPIPE) do
       @server.close

data/test/tc_streamSend.rb

@@ -11,13 +11,13 @@ include Jabber
 
 class StreamSendTest < Test::Unit::TestCase
   def setup
-    @tmpfile = Tempfile::new("StreamSendTest")
+    @tmpfile = Tempfile.new("StreamSendTest")
     @tmpfilepath = @tmpfile.path()
     @tmpfile.unlink
-    @servlisten = UNIXServer::new(@tmpfilepath)
+    @servlisten = UNIXServer.new(@tmpfilepath)
     thServer = Thread.new { @server = @servlisten.accept }
-    @iostream = UNIXSocket::new(@tmpfilepath)
-    @stream = Stream::new
+    @iostream = UNIXSocket.new(@tmpfilepath)
+    @stream = Stream.new
     @stream.start(@iostream)
 
     thServer.join
@@ -33,26 +33,26 @@ class StreamSendTest < Test::Unit::TestCase
     @stream.send(s)
     @stream.send("\n") #needed for easy test writing
   end
-  
+
   ##
   # Tries to send a basic message
   def test_sendbasic
-    mysend(Message::new)
+    mysend(Message.new)
     assert_equal("<message/>\n", @server.gets)
   end
 
   def test_sendmessage
-    mysend(Message::new('lucas@linux.ensimag.fr', 'coucou'))
+    mysend(Message.new('lucas@linux.ensimag.fr', 'coucou'))
     assert_equal("<message to='lucas@linux.ensimag.fr'><body>coucou</body></message>\n", @server.gets)
   end
 
   def test_sendpresence
-    mysend(Presence::new)
+    mysend(Presence.new)
     assert_equal("<presence/>\n", @server.gets)
   end
 
   def test_sendiq
-    mysend(Iq::new)
+    mysend(Iq.new)
     assert_equal("<iq/>\n", @server.gets)
   end
 

data/test/tc_streamparser.rb

@@ -0,0 +1,112 @@
+#!/usr/bin/ruby
+
+$:.unshift '../lib'
+
+require 'tempfile'
+require 'test/unit'
+require 'socket'
+require 'xmpp4r/streamparser'
+require 'xmpp4r/semaphore'
+include Jabber
+
+class MockListener
+  attr_reader :received
+
+  def receive(element)
+    @received = element
+  end
+
+  def parse_failure(exception)
+    raise exception
+  end
+end
+
+class StreamParserTest < Test::Unit::TestCase
+  STREAM = '<stream:stream xmlns:stream="http://etherx.jabber.org/streams">'
+
+  def setup
+    @listener = MockListener.new
+  end
+
+  def teardown
+    @listener = nil
+  end
+
+  def parse_simple_helper(fixture)
+    parser = StreamParser.new(STREAM + fixture, @listener)
+
+    parser.parse
+
+    yield parse_with_rexml(fixture)
+  end
+
+  def parse_with_rexml(fixture)
+    REXML::Document.new(fixture).root
+  end
+
+  def test_simple_text
+    parse_simple_helper( "<a>text</a>" ) do |desired|
+      assert_equal desired.name, @listener.received.name
+      assert_equal desired.text, @listener.received.text
+      assert_equal desired.cdatas, @listener.received.cdatas
+    end
+  end
+
+  def test_simple_cdata
+    parse_simple_helper( "<a><![CDATA[<cdata>]]></a>" ) do |desired|
+      assert_equal desired.name, @listener.received.name
+      assert_equal desired.text, @listener.received.text
+      assert_equal desired.cdatas, @listener.received.cdatas
+    end
+  end
+
+  def test_composite_text_cdata
+    parse_simple_helper( "<a>text<![CDATA[<cdata>]]></a>" ) do |desired|
+      assert_equal desired.name, @listener.received.name
+      assert_equal desired.text, @listener.received.text
+      assert_equal desired.cdatas, @listener.received.cdatas
+    end
+  end
+
+  def test_composite_cdata_text
+    parse_simple_helper( "<a><![CDATA[<cdata>]]>text</a>" ) do |desired|
+      assert_equal desired.name, @listener.received.name
+      assert_equal desired.text, @listener.received.text
+      assert_equal desired.cdatas, @listener.received.cdatas
+    end
+  end
+
+  def test_complex_composite_cdata_text
+    parse_simple_helper( "<a><![CDATA[<cdata>]]>text<![CDATA[<cdata>]]>text</a>" ) do |desired|
+      assert_equal desired.name, @listener.received.name
+      assert_equal desired.text, @listener.received.text
+      assert_equal desired.cdatas, @listener.received.cdatas
+    end
+  end
+
+  def test_entity_escaping1
+    parse_simple_helper( "<a>&apos;&amp;&quot;</a>" ) do |desired|
+      assert_equal "'&\"", @listener.received.text
+      assert_equal "<a>&apos;&amp;&quot;</a>", @listener.received.to_s
+    end
+  end
+
+  def test_entity_escaping2
+    parse_simple_helper( "<a>&amp;amp;amp;</a>" ) do |desired|
+      assert_equal "&amp;amp;", @listener.received.text
+      assert_equal "<a>&amp;amp;amp;</a>", @listener.received.to_s
+    end
+  end
+
+=begin
+  **********
+  * FIXME! *
+  **********
+
+  def test_unbound_prefix
+    parse_simple_helper("<message><soe:instantMessage/></message>") do |desired|
+      assert_equal desired.first_element('*').name, 'instantMessage'
+    end
+  end
+=end
+end