Changeset 5527

Timestamp:

01/26/08 12:59:42 (5 years ago)

Author:

cho45

Message:

lang/ruby/net-irc/trunk/test/net-irc_test.rb,
lang/ruby/net-irc/trunk/lib/net/irc.rb:

Append Test

Location:

lang/ruby/net-irc/trunk

Files:

• lib/net/irc.rb (modified) (4 diffs)
• test/net-irc_test.rb (modified) (2 diffs)

lang/ruby/net-irc/trunk/lib/net/irc.rb

@@ -445 +445 @@
         private
         def request(command, *params)
-                @socket << Message.new(@prefix, command, params)
+                @socket << Message.new(nil, command, params)
         end
 end # Client
@@ -576 +576 @@
 end # Server
 
-__END__
-
-Thread.start do
-        Net::IRC::Server.new("localhost", 16669, Net::IRC::Server::Session).start
-end
-
-Net::IRC::Client.new("localhost", "16669", {
-        :nick => "chokan",
-        :user => "chokan",
-        :real => "chokan",
-}).start
 
 __END__
@@ -598 +587 @@
 __END__
 class SimpleClient < Net::IRC::Client
-        def on_privmsg
+        def on_privmsg(m)
                 request(PRIVMSG, channel, "aaa")
         end
@@ -604 +593 @@
 
 class LingrIrcGateway < Net::IRC::Server::Session
-        def on_user
-                response(NAME, RPL_WELCOME,  "Welcome to the Internet Relay Network #{@mask}")
-                response(NAME, RPL_YOURHOST, "Your host is #{NAME}, running version #{Version}")
-                response(NAME, RPL_CREATED,  "This server was created #{Time.now}")
-                response(NAME, RPL_MYINFO,   "#{NAME} `Tynoq` v#{Version}")
-        end
-
-        def on_privmsg
+        def on_user(m)
+                super
+        end
+
+        def on_privmsg(m)
         end
 end

lang/ruby/net-irc/trunk/test/net-irc_test.rb

@@ -4 +4 @@
 class Net::IrcTest < Test::Unit::TestCase
         include Net::IRC
+        include Constants
 
         def test_constatns
@@ -28 +29 @@
 
         def test_server
-                #server = Net::IRC::Server.new("localhost", 16669, Net::IRC::Server::Session)
-                #server.start
+
+                server, client = nil, nil
+                Thread.start do
+                        server = Net::IRC::Server.new("localhost", 16669, TestServerSession)
+                        server.start
+                end
+
+                Thread.start do
+                        client = Net::IRC::Client.new("localhost", "16669", {
+                                :nick => "chokan",
+                                :user => "chokan",
+                                :real => "chokan",
+                        })
+                        client.start
+                end
+
+                assert_equal "chokan!chokan@localhost", TestServerSession.testq.pop
+                client.instance_eval do
+                        request PRIVMSG, "#channel", "message a b c"
+                end
+
+                message = TestServerSession.testq.pop
+                assert_instance_of Net::IRC::Message, message
+                assert_equal "PRIVMSG #channel :message a b c\r\n", message.to_s
+        end
+
+        class TestServerSession < Net::IRC::Server::Session
+                @@testq = SizedQueue.new(1)
+                @@instance = nil
+
+                def self.testq
+                        @@testq
+                end
+
+                def self.instance
+                        @@instance
+                end
+
+                def initialize(*args)
+                        super
+                        @@instance = self
+                end
+
+                def on_user(m)
+                        super
+                        @@testq << @mask
+                end
+
+                def on_privmsg(m)
+                        @@testq << m
+                end
         end
 end