unageanu-jiji 1.0.3 → 1.1.0

data/test/test_BackTestCollector.rb

@@ -2,15 +2,15 @@
 
 $: << "../lib"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
-require "jiji/configuration"
-require "jiji/collector"
-require "jiji/operator"
-require "jiji/observer"
-require "jiji/single_click_client"
-require "testutils.rb"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/configuration'
+require 'jiji/collector'
+require 'jiji/operator'
+require 'jiji/observer'
+require 'jiji/plugin/securities_plugin'
+require 'test_utils'
 require 'logger'
 require 'csv'
 require 'date'
@@ -26,13 +26,12 @@ class BackTestCollectorTest <  RUNIT::TestCase
     @dir = File.dirname(__FILE__) + "/BackCollectorTest"
 
     @logger = Logger.new STDOUT
-    @client = JIJI::SingleClickClient.new( ACCOUNT, CONF, @logger )
+    @client = Test::MockClient.new
     @rate_dao = JIJI::Dao::RateDao.new( @dir )
   end
 
   # 後始末
   def teardown
-    @client.close
   end
 
   # 通常のログを使ったテスト
@@ -147,15 +146,8 @@ class BackTestCollectorTest <  RUNIT::TestCase
 
       # リクエストの送付でエラーになる。
       class << c.client
-        def request
-          super {|fx|
-            class << fx
-              def list_currency_pairs
-                raise "test  list_rates ."
-              end
-            end
-            yield fx
-          }
+        def list_pairs
+          raise "test  list_rates ."
         end
       end
 

data/test/test_Collector.rb

@@ -2,16 +2,15 @@
 
 $: << "../lib"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
-require "jiji/configuration"
-require "jiji/collector"
-require "jiji/operator"
-require "jiji/observer"
-require "jiji/single_click_client"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/configuration'
+require 'jiji/collector'
+require 'jiji/operator'
+require 'jiji/observer'
 require 'jiji/dao/rate_dao'
-require "testutils.rb"
+require 'test_utils'
 require 'logger'
 require 'csv'
 
@@ -22,12 +21,12 @@ class CollectorTest <  RUNIT::TestCase
 
   # 前準備
   def setup
-
     @dir = File.dirname(__FILE__) + "/CollectorTest.tmp"
+    FileUtils.rm_rf @dir if File.exist?( @dir )
     FileUtils.mkdir_p @dir
 
     @logger = Logger.new STDOUT
-    @client = JIJI::SingleClickClient.new( ACCOUNT, CONF, @logger )
+    @client = Test::MockClient.new
 
     @c = JIJI::Collector.new
     @c.logger = @logger
@@ -37,7 +36,6 @@ class CollectorTest <  RUNIT::TestCase
 
   # 後始末
   def teardown
-    @client.close
     FileUtils.rm_rf @dir
   end
 
@@ -78,14 +76,14 @@ class CollectorTest <  RUNIT::TestCase
       date = Time.now.strftime("%Y-%m-%d")
 
       count = 0
-      CSV.open("#{@dir}/AUDJPY/raw/#{date}.csv", 'r') {|row|
+      CSV.open("#{@dir}/EURJPY/raw/#{date}.csv", 'r') {|row|
         assert_equals row.length, 6
         count += 1
       }
       assert_equals count > 0, true
 
       count = 0
-      CSV.open("#{@dir}/AUDJPY/5s/#{date}.csv", 'r') {|row|
+      CSV.open("#{@dir}/EURJPY/5s/#{date}.csv", 'r') {|row|
         assert_equals row.length, 19
         count += 1
       }
@@ -164,15 +162,8 @@ class CollectorTest <  RUNIT::TestCase
 
       # リクエストの送付でエラーになる。
       class << @c.client
-        def request
-          super {|fx|
-            class << fx
-              def list_currency_pairs
-                raise "test  list_rates ."
-              end
-            end
-            yield fx
-          }
+        def list_pairs
+          raise "test  list_rates ."
         end
       end
 
@@ -210,15 +201,8 @@ class CollectorTest <  RUNIT::TestCase
 
       # レートの取得でエラーになる。
       class << @c.client
-        def request
-          super {|fx|
-            class << fx
-              def list_rates
-                raise "test  list_rates ."
-              end
-            end
-            yield fx
-          }
+        def list_rates
+          raise "test  list_rates ."
         end
       end
 

data/test/test_Configuration.rb

@@ -3,9 +3,9 @@
 $: << "../lib"
 
 
-require "runit/testcase"
-require "runit/cui/testrunner"
-require "jiji/configuration"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/configuration'
 
 class ConfigurationTest <  RUNIT::TestCase
 

data/test/test_Operator.rb

@@ -2,17 +2,17 @@
 
 $: << "../lib"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
-require "jiji/operator"
-require "jiji/collector"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/operator'
+require 'jiji/collector'
 require 'jiji/agent/agent'
 require 'jiji/agent/agent_manager'
 require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
-require "testutils"
+require 'test_utils'
 
 class OperatorTest <  RUNIT::TestCase
 
@@ -29,7 +29,7 @@ class OperatorTest <  RUNIT::TestCase
   def test_basic
 
     pair_infos = {
-      ClickClient::FX::EURJPY => Info.new( 10000 )
+      :EURJPY => Info.new( 10000 )
     }
 
     # 初期状態は建玉,損益共に0
@@ -308,7 +308,7 @@ class OperatorTest <  RUNIT::TestCase
   def test_stop
 
     pair_infos = {
-      ClickClient::FX::EURJPY => Info.new( 10000 )
+      :EURJPY => Info.new( 10000 )
     }
 
     # レートを挿入
@@ -374,7 +374,7 @@ class OperatorTest <  RUNIT::TestCase
   def test_swap
 
     pair_infos = {
-      ClickClient::FX::EURJPY => Info.new( 10000 )
+      :EURJPY => Info.new( 10000 )
     }
 
     # レートを挿入

data/test/test_Output.rb

@@ -2,9 +2,8 @@
 
 $: << "../lib"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/output'
 require 'fileutils'
 

data/test/test_Output_registry.rb

@@ -3,11 +3,11 @@
 $: << "../lib"
 
 
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/registry'
-require "logger"
-require "testutils"
+require 'logger'
+require 'test_utils'
 
 # アウトプットのテスト(レジストリから取り出す)
 class OutputregistryTest <  RUNIT::TestCase
@@ -17,6 +17,7 @@ class OutputregistryTest <  RUNIT::TestCase
   def setup
     @dir = File.dirname(__FILE__) + "/OutputregistryTest"
     @registry = JIJI::Registry.new(@dir , nil)
+    @registry.plugin_loader.load
     @mng = @registry[:process_manager]
   end
 
@@ -26,15 +27,14 @@ class OutputregistryTest <  RUNIT::TestCase
       begin
         @registry.permitter.close
       ensure
-        begin
-          @registry.client.close
-        ensure
-          @registry.server_logger.close
-        end
+        @registry.server_logger.close
       end
     ensure
+      FileUtils.rm_rf "#{@dir}/agents"
       FileUtils.rm_rf "#{@dir}/logs"
       FileUtils.rm_rf "#{@dir}/process_logs"
+      FileUtils.rm_rf "#{@dir}/rate_datas"
+      FileUtils.rm_rf "#{@dir}/shared_lib"
     end
   end
 

data/test/test_Process.rb

@@ -2,17 +2,17 @@
 
 $: << "../lib"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
-require "jiji/process"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/process'
 require 'jiji/agent/agent'
 require 'jiji/agent/agent_manager'
 require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
-require "logger"
-require "testutils"
+require 'logger'
+require 'test_utils'
 
 # プロセスのテスト
 class ProcessTest <  RUNIT::TestCase

data/test/test_ProcessManager.rb

@@ -24,11 +24,11 @@ def Thread.new(*args, &b)
   }
 end
 
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/registry'
-require "logger"
-require "testutils"
+require 'logger'
+require 'test_utils'
 
 # プロセスマネージャのテスト
 class ProcessManagerTest <  RUNIT::TestCase
@@ -37,7 +37,10 @@ class ProcessManagerTest <  RUNIT::TestCase
 
   def setup
     @dir = File.dirname(__FILE__) + "/ProcessManagerTest"
+    FileUtils.rm_rf "#{@dir}/logs"
+    FileUtils.rm_rf "#{@dir}/process_logs"
     @registry = JIJI::Registry.new(@dir , nil)
+    @registry.plugin_loader.load
     @mng = @registry[:process_manager]
   end
 
@@ -48,7 +51,6 @@ class ProcessManagerTest <  RUNIT::TestCase
         @registry.permitter.close
       ensure
         begin
-          @registry.client.close
         ensure
           @registry.server_logger.close
         end
@@ -60,6 +62,7 @@ class ProcessManagerTest <  RUNIT::TestCase
     ensure
       FileUtils.rm_rf "#{@dir}/logs"
       FileUtils.rm_rf "#{@dir}/process_logs"
+      FileUtils.rm_rf "#{@dir}/shared_lib"
     end
   end
 
@@ -337,16 +340,15 @@ class ProcessManagerTest <  RUNIT::TestCase
   def recreate_registry
     begin
       @mng.stop
-       begin
-         @registry.permitter.close
+    ensure
+      begin
+        @registry.permitter.close
       ensure
         begin
-          @registry.client.close
         ensure
           @registry.server_logger.close
         end
       end
-    ensure
       return @registry = JIJI::Registry.new(@dir , nil)
     end
   end

data/test/test_utils.rb

@@ -0,0 +1,49 @@
+
+$: << "../lib"
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'jiji/configuration'
+require 'jiji/plugin/securities_plugin'
+require 'fileutils'
+require 'logger'
+require 'jiji/util/json_rpc_requestor'
+
+# テスト用ユーティリティなど。
+module Test
+  module Constants
+    
+    USER="<user-name>"
+    PASSWORD="<password>"
+    
+    # テスト用設定値
+    CONF = JIJI::Configuration.new
+    
+    Info = Struct.new( :trade_unit )
+    Rate = Struct.new( :bid, :ask, :sell_swap, :buy_swap, :date )    
+      
+  end
+  
+  # テスト用クライアント
+  class MockClient
+    include JIJI::Plugin::SecuritiesPlugin
+    def plugin_id; :mock end
+    def list_pairs
+      [ Pair.new( :EURJPY, 10000 ), Pair.new( :USDJPY, 10000 ) ]
+    end
+    def list_rates
+      {:EURJPY=>Rate.new( 102.01, 102.05, 100, -100 ),
+       :USDJPY=>Rate.new( 102.01, 102.05, 100, -100 )}
+    end
+  end
+  
+  # サービスのテストの抽象基底クラス
+  class AbstractServiceTest < RUNIT::TestCase
+    def setup
+    end
+    def teardown
+    end
+  end
+  
+end

data/test/{test_BlockToSession.rb → util/test_BlockToSession.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
-
+$: << "../../lib"
+$: << "../"
 
 require "runit/testcase"
 require "runit/cui/testrunner"
@@ -11,12 +11,7 @@ require 'csv'
 
 class BlockToSessionTest <  RUNIT::TestCase
   
-  def setup
-  end
-
-  def teardown
-  end
-
+  # 基本動作のテスト 
   def test_basic
     
     buff = ""
@@ -57,8 +52,19 @@ class BlockToSessionTest <  RUNIT::TestCase
     rescue Exception
     end
     
+    assert_equals "result3", s.request {|a,b,log|
+      log << "#{a}.#{b}.req."
+      "result3"
+    }
+    assert_equals buff, "start.a.b.wait.a.b.req.a.b.req.a.b.req."
+    assert_equals "result4", s.request {|a,b,log|
+      log << "#{a}.#{b}.req."
+      "result4"
+    }
+    assert_equals buff, "start.a.b.wait.a.b.req.a.b.req.a.b.req.a.b.req."
+    
     s.close
-    assert_equals buff, "start.a.b.wait.a.b.req.a.b.req.end."
+    assert_equals buff, "start.a.b.wait.a.b.req.a.b.req.a.b.req.a.b.req.end."
     
   end
 
@@ -71,4 +77,46 @@ class BlockToSessionTest <  RUNIT::TestCase
     end
   end
 
+  # 基本動作のテスト
+  def test_error_session
+    s = create_session
+    begin
+      s.request {|x| x.call }
+      fail
+    rescue
+      s.close
+      s = create_session
+      begin
+        s.request {|x| x.call }
+        fail
+      rescue
+      end
+    end
+    
+    begin
+      s.request {|x| x.call }
+      fail
+    rescue 
+    end
+  
+  end
+
+  def create_session
+      return Session.new { |wait|
+          wait.call( ErrorSession.new( "test" ) )
+      }
+  end
+
+
+  #接続エラー時に使用するセッション
+  #常にエラーをスローする。
+  class ErrorSession
+    def initialize(error)
+      @error = error
+    end
+    def method_missing(name, *args, &block)
+      raise @error
+    end
+  end
+
 end

data/test/{test_CSV.rb → util/test_CSV.rb}

@@ -1,10 +1,10 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/util/csv_append_support'
 require 'fileutils'
 
@@ -15,7 +15,7 @@ class CSVTest <  RUNIT::TestCase
     FileUtils.mkdir_p @dir    
   end
 
-  def teardown
+  def teardown 
     FileUtils.rm_rf @dir
   end
 

data/test/{test_SynchronizeInterceptor.rb → util/test_SynchronizeInterceptor.rb}

@@ -1,9 +1,11 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'rubygems'
 require 'needle'
 require 'jiji/util/synchronize_interceptor'