spec/pushpull_spec.rb in ffi-rzmq-0.8.2 vs spec/pushpull_spec.rb in ffi-rzmq-0.9.0

@@ -11,57 +11,118 @@
       before(:each) do
         $stdout.flush
         @context = ZMQ::Context.new
         @push = @context.socket ZMQ::PUSH
         @pull = @context.socket ZMQ::PULL
-        @link = "tcp://127.0.0.1:#{random_port}"
-        @pull.connect @link
+        @push.setsockopt ZMQ::LINGER, 0
+        @pull.setsockopt ZMQ::LINGER, 0
+        port = connect_to_random_tcp_port(@pull)
+        @link = "tcp://127.0.0.1:#{port}"
         @push.bind    @link
       end
-      
+
       after(:each) do
         @push.close
         @pull.close
+        @context.terminate
       end
-      
+
       it "should receive an exact copy of the sent message using Message objects directly on one pull socket" do
         @push.send_string string
-        received = @pull.recv_string
+        received = ''
+        rc = @pull.recv_string received
         received.should == string
       end
-       
-      it "should receive an exact string copy of the message sent when receiving in non-blocking mode and using Message objects directly" do
-        sent_message = Message.new string
-        received_message = Message.new
 
-        @push.send sent_message
-        sleep 0.1 # give it time for delivery
-        @pull.recv received_message, ZMQ::NOBLOCK
-        received_message.copy_out_string.should == string
+      if version2?
+        it "should receive an exact string copy of the message sent when receiving in non-blocking mode and using Message objects directly" do
+          sent_message = Message.new string
+          received_message = Message.new
+
+          rc = @push.send sent_message
+          rc.should == 0
+          sleep 0.1 # give it time for delivery
+          rc = @pull.recv received_message, ZMQ::NOBLOCK
+          received_message.copy_out_string.should == string
+        end
+
+      else
+
+        it "should receive an exact string copy of the message sent when receiving in non-blocking mode and using Message objects directly" do
+          sent_message = Message.new string
+          received_message = Message.new
+
+          rc = @push.sendmsg sent_message
+          rc.should == string.size
+          sleep 0.1 # give it time for delivery
+          rc = @pull.recvmsg received_message, ZMQ::DONTWAIT
+          rc.should == string.size
+          received_message.copy_out_string.should == string
+        end
       end
 
-      it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages" do
-        received = []
-        threads  = []
-        count    = 4
-        @pull.close # close this one since we aren't going to use it below and we don't want it to receive a message
-         
-        count.times do
-          threads << Thread.new do
-            pull = @context.socket ZMQ::PULL
-            rc = pull.connect @link
-            received << pull.recv_string
-            pull.close
+
+      if version2?
+
+        it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages" do
+          received = []
+          threads  = []
+          count    = 4
+          @pull.close # close this one since we aren't going to use it below and we don't want it to receive a message
+
+          count.times do |i|
+            threads << Thread.new do
+              pull = @context.socket ZMQ::PULL
+              rc = pull.setsockopt ZMQ::LINGER, 0
+              rc = pull.connect @link
+              rc.should == 0
+              buffer = ''
+              rc = pull.recv_string buffer
+              rc.should == 0
+              received << buffer
+              pull.close
+            end
+            sleep 0.01 # give each thread time to spin up
           end
-          sleep 0.001 # give each thread time to spin up
+
+          count.times { @push.send_string(string) }
+
+          threads.each {|t| t.join}
+
+          received.find_all {|r| r == string}.length.should == count
         end
-        
-        count.times { @push.send_string(string) }
 
-        threads.each {|t| t.join}
-        
-        received.find_all {|r| r == string}.length.should == count
-      end
-      
+      else # version3 or 4
+
+        it "should receive a single message for each message sent on each socket listening, when an equal number pulls to messages" do
+          received = []
+          threads  = []
+          count    = 4
+          @pull.close # close this one since we aren't going to use it below and we don't want it to receive a message
+
+          count.times do |i|
+            threads << Thread.new do
+              pull = @context.socket ZMQ::PULL
+              rc = pull.setsockopt ZMQ::LINGER, 0
+              rc = pull.connect @link
+              rc.should == 0
+              buffer = ''
+              rc = pull.recv_string buffer
+              rc.should == string.size
+              received << buffer
+              pull.close
+            end
+            sleep 0.01 # give each thread time to spin up
+          end
+
+          count.times { @push.send_string(string) }
+
+          threads.each {|t| t.join}
+
+          received.find_all {|r| r == string}.length.should == count
+        end
+
+      end # if version...
+
     end # @context ping-pong
   end # describe
 end # module ZMQ