1 files changed, 28 insertions, 14 deletions
diff --git a/spec/ruby/library/socket/addrinfo/tcp_spec.rb b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
index 39406b64ee..c74c9c21c2 100644
--- a/spec/ruby/library/socket/addrinfo/tcp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
@@ -1,20 +1,34 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
-describe "Addrinfo.tcp" do
+describe 'Addrinfo.tcp' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    it 'returns an Addrinfo instance' do
+      Addrinfo.tcp(ip_address, 80).should be_an_instance_of(Addrinfo)
+    end
 
-  before :each do
-    @addrinfo = Addrinfo.tcp("localhost", "smtp")
-  end
+    it 'sets the IP address' do
+      Addrinfo.tcp(ip_address, 80).ip_address.should == ip_address
+    end
 
-  it "creates a addrinfo for a tcp socket" do
-    ["::1", "127.0.0.1"].should include(@addrinfo.ip_address)
-    [Socket::PF_INET, Socket::PF_INET6].should include(@addrinfo.pfamily)
-    @addrinfo.ip_port.should == 25
-    @addrinfo.socktype.should == Socket::SOCK_STREAM
-    platform_is_not :solaris do
-      @addrinfo.protocol.should == Socket::IPPROTO_TCP
+    it 'sets the port' do
+      Addrinfo.tcp(ip_address, 80).ip_port.should == 80
+    end
+
+    it 'sets the address family' do
+      Addrinfo.tcp(ip_address, 80).afamily.should == family
     end
-  end
 
+    it 'sets the protocol family' do
+      Addrinfo.tcp(ip_address, 80).pfamily.should == family
+    end
+
+    it 'sets the socket type' do
+      Addrinfo.tcp(ip_address, 80).socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'sets the socket protocol' do
+      Addrinfo.tcp(ip_address, 80).protocol.should == Socket::IPPROTO_TCP
+    end
+  end
 end