9 files changed, 46 insertions, 7 deletions
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/address_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
index 784fb6fe77..05c97ddf30 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/address_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
@@ -26,7 +26,7 @@ module Qpid
     describe Address do
 
       before(:each) do
-        @address = Qpid::Messaging::Address.new "my-name", "my-subject", :create => :always
+        @address = Qpid::Messaging::Address.new "my-name/my-subject;{create:always}"
       end
 
       it "stores the name, subject and options when created" do
@@ -72,7 +72,7 @@ module Qpid
       end
 
       it "can return a string representation" do
-        address = Qpid::Messaging::Address.new "foo", "bar", :create => :always, :link => :durable
+        address = Qpid::Messaging::Address.new "foo/bar:{create:always,link:durable}"
         result = address.to_s
 
         result.should =~ /foo\/bar/
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/connection_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
index a2f5b7e898..811abf36e9 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/connection_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
@@ -37,7 +37,7 @@ module Qpid
           connection = Qpid::Messaging::Connection.new :options => {:username => "foo"}
 
           connection.options.should include("username")
-        }.should_not raise_error
+        }.to_not raise_error
       end
 
       it "returns the underlying implementation" do
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/duration_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
index 4980b6ffe7..202332d232 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/duration_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
@@ -49,6 +49,33 @@ module Qpid
         milliseconds.should == 1000
       end
 
+      it "raises an error when multiplied by a negative" do
+        expect {
+          twomin = Qpid::Messaging::Duration::MINUTE * -2
+        }.to raise_error
+      end
+
+      it "returns IMMEDIATE if the factor is zero" do
+        result = Qpid::Messaging::Duration::MINUTE * 0
+        result.should be(Qpid::Messaging::Duration::IMMEDIATE)
+      end
+
+      it "fractional factors return a reduced duration" do
+        factor = rand(1)
+        first = Qpid::Messaging::Duration::MINUTE
+        second = first * factor
+
+        second.milliseconds.should == ((first.milliseconds * factor).floor)
+      end
+
+      it "can return a multiple of its duration" do
+        factor = rand(10).floor
+        first = Qpid::Messaging::Duration.new(rand(10).floor * 10000)
+        second = first * factor
+
+        second.milliseconds.should == first.milliseconds * factor
+      end
+
     end
 
   end
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/encoding_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
index 58b8447278..58b8447278 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/encoding_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/message_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
index e34e58f563..be19b3591e 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/message_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
@@ -36,7 +36,7 @@ module Qpid
       end
 
       it "can set the reply to address" do
-        address = Qpid::Messaging::Address.new "my-queue", ""
+        address = Qpid::Messaging::Address.new "my-queue;{create:always}"
 
         @message.reply_to = address
 
@@ -45,6 +45,19 @@ module Qpid
         reply_to.name.should == address.name
       end
 
+      it "can set the reply to from an address string" do
+        name = "my-queue"
+        subject = "responses"
+        address = "#{name}/#{subject}"
+
+        @message.reply_to = address
+
+        reply_to = @message.reply_to
+
+        reply_to.name.should == name
+        reply_to.subject.should == subject
+      end
+
       it "should store the content when created" do
         content = @message.content
 
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/receiver_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
index 81ae935dcb..81ae935dcb 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/receiver_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/sender_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
index fa3a2a5b1f..fa3a2a5b1f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/sender_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid/session_spec.rb b/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
index 0b103a31e6..754e2ca88f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid/session_spec.rb
+++ b/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
@@ -46,7 +46,7 @@ module Qpid
       end
 
       it "creates a Sender from an Address" do
-        address = Qpid::Messaging::Address.new "my-queu", "", :create => :always
+        address = Qpid::Messaging::Address.new "my-queue;{create:always}"
 
         @session_impl.should_receive(:createSender).
           with(address.address_impl).
diff --git a/cpp/bindings/qpid/ruby/spec/spec_helper.rb b/cpp/bindings/qpid/ruby/spec/spec_helper.rb
index 90084963f4..865e60e0e2 100644
--- a/cpp/bindings/qpid/ruby/spec/spec_helper.rb
+++ b/cpp/bindings/qpid/ruby/spec/spec_helper.rb
@@ -17,5 +17,4 @@
 # under the License.
 #
 
-require 'qpid'
-require 'cqpid'
+require 'qpid_messaging'