Commit: e2c2fec7d5b9b1cf08ae0c010ebaa8fdc31c8b95 - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• Revisão: e2c2fec7d5b9b1cf08ae0c010ebaa8fdc31c8b95 (tree)
• Hora: 2015-03-15 10:56:30
• Autor: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Mensagem de Log

split test code to separate files(5)

Mudança Sumário

• modified: lib/ninix/install.rb
• modified: lib/ninix/sstp.rb
• modified: lib/ninix/sstplib.rb
• add: test/test-install.rb
• add: test/test-sakura-vanish.rb
• add: test/test-sstp.rb
• add: test/test-sstplib.rb

Diff

--- a/lib/ninix/install.rb
+++ b/lib/ninix/install.rb
@@ -3,7 +3,7 @@
 #  install.py - an installer module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2014 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2015 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -820,8 +820,3 @@ module Install
     end
   end
 end
-
-#installer = Install::Installer.new()
-##archive = "/home/shy/ukagaka/Ghost/Anko/Anko_re.nar"
-#archive = "http://altenotiz.sakura.ne.jp/ghost/exice_z102.zip"
-#installer.install(archive, "/home/shy/TEST")

--- a/lib/ninix/sstp.rb
+++ b/lib/ninix/sstp.rb
@@ -594,72 +594,4 @@ module SSTP
       return sentence
     end
   end
-
-  class TEST
-
-    def initialize
-      port = 9801
-      sstpd = SSTPServer.new(port)
-      sstpd.set_responsible(self)
-#      @request_handler = nil
-      print('Serving SSTP on port ' + port.to_i.to_s + ' ...' + "\n")
-      opt = sstpd.getsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR)
-      print('Allow reuse address: ' + opt.int.to_s + "\n")
-      @cantalk = 0
-      while true
-        s = sstpd.accept
-        handler = SSTPRequestHandler.new(sstpd, s)
-        buffer = s.gets
-        handler.handle(buffer)
-        if sstpd.has_request_handler
-          #sstpd.send_answer("TEST")
-          #sstpd.send_no_content
-          #sstpd.send_sstp_break
-          #sstpd.send_response(511)
-          sstpd.send_timeout
-        end
-        s.close
-      end
-      #serv.shutdown_request("TEST")
-    end
-
-#    def has_request_handler
-#      if @request_handler != nil
-#        return true
-#      else
-#        return false
-#      end
-#    end
-#
-#    def set_request_handler(handler) ## FIXME
-#      @request_handler = handler
-#    end
-
-    def handle_request(event, *args)
-      if event == "GET"
-        print("ARGS: ", args, "\n")
-        if args[0] == "get_sakura_cantalk"
-#          print("CANTALK :", @cantalk, "\n")
-          if @cantalk == 1
-            @cantalk = 0
-            return true
-          else
-            @cantalk = 1
-            return false
-          end
-        elsif args[0] == "get_ghost_names"
-          return ["A", "B", "C"]
-        elsif args[0] == "check_request_queue"
-          return [100, 200]
-        else
-          return "日本語テスト"
-        end
-      elsif event == "NOTIFY"
-        print("NOTIFY: ", args, "\n")
-        return 1
-      end
-    end
-  end
 end
-
-SSTP::TEST.new

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -178,29 +178,4 @@ module SSTPLib
                t[2], m, t[0], t[3], t[4], t[5], (-time.timezone / 36).to_i)
     end
   end
-
-
-  class TEST
-
-    def initialize(port = 9801)
-      sstpd = SSTPServer.new('', port)
-      print('Serving SSTP on port ' + port.to_i.to_s + ' ...' + "\n")
-      opt = sstpd.getsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR)
-      print('Allow reuse address: ' + opt.int.to_s + "\n")
-      while true
-        s = sstpd.accept
-        handler = BaseSSTPRequestHandler.new(self, s)
-        buffer = s.gets
-        handler.handle(buffer)
-        s.close
-      end
-    end
-
-    def request_parent(args)
-      print("ARGS: ", args, "\n")
-      return 1
-    end
-  end
 end
-
-SSTPLib::TEST.new

--- /dev/null
+++ b/test/test-install.rb
@@ -0,0 +1,16 @@
+require "ninix/install"
+
+module NinixTest
+
+  class InstallTest
+
+    def initialize
+      installer = Install::Installer.new()
+      archive = File.expand_path("~/ukagaka/Ghost/Anko/Anko_re.nar")
+      #archive = "http://altenotiz.sakura.ne.jp/ghost/exice_z102.zip"
+      installer.install(archive, File.expand_path("~/TEST"))
+    end
+  end
+end
+
+NinixTest::InstallTest.new

--- /dev/null
+++ b/test/test-sakura-vanish.rb
@@ -0,0 +1,24 @@
+require "ninix/sakura"
+
+module NinixTest
+
+  class VanishTest
+
+    def initialize
+      dialog = Sakura::VanishDialog.new
+      dialog.set_responsible(self)
+      dialog.set_message("test")
+      dialog.show()
+      Gtk.main
+    end
+
+    def handle_request(event_type, event, *arglist, **argdict)
+      if event_type == "NOTIFY"
+        print("NOTIFY: ", event, "\n")
+      end
+    end
+  end
+end
+
+test = NinixTest::VanishTest.new
+test.do_tests

--- /dev/null
+++ b/test/test-sstp.rb
@@ -0,0 +1,73 @@
+# coding: utf-8
+require "ninix/sstp"
+
+module NinixTest
+
+  class SSTPTest
+
+    def initialize
+      port = 9801
+      sstpd = SSTP::SSTPServer.new(port)
+      sstpd.set_responsible(self)
+#      @request_handler = nil
+      print('Serving SSTP on port ' + port.to_i.to_s + ' ...' + "\n")
+      opt = sstpd.getsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR)
+      print('Allow reuse address: ' + opt.int.to_s + "\n")
+      @cantalk = 0
+      while true
+        s = sstpd.accept
+        handler = SSTP::SSTPRequestHandler.new(sstpd, s)
+        buffer = s.gets
+        handler.handle(buffer)
+        if sstpd.has_request_handler
+          #sstpd.send_answer("TEST")
+          #sstpd.send_no_content
+          #sstpd.send_sstp_break
+          #sstpd.send_response(511)
+          sstpd.send_timeout
+        end
+        s.close
+      end
+      #serv.shutdown_request("TEST")
+    end
+
+#    def has_request_handler
+#      if @request_handler != nil
+#        return true
+#      else
+#        return false
+#      end
+#    end
+#
+#    def set_request_handler(handler) ## FIXME
+#      @request_handler = handler
+#    end
+
+    def handle_request(event, *args)
+      if event == "GET"
+        print("ARGS: ", args, "\n")
+        if args[0] == "get_sakura_cantalk"
+#          print("CANTALK :", @cantalk, "\n")
+          if @cantalk == 1
+            @cantalk = 0
+            return true
+          else
+            @cantalk = 1
+            return false
+          end
+        elsif args[0] == "get_ghost_names"
+          return ["A", "B", "C"]
+        elsif args[0] == "check_request_queue"
+          return [100, 200]
+        else
+          return "日本語テスト"
+        end
+      elsif event == "NOTIFY"
+        print("NOTIFY: ", args, "\n")
+        return 1
+      end
+    end
+  end
+end
+
+NinixTest::SSTPTest.new

--- /dev/null
+++ b/test/test-sstplib.rb
@@ -0,0 +1,28 @@
+require "ninix/sstplib"
+
+module NinixTest
+
+  class SSTPLibTest
+
+    def initialize(port = 9801)
+      sstpd = SSTPLib::SSTPServer.new('', port)
+      print('Serving SSTP on port ' + port.to_i.to_s + ' ...' + "\n")
+      opt = sstpd.getsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR)
+      print('Allow reuse address: ' + opt.int.to_s + "\n")
+      while true
+        s = sstpd.accept
+        handler = SSTPLib::BaseSSTPRequestHandler.new(self, s)
+        buffer = s.gets
+        handler.handle(buffer)
+        s.close
+      end
+    end
+
+    def request_parent(args)
+      print("ARGS: ", args, "\n")
+      return 1
+    end
+  end
+end
+
+NinixTest::SSTPLibTest.new