Commit: 6a2e7ca7ed81b35663018e2c6b4e1e9ad28a6c55 - ruby-gtk3 (git)

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

Commit MetaInfo

• Revisão: 6a2e7ca7ed81b35663018e2c6b4e1e9ad28a6c55 (tree)
• Hora: 2015-03-14 17:36:52
• Autor: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Mensagem de Log

split test code to separate files(3)

Mudança Sumário

• modified: lib/ninix/balloon.rb
• modified: lib/ninix/home.rb
• modified: lib/ninix/ngm.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/seriko.rb
• modified: lib/ninix/version.rb
• add: test/test-balloon.rb
• add: test/test-home.rb
• add: test/test-ngm.rb
• add: test/test-pix.rb
• add: test/test-seriko.rb

Diff

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -2,7 +2,7 @@
 #
 #  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
@@ -1971,41 +1971,4 @@ module Balloon
       @entry.set_visibility(false)
     end
   end
-
-
-  class TEST
-
-    def initialize
-      require "ninix/home"
-      balloons = Home.search_balloons()
-      key = balloons.keys.sample
-#      print(key, balloons[key], "\n")
-      balloon = Balloon.new
-      balloon.set_responsible(self)
-      balloon.new_(*balloons[key])
-      balloon.set_balloon(0, 0)
-      balloon.set_balloon(1, 0)
-      balloon.set_position(0, 200, 200)
-      balloon.set_position(1, 100, 100)
-      balloon.show(0)
-      balloon.show(1)
-      balloon.show_sstp_message("TEST: SSTP", "TEST class")
-      for i in 0..20
-        balloon.append_text(0, "TEST: SAKURA")
-      end
-      balloon.append_text(1, "TEST: KERO")
-      Gtk.main
-    end
-
-    def handle_request(event_type, event, *arglist, **argdict)
-      if event == 'lock_repaint'
-        return false
-      else
-        return 100 # XXX
-      end
-    end
-
-  end
 end
-
-Balloon::TEST.new()

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -2,7 +2,7 @@
 #
 #  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]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -73,7 +73,7 @@ module Home
         basename = File.basename(filename, ".*")
         ext = File.extname(filename)
         ext = ext.downcase
-        if ['.py', '.pyc'].include?(ext)
+        if ['.rb'].include?(ext)
           name = basename
         end
         if name and not table.include?(name)
@@ -914,128 +914,4 @@ module Home
     menu_items << ['Uninstall', []]
     return plugin_name, plugin_dir, startup, menu_items
   end
-
-###   TEST   ###
-
-  class Test
-
-    def initialize(path)
-      re_alias = Regexp.new('^(sakura|kero|char[0-9]+)\.surface\.alias$') # XXX
-      config = Home.load_config()
-      if config == nil
-        raise SystemExit('Home directory not found.\n')
-      end
-      ghosts, balloons, plugins, nekoninni, katochan, kinoko = config
-      # ghosts
-      for key in ghosts.keys
-        desc, shiori_dir, use_makoto, surface_set, prefix, shiori_dll, shiori_name = ghosts[key]
-        print('GHOST ', '=' * 50, "\n")
-        print("'", prefix, "'", "\n")
-        for k, v in desc.each_entry
-          print(k, ',', v, "\n")
-        end
-        print("\n")
-        print("'", shiori_dir, "'", "\n")
-        print(shiori_dll, "\n")
-        print(shiori_name, "\n")
-        print('use_makoto = ', use_makoto, "\n")
-        if surface_set
-          for name, surface_dir, desc, alias_, surface, tooltips in surface_set.values()
-            print('-' * 50, "\n")
-            print('surface: ', name, "\n")
-            for k, v in desc.each_entry
-              print(k, ',', v, "\n")
-            end
-            print("\n")
-            for k, v in surface.each_entry
-              print(k, ' = ', "'", v[0], "'", "\n")
-              if not v[1].empty?
-                for k1, v1 in v[1].each_entry
-                  print(k1, ',', v1, "\n")
-                end
-              end
-              print("\n")
-            end
-            if alias_
-              buf = []
-              for k, v in alias_.each_entry
-                match = re_alias.match(k)
-                if match
-                  print([k, ':'].join(''), "\n")
-                  for alias_id, alias_list in v.each_entry
-                    print(alias_id, \
-                          [' = [', alias_list.join(', '), ']'].join(''), "\n")
-                  end
-                  print("\n")
-                else
-                  buf << [k, v]
-                end
-              end
-              if not buf.empty?
-                print('filename alias:', "\n")
-                for k, v in buf
-                  print(k, ' = ', v, "\n")
-                end
-                print("\n")
-              end
-            end
-          end
-        end
-      end
-      # balloons
-      for key in balloons.keys
-        desc, balloon = balloons[key]
-        print('BALLOON ', '=' * 50, "\n")
-        for k, v in desc.each_entry
-          print(k, ',', v, "\n")
-        end
-        print("\n")
-        for k, v in balloon.each_entry
-          print(k, ' = ', v[0], "\n")
-          if not v[1].empty?
-            for k1, v1 in v[1].each_entry
-              print(k1, ',', v1, "\n")
-            end
-          end
-          print("\n")
-        end
-      end
-      # plugins
-      for plugin_name, plugin_dir, startup, menu_items in plugins
-        print('PLUGIN ', '=' * 50, "\n")
-        print('name = ', plugin_name, "\n")
-        if startup
-          print('startup = ', ['["', startup.join('", "'), '"]'].join(''), "\n")
-        end
-        for label, argv in menu_items
-          print("menuitem ", "'", label.to_s, "'", " = ", "\n")
-          print(['["', argv.join('", "'), '"]'].join(''), "\n")
-        end
-      end
-      # nekoninni
-      for nekoninni_name, nekoninni_dir in nekoninni
-        print('NEKONINNI ', '=' * 50, "\n")
-        print('name = ', nekoninni_name, "\n")
-        print("'", nekoninni_dir, "'", "\n")
-      end
-      # katochan
-      for katochan_item in katochan
-        print('KATOCHAN ', '=' * 50, "\n")
-        for k, v in katochan_item.each_entry
-          print(k, ',', v, "\n")
-        end
-      end
-      # kinoko
-      for kinoko_item in kinoko
-        print('KINOKO ', '=' * 50, "\n")
-        for k, v in kinoko_item.each_entry
-          print(k, ',', v, "\n")
-        end
-      end
-    end
-  end
 end
-
-$:.unshift(File.dirname(__FILE__))
-
-Home::Test.new(ARGV.shift)

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001-2004 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2004-2014 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2015 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -932,20 +932,4 @@ module NGM
       @parent.handle_request('NOTIFY', 'update_sakura', self.get('Name'), 'NGM')
     end
   end
-
-  class TEST
-
-    def initialize
-      ngm = NGM.new()
-      ngm.set_responsible(self)
-      ngm.show_dialog()
-      Gtk.main
-    end
-
-    def handle_request(event_type, event, *arglist, **argdict)
-      return ''
-    end
-  end
 end
-
-NGM::TEST.new

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2003-2014 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2015 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -351,42 +351,4 @@ module Pix
     left, top, width, height = root.geometry
     return left, top, width, height
   end
-
-  class TEST
-
-    def initialize(path)
-      @win = Pix::TransparentWindow.new
-      @win.signal_connect('destroy') do
-        Gtk.main_quit
-      end
-      @win.darea.signal_connect('draw') do |w, cr|
-        expose_cb(w, cr)
-      end
-      @surface = Pix.create_surface_from_file(path, true, true)
-      @win.set_default_size(@surface.width, @surface.height)
-      @win.show_all
-      Gtk.main
-    end
-
-    def expose_cb(widget, cr)
-      cr.set_source(@surface, 0, 0)
-      cr.set_operator(Cairo::OPERATOR_SOURCE)
-      cr.paint
-      region = Cairo::Region.new()
-      data = @surface.data
-      for i in 0..(data.size / 4 - 1)
-        if (data[i * 4 + 3].ord) != 0
-          x = i % @surface.width
-          y = i / @surface.width
-          region.union!(x, y, 1, 1)
-        end
-      end
-      @win.input_shape_combine_region(region)
-    end
-  end
 end
-
-
-$:.unshift(File.dirname(__FILE__))
-
-Pix::TEST.new(ARGV.shift)

--- a/lib/ninix/seriko.rb
+++ b/lib/ninix/seriko.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 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]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -920,39 +920,4 @@ ed)', "\n")
     mayuna = temp
     return mayuna
   end
-
-
-  class TEST
-
-    # find ~/.ninix -name 'surface*a.txt' | xargs ruby seriko.rb
-    def initialize(list_path)
-      require "ninix/config"
-#      if len(sys.argv) == 1
-#        print('Usage:', sys.argv[0], '[surface??a.txt ...]')
-#      end
-      for filename in list_path
-        print('Reading', filename, '...', "\n")
-        for actor in Seriko.get_actors(NConfig.create_from_file(filename))
-          print('#', actor.get_id().to_i.to_s, "\n")
-          #print(actor.__class__.__name__,)
-          print('(', actor.get_interval(), ')', "\n")
-          print('number of patterns = ', actor.get_patterns().length, "\n")
-          for pattern in actor.get_patterns()
-            print('surface=', pattern[0], ', interval=', pattern[1].to_i.to_s, ', method=', pattern[2], ', args=', pattern[3], "\n")
-          end
-        end
-        for actor in Seriko.get_mayuna(NConfig.create_from_file(filename))
-          print('#', actor.get_id().to_i.to_s, "\n")
-          #print(actor.__class__.__name__,)
-          print('(', actor.get_interval(), ')', "\n")
-          print('number of patterns =', actor.get_patterns().length, "\n")
-          for pattern in actor.get_patterns()
-            print('surface=', pattern[0], ', interval=', pattern[1].to_i.to_s, ', method=', pattern[2], ', args=', pattern[3], "\n")
-          end
-        end
-      end
-    end
-  end
 end
-
-Seriko::TEST.new(ARGV)

--- a/lib/ninix/version.rb
+++ b/lib/ninix/version.rb
@@ -35,7 +35,7 @@ module Version
       '\_q' +
       'Copyright (c) 2001, 2002 Tamito KAJIYAMA\n' +
       'Copyright (c) 2002-2006 MATSUMURA Namihiko\n' +
-      'Copyright (c) 2002-2014 Shyouzou Sugitani\n' +
+      'Copyright (c) 2002-2015 Shyouzou Sugitani\n' +
       'Copyright (c) 2002, 2003 ABE Hideaki\n' +
       'Copyright (c) 2003-2005 Shun-ichi TAHARA\e'
   end

--- /dev/null
+++ b/test/test-balloon.rb
@@ -0,0 +1,40 @@
+require "ninix/home"
+require "ninix/balloon"
+
+module NinixTest
+
+  class BalloonTest
+
+    def initialize
+      balloons = Home.search_balloons()
+      key = balloons.keys.sample
+#      print(key, balloons[key], "\n")
+      balloon = Balloon::Balloon.new
+      balloon.set_responsible(self)
+      balloon.new_(*balloons[key])
+      balloon.set_balloon(0, 0)
+      balloon.set_balloon(1, 0)
+      balloon.set_position(0, 200, 200)
+      balloon.set_position(1, 100, 100)
+      balloon.show(0)
+      balloon.show(1)
+      balloon.show_sstp_message("TEST: SSTP", "TEST class")
+      for i in 0..20
+        balloon.append_text(0, "TEST: SAKURA")
+      end
+      balloon.append_text(1, "TEST: KERO")
+      Gtk.main
+    end
+
+    def handle_request(event_type, event, *arglist, **argdict)
+      if event == 'lock_repaint'
+        return false
+      else
+        return 100 # XXX
+      end
+    end
+
+  end
+end
+
+NinixTest::BalloonTest.new()

--- /dev/null
+++ b/test/test-home.rb
@@ -0,0 +1,126 @@
+require "ninix/home"
+
+module NinixTest
+
+  class HomeTest
+
+    def initialize(path)
+      re_alias = Regexp.new('^(sakura|kero|char[0-9]+)\.surface\.alias$') # XXX
+      config = Home.load_config()
+      if config == nil
+        raise SystemExit('Home directory not found.\n')
+      end
+      ghosts, balloons, plugins, nekoninni, katochan, kinoko = config
+      # ghosts
+      for key in ghosts.keys
+        desc, shiori_dir, use_makoto, surface_set, prefix, shiori_dll, shiori_name = ghosts[key]
+        print('GHOST ', '=' * 50, "\n")
+        print("'", prefix, "'", "\n")
+        for k, v in desc.each_entry
+          print(k, ',', v, "\n")
+        end
+        print("\n")
+        print("'", shiori_dir, "'", "\n")
+        print(shiori_dll, "\n")
+        print(shiori_name, "\n")
+        print('use_makoto = ', use_makoto, "\n")
+        if surface_set
+          for name, surface_dir, desc, alias_, surface, tooltips in surface_set.values()
+            print('-' * 50, "\n")
+            print('surface: ', name, "\n")
+            for k, v in desc.each_entry
+              print(k, ',', v, "\n")
+            end
+            print("\n")
+            for k, v in surface.each_entry
+              print(k, ' = ', "'", v[0], "'", "\n")
+              if not v[1].empty?
+                for k1, v1 in v[1].each_entry
+                  print(k1, ',', v1, "\n")
+                end
+              end
+              print("\n")
+            end
+            if alias_
+              buf = []
+              for k, v in alias_.each_entry
+                match = re_alias.match(k)
+                if match
+                  print([k, ':'].join(''), "\n")
+                  for alias_id, alias_list in v.each_entry
+                    print(alias_id, \
+                          [' = [', alias_list.join(', '), ']'].join(''), "\n")
+                  end
+                  print("\n")
+                else
+                  buf << [k, v]
+                end
+              end
+              if not buf.empty?
+                print('filename alias:', "\n")
+                for k, v in buf
+                  print(k, ' = ', v, "\n")
+                end
+                print("\n")
+              end
+            end
+          end
+        end
+      end
+      # balloons
+      for key in balloons.keys
+        desc, balloon = balloons[key]
+        print('BALLOON ', '=' * 50, "\n")
+        for k, v in desc.each_entry
+          print(k, ',', v, "\n")
+        end
+        print("\n")
+        for k, v in balloon.each_entry
+          print(k, ' = ', v[0], "\n")
+          if not v[1].empty?
+            for k1, v1 in v[1].each_entry
+              print(k1, ',', v1, "\n")
+            end
+          end
+          print("\n")
+        end
+      end
+      # plugins
+      for plugin_name, plugin_dir, startup, menu_items in plugins
+        print('PLUGIN ', '=' * 50, "\n")
+        print('name = ', plugin_name, "\n")
+        if startup
+          print('startup = ', ['["', startup.join('", "'), '"]'].join(''), "\n")
+        end
+        for label, argv in menu_items
+          print("menuitem ", "'", label.to_s, "'", " = ", "\n")
+          print(['["', argv.join('", "'), '"]'].join(''), "\n")
+        end
+      end
+      # nekoninni
+      for nekoninni_name, nekoninni_dir in nekoninni
+        print('NEKONINNI ', '=' * 50, "\n")
+        print('name = ', nekoninni_name, "\n")
+        print("'", nekoninni_dir, "'", "\n")
+      end
+      # katochan
+      for katochan_item in katochan
+        print('KATOCHAN ', '=' * 50, "\n")
+        for k, v in katochan_item.each_entry
+          print(k, ',', v, "\n")
+        end
+      end
+      # kinoko
+      for kinoko_item in kinoko
+        print('KINOKO ', '=' * 50, "\n")
+        for k, v in kinoko_item.each_entry
+          print(k, ',', v, "\n")
+        end
+      end
+    end
+  end
+end
+
+$:.unshift(File.dirname(__FILE__))
+
+NinixTest::HomeTest.new(ARGV.shift)

--- /dev/null
+++ b/test/test-ngm.rb
@@ -0,0 +1,20 @@
+require "ninix/ngm"
+
+module NinixTest
+
+  class NGMTest
+
+    def initialize
+      ngm = NGM::NGM.new()
+      ngm.set_responsible(self)
+      ngm.show_dialog()
+      Gtk.main
+    end
+
+    def handle_request(event_type, event, *arglist, **argdict)
+      return ''
+    end
+  end
+end
+
+NinixTest::NGMTest.new

--- /dev/null
+++ b/test/test-pix.rb
@@ -0,0 +1,42 @@
+require "ninix/pix"
+
+module NinixTest
+
+  class PixTest
+
+    def initialize(path)
+      @win = Pix::TransparentWindow.new
+      @win.signal_connect('destroy') do
+        Gtk.main_quit
+      end
+      @win.darea.signal_connect('draw') do |w, cr|
+        expose_cb(w, cr)
+      end
+      @surface = Pix.create_surface_from_file(path, true, true)
+      @win.set_default_size(@surface.width, @surface.height)
+      @win.show_all
+      Gtk.main
+    end
+
+    def expose_cb(widget, cr)
+      cr.set_source(@surface, 0, 0)
+      cr.set_operator(Cairo::OPERATOR_SOURCE)
+      cr.paint
+      region = Cairo::Region.new()
+      data = @surface.data
+      for i in 0..(data.size / 4 - 1)
+        if (data[i * 4 + 3].ord) != 0
+          x = i % @surface.width
+          y = i / @surface.width
+          region.union!(x, y, 1, 1)
+        end
+      end
+      @win.input_shape_combine_region(region)
+    end
+  end
+end
+
+
+$:.unshift(File.dirname(__FILE__))
+
+NinixTest::PixTest.new(ARGV.shift)

--- /dev/null
+++ b/test/test-seriko.rb
@@ -0,0 +1,38 @@
+require "ninix/config"
+require "ninix/seriko"
+
+module NinixTest
+
+  class SerikoTest
+
+    # find ~/.ninix -name 'surface*a.txt' | xargs ruby seriko.rb
+    def initialize(list_path)
+#      if len(sys.argv) == 1
+#        print('Usage:', sys.argv[0], '[surface??a.txt ...]')
+#      end
+      for filename in list_path
+        print('Reading', filename, '...', "\n")
+        for actor in Seriko.get_actors(NConfig.create_from_file(filename))
+          print('#', actor.get_id().to_i.to_s, "\n")
+          #print(actor.__class__.__name__,)
+          print('(', actor.get_interval(), ')', "\n")
+          print('number of patterns = ', actor.get_patterns().length, "\n")
+          for pattern in actor.get_patterns()
+            print('surface=', pattern[0], ', interval=', pattern[1].to_i.to_s, ', method=', pattern[2], ', args=', pattern[3], "\n")
+          end
+        end
+        for actor in Seriko.get_mayuna(NConfig.create_from_file(filename))
+          print('#', actor.get_id().to_i.to_s, "\n")
+          #print(actor.__class__.__name__,)
+          print('(', actor.get_interval(), ')', "\n")
+          print('number of patterns =', actor.get_patterns().length, "\n")
+          for pattern in actor.get_patterns()
+            print('surface=', pattern[0], ', interval=', pattern[1].to_i.to_s, ', method=', pattern[2], ', args=', pattern[3], "\n")
+          end
+        end
+      end
+    end
+  end
+end
+
+NinixTest::SerikoTest.new(ARGV)