amqp 1.0.0.pre2 → 1.0.0

data/spec/integration/basic_return_spec.rb

@@ -38,11 +38,11 @@ describe "Message published as mandatory" do
       @exchange.on_return do |basic_return, header, body|
         returned_messages << basic_return.reply_text
       end
-      (1..10).to_a.each { |m| @exchange.publish(m, :immediate => true) }
+      (1..10).to_a.each { |m| @exchange.publish(m, :mandatory => true) }
 
       done(1.0) {
-        returned_messages.should == Array.new(10) { "NO_CONSUMERS" }
+        returned_messages.should == Array.new(10) { "NO_ROUTE" }
       }
     end
   end
-end
+end

data/spec/integration/channel_level_exception_with_multiple_channels_spec.rb

@@ -53,7 +53,6 @@ describe AMQP do
       }
 
       delayed(0.3) {
-        @q1.delete
         @q2.delete
       }
 

data/spec/integration/exchange_declaration_spec.rb

@@ -127,27 +127,14 @@ describe AMQP::Channel do
     end # context
 
 
-    context "when exchange name was specified as a blank string" do
-      it 'returns direct exchange with server-generated name' do
-        pending <<-EOF
-      This has to be fixed in RabbitMQ first
-      https://bugzilla.rabbitmq.com/show_bug.cgi?id=23509
-    EOF
-        @channel.direct("") do |exchange|
-          exchange.name.should_not be_empty
-          done
-        end
-      end
-    end # context
-
-
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name = "a_new_direct_exchange declared at #{Time.now.to_i}"
+          name    = "a_new_direct_exchange declared at #{Time.now.to_i}"
+          channel = AMQP::Channel.new
 
-          original_exchange = @channel.direct(name)
-          exchange          = @channel.direct(name, :passive => true)
+          original_exchange = channel.direct(name)
+          exchange          = channel.direct(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -157,13 +144,16 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          pending "Not yet supported"
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
     end # context
@@ -223,27 +213,16 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.direct("previously.declared.durable.direct.exchange", :durable => true)
 
         expect {
-          @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
+          channel.direct("previously.declared.durable.direct.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
-
-    context "when exchange is re-declared with irrelevent parameters different from original declaration" do
-      it "doesn't raise an exception" do
-        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
-
-        expect {
-          @channel.direct("previously.declared.durable.direct.exchange", :durable => true, :header => {:random => 'stuff' })
-        }.to_not raise_error(AMQP::IncompatibleOptionsError)
-
-        done
-      end # it
-    end # context
   end # describe
 
 
@@ -287,12 +266,17 @@ describe AMQP::Channel do
       end
 
       context "and exchange with given name DOES NOT exist" do
-        it "raises an exception" do
-          pending "Not yet supported"
+        it "results in a channel exception" do
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
+
+          done(0.5) {
+            @error_code.should == 404
+          }
 
           done
         end # it
@@ -354,10 +338,11 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        @channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
 
         expect {
-          @channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
+          channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
@@ -377,7 +362,7 @@ describe AMQP::Channel do
         exchange.name.should == name
 
         done
-      end
+      end # it
     end # context
 
     context "when exchange name is omitted" do
@@ -387,7 +372,7 @@ describe AMQP::Channel do
         exchange.name.should_not == "amq.topic2"
 
         done
-      end
+      end # it
     end # context
 
     context "when passive option is used" do
@@ -402,20 +387,23 @@ describe AMQP::Channel do
 
           done
         end # it
-      end
+      end # context
 
       context "and exchange with given name DOES NOT exist" do
-        it "raises an exception" do
-          pending "Not yet supported"
+        it "results in a channel exception" do
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
-    end # context
+    end
 
 
     context "when exchange is declared as durable" do
@@ -470,16 +458,14 @@ describe AMQP::Channel do
     end # context
 
 
-    context "when exchange is re-declared with parameters different from original declaration" do
+    context "when exchange is re-declared with parameters different from the original declaration" do
       amqp_after do
         done
       end
 
       it "raises an exception" do
         channel = AMQP::Channel.new
-
         channel.topic("previously.declared.durable.topic.exchange", :durable => true)
-        channel.should be_open
 
         expect {
           channel.topic("previously.declared.durable.topic.exchange", :durable => false)
@@ -498,7 +484,8 @@ describe AMQP::Channel do
       let(:name) { "new.headers.exchange" }
 
       it "declares a new headers exchange with that name" do
-        exchange = @channel.headers(name)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers(name)
 
         exchange.name.should == name
 
@@ -512,7 +499,8 @@ describe AMQP::Channel do
       end
 
       it "uses amq.match" do
-        exchange = @channel.headers
+        channel  = AMQP::Channel.new
+        exchange = channel.headers
         exchange.name.should == "amq.match"
         exchange.name.should_not == "amq.headers"
 
@@ -523,10 +511,11 @@ describe AMQP::Channel do
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name = "a_new_headers_exchange declared at #{Time.now.to_i}"
+          name    = "a_new_headers_exchange declared at #{Time.now.to_i}"
+          channel = AMQP::Channel.new
 
-          original_exchange = @channel.headers(name)
-          exchange          = @channel.headers(name, :passive => true)
+          original_exchange = channel.headers(name)
+          exchange          = channel.headers(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -536,13 +525,16 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          pending "Not yet supported"
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
     end # context
@@ -550,7 +542,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as durable" do
       it "returns a new durable headers exchange" do
-        exchange = @channel.headers("a_new_durable_headers_exchange", :durable => true)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a_new_durable_headers_exchange", :durable => true)
         exchange.should be_durable
         exchange.should_not be_transient
 
@@ -561,7 +554,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as non-durable" do
       it "returns a new NON-durable headers exchange" do
-        exchange = @channel.headers("a_new_non_durable_headers_exchange", :durable => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a_new_non_durable_headers_exchange", :durable => false)
         exchange.should_not be_durable
         exchange.should be_transient
 
@@ -572,7 +566,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        exchange = @channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
         done
@@ -582,7 +577,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -592,7 +588,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared without explicit :nowait parameter" do
       it "is declared with :nowait by default" do
-        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -606,43 +603,15 @@ describe AMQP::Channel do
       end
 
       it "raises an exception" do
-        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.headers("previously.declared.durable.headers.exchange", :durable => true)
 
         expect {
-          @channel.headers("previously.declared.durable.headers.exchange", :durable => false)
+          channel.headers("previously.declared.durable.headers.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
-
-
-    context "when exchange is re-declared with parameters different from original declaration on two separate channels" do
-      it "raises an exception" do
-        channel2 = AMQP::Channel.new
-        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
-
-        channel2.on_error do |ch, channel_close|
-          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
-          done
-        end
-        channel2.headers("previously.declared.durable.headers.exchange", :durable => false)
-      end # it
-    end # context
-
-
-
-    context "when exchange is re-declared with type different from original declaration on two separate channels" do
-      it "raises an exception" do
-        channel2 = AMQP::Channel.new
-        @channel.topic("previously.declared.durable.topic.exchange", :durable => true)
-
-        channel2.on_error do |ch, channel_close|
-          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
-          done
-        end
-        channel2.headers("previously.declared.durable.topic.exchange", :durable => true)
-      end # it
-    end # context
   end # describe
 end # describe AMQP

data/spec/integration/extensions/rabbitmq/publisher_confirmations_spec.rb

@@ -132,7 +132,7 @@ describe "Publisher confirmation(s)" do
         end
 
         EventMachine.add_timer(0.5) do
-          exchange.publish("Hi", :persistent => false, :immediately => true)
+          exchange.publish("Hi", :persistent => false)
         end
 
         done(2.0) do

data/spec/integration/fanout_exchange_routing_spec.rb

@@ -77,7 +77,7 @@ describe AMQP::Exchange, "of type fanout" do
       end
 
       # for Rubinius, it is surprisingly slow on this workload
-      done(2.5) {
+      done(1.5) {
         [@queue1, @queue2, @queue3].each do |q|
           @received_messages[q.name].size.should == @expected_number_of_messages[q.name]
 

data/spec/integration/multiple_consumers_per_queue_spec.rb

@@ -58,7 +58,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -104,7 +104,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -150,7 +150,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -161,161 +161,4 @@ describe "Multiple non-exclusive consumers per queue" do
       }
     end # it
   end # context
-
-
-
-
-  context "with equal prefetch levels and two consumers cancelled mid-flight" do
-    it "have messages distributed to the only active consumer" do
-      channel = AMQP::Channel.new
-      channel.on_error do |ch, channel_close|
-        raise(channel_close.reply_text)
-      end
-
-      queue   = channel.queue("amqpgem.integration.roundrobin.queue1", :auto_delete => true) do
-        consumer1 = AMQP::Consumer.new(channel, queue)
-        consumer2 = AMQP::Consumer.new(channel, queue, "#{queue.name}-consumer-#{rand}-#{Time.now}", false, true)
-
-        consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
-          @consumer1_mailbox << payload
-        end
-
-        consumer2.consume(true).on_delivery do |metadata, payload|
-          @consumer2_mailbox << payload
-        end
-
-        queue.subscribe do |metadata, payload|
-          @consumer3_mailbox << payload
-        end
-        queue.unsubscribe
-
-        consumer2.cancel
-      end
-
-      exchange = channel.default_exchange
-      exchange.on_return do |basic_return, metadata, payload|
-        raise(basic_return.reply_text)
-      end
-
-      EventMachine.add_timer(1.0) do
-        messages.each do |message|
-          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
-        end
-      end
-
-      done(5.0) {
-        @consumer1_mailbox.size.should == 100
-        @consumer2_mailbox.size.should == 0
-        @consumer3_mailbox.size.should == 0
-      }
-    end # it
-  end # context
-
-
-
-  unless ENV["CI"]
-    context "with equal prefetch levels, a server-named queue and two consumers cancelled mid-flight" do
-      it "have messages distributed to the only active consumer" do
-        channel = AMQP::Channel.new
-        channel.on_error do |ch, channel_close|
-          raise(channel_close.reply_text)
-        end
-
-        queue   = channel.queue("", :auto_delete => true)
-        consumer1 = AMQP::Consumer.new(channel, queue)
-        consumer2 = AMQP::Consumer.new(channel, queue)
-
-        consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
-          @consumer1_mailbox << payload
-        end
-
-        consumer2.consume(true).on_delivery do |metadata, payload|
-          @consumer2_mailbox << payload
-        end
-        queue.subscribe do |metadata, payload|
-          @consumer3_mailbox << payload
-        end
-        queue.unsubscribe
-        consumer2.cancel
-
-
-        exchange = channel.default_exchange
-        exchange.on_return do |basic_return, metadata, payload|
-          raise(basic_return.reply_text)
-        end
-
-        EventMachine.add_timer(1.0) do
-          messages.each do |message|
-            exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
-          end
-        end
-
-        done(5.0) {
-          @consumer1_mailbox.size.should == 100
-          @consumer2_mailbox.size.should == 0
-          @consumer3_mailbox.size.should == 0
-        }
-      end # it
-    end # context
-
-
-
-    context "with equal prefetch levels and ALL consumers cancelled mid-flight" do
-      it "returns all immediate messages" do
-        @returned_messages = []
-
-        channel = AMQP::Channel.new
-        channel.on_error do |ch, channel_close|
-          raise(channel_close.reply_text)
-        end
-
-        queue   = channel.queue("amqpgem.integration.roundrobin.queue1", :auto_delete => true) do
-          consumer1 = AMQP::Consumer.new(channel, queue)
-          consumer2 = AMQP::Consumer.new(channel, queue, "#{queue.name}-consumer-#{rand}-#{Time.now}", false, true)
-
-          consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
-            @consumer1_mailbox << payload
-          end
-
-          consumer2.consume(true).on_delivery do |metadata, payload|
-            @consumer2_mailbox << payload
-          end
-
-          queue.subscribe do |metadata, payload|
-            @consumer3_mailbox << payload
-          end
-          queue.should be_subscribed
-          queue.unsubscribe
-          queue.should_not be_subscribed
-
-          consumer2.should be_subscribed
-          consumer2.callback.should_not be_nil
-          consumer2.cancel
-          consumer2.should_not be_subscribed
-          consumer2.callback.should be_nil
-
-          consumer1.should be_subscribed
-          consumer1.callback.should_not be_nil
-          consumer1.cancel
-          consumer1.should_not be_subscribed
-          consumer1.callback.should be_nil
-        end
-
-        exchange = channel.default_exchange
-        exchange.on_return do |basic_return, metadata, payload|
-          @returned_messages << payload
-        end
-
-        EventMachine.add_timer(1.0) do
-          messages.each do |message|
-            exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
-          end
-        end
-
-        done(6.0) {
-          @returned_messages.size.should == 100
-        }
-      end # it
-    end # context    
-  end
 end # describe