qpid_proton 0.19.0 → 0.21.0

data/tests/test_tools.rb

@@ -0,0 +1,147 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+# Tools for tests. Only minitest is used.
+
+require 'minitest/autorun'
+require 'qpid_proton'
+require 'socket'
+
+begin
+  MiniTest::Test
+rescue NameError                # For older versions of MiniTest
+  MiniTest::Test = MiniTest::Unit::TestCase
+end
+
+class TestError < Exception; end
+
+def wait_port(port, timeout=5)
+  deadline = Time.now + timeout
+  begin  # Wait for the port to be connectible
+    TCPSocket.open("", $port).close
+  rescue Errno::ECONNREFUSED
+    if Time.now > deadline then
+      raise TestError, "timed out waiting for port #{port}"
+    end
+    sleep(0.1)
+    retry
+  end
+end
+
+# Handler that records some common events that are checked by tests
+class TestHandler < Qpid::Proton::MessagingHandler
+  attr_reader :errors, :connections, :sessions, :links, :messages
+
+  # Pass optional extra handlers and options to the Container
+  # @param raise_errors if true raise an exception for error events, if false, store them in #errors
+  def initialize(raise_errors=true)
+    super()
+    @raise_errors = raise_errors
+    @errors, @connections, @sessions, @links, @messages = 5.times.collect { [] }
+  end
+
+  # If the handler has errors, raise a TestError with all the error text
+  def raise_errors()
+    return if @errors.empty?
+    text = ""
+    while @errors.size > 0
+      text << @errors.pop + "\n"
+    end
+    raise TestError.new("TestHandler has errors:\n #{text}")
+  end
+
+  def on_error(condition)
+    @errors.push "#{condition}"
+    raise_errors if @raise_errors
+  end
+
+  def endpoint_open(queue, endpoint)
+    queue.push(endpoint)
+  end
+
+  def on_connection_open(c)
+    endpoint_open(@connections, c)
+  end
+
+  def on_session_open(s)
+    endpoint_open(@sessions, s)
+  end
+
+  def on_receiver_open(l)
+    endpoint_open(@links, l)
+  end
+
+  def on_sender_open(l)
+    endpoint_open(@links, l)
+  end
+
+  def on_message(d, m)
+    @messages.push(m)
+  end
+end
+
+# ListenHandler that closes the Listener after first accept
+class ListenOnceHandler < Qpid::Proton::Listener::Handler
+  def on_error(l, e)  raise TestError, e.inspect; end
+  def on_accept(l) l.close; super; end
+end
+
+# Add port/url to Listener, assuming a TCP socket
+class Qpid::Proton::Listener
+  def port() to_io.addr[1]; end
+  def url() "amqp://:#{port}"; end
+end
+
+# A client/server pair of ConnectionDrivers linked by a socket pair
+DriverPair = Struct.new(:client, :server) do
+
+  def initialize(client_handler, server_handler)
+    s = Socket.pair(:LOCAL, :STREAM, 0)
+    self.client = HandlerDriver.new(s[0], client_handler)
+    self.server = HandlerDriver.new(s[1], server_handler)
+    server.transport.set_server
+  end
+
+  # Process each driver once, return time of next timed event
+  def process(now = Time.now, max_time=nil)
+    t = collect { |d| d.process(now) }.compact.min
+    t =  max_time if max_time && t > max_time
+    t
+  end
+
+  def active()
+    can_read = self.select { |d| d.can_read? }
+    can_write = self.select  {|d| d.can_write? }
+    IO.select(can_read, can_write, [], 0)
+  end
+
+  def names() collect { |x| x.handler.names }; end
+
+  def clear() each { |x| x.handler.clear; } end
+
+  # Run till there is nothing else to do - not handle waiting for timed events
+  # but does pass +now+ to process and returns the min returned timed event time
+  def run(now=Time.now)
+    t = nil
+    begin
+      t = process(now, t)
+    end while active
+    t
+  end
+end
+

data/tests/test_uri.rb

@@ -0,0 +1,83 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+require 'test_tools'
+require 'qpid_proton'
+
+class TestURI < MiniTest::Test
+
+  PARTS=[:scheme, :userinfo, :host, :port, :path] # Interesting URI components
+  def uri(u) Qpid::Proton::uri(u); end
+  def uri_parts(u) uri(u).select(*PARTS); end
+
+  # Extension to standard URI parser
+  def test_standard
+    u = URI("amqp://u:p@h/x")
+    assert_equal URI::AMQP, u.class
+    assert_equal ['amqp', 'u:p', 'h', 5672, '/x'], u.select(*PARTS)
+
+    u = URI("amqps://u:p@h/x")
+    assert_equal URI::AMQPS, u.class
+    assert_equal ['amqps', 'u:p', 'h', 5671, '/x'], u.select(*PARTS)
+
+    assert_equal ['amqp', nil, '[::1:2:3]', 5672, ""], URI('amqp://[::1:2:3]').select(*PARTS)
+  end
+
+  # Proton::uri on valid URIs
+  def test_valid
+    u = uri("amqp://u:p@h:1/x")
+    assert_equal URI::AMQP, u.class
+    assert_equal ['amqp', 'u:p', 'h', 1, '/x'], u.select(*PARTS)
+
+    u = uri("amqps://u:p@h:1/x")
+    assert_equal URI::AMQPS, u.class
+    assert_equal ['amqps', 'u:p', 'h', 1, '/x'], u.select(*PARTS)
+
+    # Schemeless string -> amqp
+    assert_equal ["amqp", nil, "h", 1, "/x"], uri_parts("//h:1/x")
+    assert_equal ["amqp", nil, "", 5672, "/x"], uri_parts("/x")
+    assert_equal ["amqp", nil, "[::1]", 5672, ""], uri_parts("//[::1]")
+
+    # Schemeless URI gets amqp: scheme
+    assert_equal ["amqp", nil, nil, 5672, "/x"], uri_parts(URI("/x"))
+
+    # Pass-through
+    u = uri('')
+    assert_same u, uri(u)
+  end
+
+  # Proton::uri non-standard shortcuts
+  def test_shortcut
+    assert_equal URI("amqp://u:p@h:1/x"), uri("u:p@h:1/x")
+    assert_equal URI("amqp://h:1"), uri("h:1")
+    assert_equal URI("amqp://h"), uri("h")
+    assert_equal URI("amqp://h"), uri("h:")
+    assert_equal ["amqp", nil, "", 1, ""], uri_parts(":1")
+    assert_equal ["amqp", nil, "", 1, ""], uri_parts("amqp://:1")
+    assert_equal URI("amqp://[::1:2]:1"), uri("[::1:2]:1")
+    assert_equal URI("amqp://[::1:2]"), uri("[::1:2]")
+  end
+
+  def test_error
+    assert_raises(::ArgumentError) { uri(nil) }
+    assert_raises(URI::BadURIError) { uri(URI("http://x")) } # Don't re-parse a URI with wrong scheme
+    assert_raises(URI::InvalidURIError) { uri("x:y:z") } # Nonsense
+    assert_raises(URI::InvalidURIError) { uri("amqp://[foobar]") } # Bad host
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qpid_proton
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Darryl L. Pierce
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies: []
 description: |
   Proton is a high performance, lightweight messaging library. It can be used in
@@ -26,6 +26,26 @@ files:
 - ChangeLog
 - LICENSE
 - TODO
+- examples/README.md
+- examples/broker.rb
+- examples/client.rb
+- examples/direct_recv.rb
+- examples/direct_send.rb
+- examples/example_test.rb
+- examples/helloworld.rb
+- examples/server.rb
+- examples/simple_recv.rb
+- examples/simple_send.rb
+- examples/ssl_certs/README.txt
+- examples/ssl_certs/tclient-certificate.p12
+- examples/ssl_certs/tclient-certificate.pem
+- examples/ssl_certs/tclient-full.p12
+- examples/ssl_certs/tclient-private-key.pem
+- examples/ssl_certs/tserver-certificate.p12
+- examples/ssl_certs/tserver-certificate.pem
+- examples/ssl_certs/tserver-full.p12
+- examples/ssl_certs/tserver-private-key.pem
+- examples/ssl_send.rb
 - ext/cproton/cproton.c
 - ext/cproton/extconf.rb
 - lib/codec/data.rb
@@ -76,6 +96,32 @@ files:
 - lib/util/timeout.rb
 - lib/util/version.rb
 - lib/util/wrapper.rb
+- tests/old_examples/broker.rb
+- tests/old_examples/client.rb
+- tests/old_examples/direct_recv.rb
+- tests/old_examples/direct_send.rb
+- tests/old_examples/helloworld.rb
+- tests/old_examples/helloworld_direct.rb
+- tests/old_examples/lib/debugging.rb
+- tests/old_examples/lib/driver.rb
+- tests/old_examples/lib/qpid_examples.rb
+- tests/old_examples/lib/selectable.rb
+- tests/old_examples/lib/send_and_receive.rb
+- tests/old_examples/old_example_test.rb
+- tests/old_examples/recv.rb
+- tests/old_examples/send.rb
+- tests/old_examples/server.rb
+- tests/old_examples/simple_recv.rb
+- tests/old_examples/simple_send.rb
+- tests/test_connection_driver.rb
+- tests/test_container.rb
+- tests/test_data.rb
+- tests/test_delivery.rb
+- tests/test_interop.rb
+- tests/test_messaging_adapter.rb
+- tests/test_old_adapter.rb
+- tests/test_tools.rb
+- tests/test_uri.rb
 homepage: http://qpid.apache.org/proton
 licenses:
 - Apache-2.0
@@ -88,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="