unageanu-jiji 1.0.3 → 1.1.0

data/test/{test_AgentManager.rb → agent/test_AgentManager.rb}

@@ -1,21 +1,22 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/agent/agent'
 require 'jiji/agent/agent_manager'
 require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
-require "jiji/configuration"
-require "jiji/collector"
-require "jiji/dao/trade_result_dao"
-require "fileutils"
-require "testutils"
-require "logger"
+require 'jiji/configuration'
+require 'jiji/collector'
+require 'jiji/dao/trade_result_dao'
+require 'fileutils'
+require 'test_utils'
+require 'logger'
 
 # AgentManager のテスト
 class AgentManagerTest <  RUNIT::TestCase
@@ -33,12 +34,11 @@ class AgentManagerTest <  RUNIT::TestCase
     @permitter = JIJI::Permitter.new( 5, 0 )
     logger = Logger.new STDOUT
     logger = @permitter.proxy( logger, [/^(info|debug|warn|error|fatal)$/] )
-    @client = JIJI::SingleClickClient.new( ACCOUNT, CONF, logger )
-
+    
     @registry_mock = Object.new
     class << @registry_mock
       def output( agent_name, dir )
-        output = JIJI::Output.new( agent_name, "#{dir}/out" )
+        output = JIJI::Output.new( agent_name, "#{@dir}/#{dir}/out" )
         output = @permitter.proxy( output, [/^(get|each|put|<<)$/], [/^get$/] )
         return output
       end
@@ -48,21 +48,19 @@ class AgentManagerTest <  RUNIT::TestCase
     end
     @registry_mock.permitter = @permitter
 
-    operator = JIJI::RmtOperator.new( @client, logger, nil )
+    trade_result_dao = JIJI::Dao::TradeResultDao.new( "#{@dir}/trade_result" )
+    operator = JIJI::Operator.new( trade_result_dao )
     operator.conf = CONF
     operator = @permitter.proxy( operator, [/^(sell|buy|commit)$/],[/^(sell|buy)$/])
-    trade_result_dao = JIJI::Dao::TradeResultDao.new( "#{@dir}/trade_result" )
-
+    
     @m = JIJI::AgentManager.new( "test_agentManager", @registry, logger)
     @m.operator = operator
     @m.conf = CONF
     @m.trade_result_dao = trade_result_dao
-    @m.client = @client
     @m.registry = @registry_mock
   end
 
   def teardown
-    @client.close
     @permitter.close
     FileUtils.rm_rf @dir
   end
@@ -86,15 +84,15 @@ class AgentManagerTest <  RUNIT::TestCase
     agent1 = @registry.create( "Foo@foo.rb" )
     agent2 = @registry.create( "Foo@foo.rb" )
 
-    @m.add( "テスト", agent1 )
-    @m.add( "テスト2", agent2 )
+    @m.add( "test", agent1 )
+    @m.add( "test2", agent2 )
 
     # 追加直後はactive
-    assert_equals @m.on?( "テスト" ), true
-    assert_equals @m.on?( "テスト2" ), true
+    assert_equals @m.on?( "test" ), true
+    assert_equals @m.on?( "test2" ), true
 
     pair_infos = {
-      ClickClient::FX::EURJPY => Info.new( 10000 )
+      :EURJPY => Info.new( 10000 )
     }
     @m.next_rates( JIJI::Rates.new( pair_infos, {
       :EURJPY => Rate.new( 100.0,100.05,-200,200,100 )
@@ -110,9 +108,9 @@ class AgentManagerTest <  RUNIT::TestCase
     }
 
     # agent1をoff
-    @m.off( "テスト" )
-    assert_equals @m.on?( "テスト" ), false
-    assert_equals @m.on?( "テスト2" ), true
+    @m.off( "test" )
+    assert_equals @m.on?( "test" ), false
+    assert_equals @m.on?( "test2" ), true
     @m.next_rates( JIJI::Rates.new( pair_infos, {
       :EURJPY => Rate.new( 100.0,100.05,-200,200,100 )
     }))
@@ -124,9 +122,9 @@ class AgentManagerTest <  RUNIT::TestCase
     }
 
     # agent1を再度onにする
-    @m.on( "テスト" )
-    assert_equals @m.on?( "テスト" ), true
-    assert_equals @m.on?( "テスト2" ), true
+    @m.on( "test" )
+    assert_equals @m.on?( "test" ), true
+    assert_equals @m.on?( "test2" ), true
     @m.next_rates( JIJI::Rates.new( pair_infos, {
       :EURJPY => Rate.new( 100.0,100.05,-200,200,100 )
     }))
@@ -138,8 +136,8 @@ class AgentManagerTest <  RUNIT::TestCase
     }
 
     # agent1を削除
-    @m.remove( "テスト" )
-    assert_equals @m.on?( "テスト2" ), true
+    @m.remove( "test" )
+    assert_equals @m.on?( "test2" ), true
     @m.next_rates( JIJI::Rates.new( pair_infos, {
       :EURJPY => Rate.new( 100.0,100.05,-200,200,100 )
     }))
@@ -180,9 +178,9 @@ class AgentManagerTest <  RUNIT::TestCase
     end
 
     # エージェントの2重登録
-    @m.add( "テスト", TestAgent.new.taint )
+    @m.add( "test", TestAgent.new.taint )
     begin
-      @m.add( "テスト", TestAgent.new.taint )
+      @m.add( "test", TestAgent.new.taint )
       fail
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_ALREADY_EXIST, $!.code
@@ -216,10 +214,10 @@ class AgentManagerTest <  RUNIT::TestCase
           logger.error IOError.new
           logger.debug "test"
 
-#          p1 = operator.sell(1)
-#          p1.commit
-#          p2 = operator.buy(1)
-#          p2.commit
+          p1 = operator.sell(1)
+          p1.commit
+          p2 = operator.buy(1)
+          p2.commit
         end
         attr :log, true
       end
@@ -227,10 +225,10 @@ class AgentManagerTest <  RUNIT::TestCase
     @registry.add_file( "foo.rb", str )
 
     agent = @registry.create( "Foo@foo.rb" )
-    @m.add( "テスト", agent )
+    @m.add( "test", agent )
 
     pair_infos = {
-      ClickClient::FX::EURJPY => Info.new( 10000 )
+      :EURJPY => Info.new( 10000 )
     }
     2.times {
 	    @m.next_rates( JIJI::Rates.new( pair_infos, {

data/test/{test_AgentRegistry.rb → agent/test_AgentRegistry.rb}

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

data/test/{test_PeriodicallyAgent.rb → agent/test_PeriodicallyAgent.rb}

@@ -1,16 +1,17 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/agent/agent'
 require 'jiji/agent/agent_manager'
 require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
-require "jiji/collector"
+require 'jiji/collector'
 
 # PeriodicallyAgent のテスト
 class PeriodicallyAgentTest <  RUNIT::TestCase
@@ -27,7 +28,7 @@ class PeriodicallyAgentTest <  RUNIT::TestCase
     agent = TestAgent.new( 2 )
     assert_equals agent.log, []
     
-    pair_infos = {ClickClient::FX::USDJPY=>"info"}
+    pair_infos = {:USDJPY=>"info"}
     
     agent.next_rates(  JIJI::Rates.new( pair_infos, {
       :USDJPY => R.new( 100.0, 100.05, -200, 222 ),

data/test/{test_Permitter.rb → agent/test_Permitter.rb}

@@ -1,20 +1,21 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/agent/agent'
 require 'jiji/agent/agent_manager'
 require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
-require "jiji/configuration"
-require "jiji/collector"
-require "fileutils"
-require "testutils"
-require "logger"
+require 'jiji/configuration'
+require 'jiji/collector'
+require 'fileutils'
+require 'test_utils'
+require 'logger'
 
 # Permitter のテスト
 class PermitterTest <  RUNIT::TestCase

data/test/all_tests.rb

@@ -2,28 +2,35 @@
 
 $: << "../lib"
 
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'test_ProcessManager'
+require 'test_BackTestCollector'
+require 'test_Collector'
+require 'test_Configuration'
+require 'test_Operator'
+require 'test_Output'
+require 'test_Output_registry'
+require 'test_Process'
+
+require 'util/test_BlockToSession'
+require 'util/test_CSV'
+require 'util/test_SynchronizeInterceptor'
+
+require 'dao/test_RateDao'
+require 'dao/test_TradeResultDao'
+
+require 'agent/test_AgentManager'
+require 'agent/test_AgentRegistry'
+require 'agent/test_PeriodicallyAgent'
+require 'agent/test_Permitter'
+
+require 'migration/test_Migrator'
+require 'migration/test_Migrator1_0_3'
+require 'migration/test_Migrator1_1_0'
+
+require 'plugin/test_Loader'
+require 'plugin/embedded/test_SingleClickClient'
 
-require "runit/testcase"
-require "runit/cui/testrunner"
-
-require "test_BackTestCollector"
-require "test_Collector"
-require "test_SingleClickClient"
-require "test_BlockToSession"
-require "test_AgentManager"
-
-require "test_AgentRegistry"
-require "test_Configuration"
-require "test_CSV"
-require "test_Operator"
-require "test_Output"
-require "test_Output_registry"
-require "test_PeriodicallyAgent"
-require "test_Process"
-require "test_ProcessManager"
-require "test_RateDao"
-require "test_Permitter"
-require "test_TradeResultDao"
-
-require "migration/test_Migrator"
-require "migration/test_Migrator1_0_3"

data/test/{test_RateDao.rb → dao/test_RateDao.rb}

@@ -1,15 +1,15 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/dao/rate_dao'
 require 'fileutils'
 require 'rubygems'
 require 'clickclient'
-require "testutils"
+require 'test_utils'
 
 class RateDaoTest <  RUNIT::TestCase
 

data/test/{test_TradeResultDao.rb → dao/test_TradeResultDao.rb}

@@ -1,15 +1,16 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
+$: << "../../lib"
+$: << "../"
 
-
-require "runit/testcase"
-require "runit/cui/testrunner"
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
 require 'jiji/dao/trade_result_dao'
 require 'jiji/operator'
 require 'fileutils'
 require 'rubygems'
-require "testutils"
+require 'test_utils'
 
 class TradeResultDaoTest <  RUNIT::TestCase
 
@@ -29,8 +30,8 @@ class TradeResultDaoTest <  RUNIT::TestCase
   def test_basic
 
     pair_infos = {
-      ClickClient::FX::USDJPY => Info.new( 10000 ),
-      ClickClient::FX::AUDUSD => Info.new( 10000 )
+      :USDJPY => Info.new( 10000 ),
+      :AUDUSD => Info.new( 10000 )
     }
 
     op = JIJI::Operator.new @dao
@@ -68,7 +69,6 @@ class TradeResultDaoTest <  RUNIT::TestCase
     }, Time.local(2008,8,7,0,1,1)  ))
 
     p1_props = {
-       :open_interest_no=>"",
        :count=>1,
        :rate=>101.08,
        :state=>1,
@@ -80,6 +80,7 @@ class TradeResultDaoTest <  RUNIT::TestCase
        :price=>1010800.0,
        :trader=>"a",
        :position_id=>p1.position_id,
+       :raw_position_id=>nil,
        :profit_or_loss=>-500.0,
        :swap=>0
     }
@@ -390,8 +391,8 @@ class TradeResultDaoTest <  RUNIT::TestCase
   # flush のテスト。
   def test_flush()
     pair_infos = {
-      ClickClient::FX::USDJPY => Info.new( 10000 ),
-      ClickClient::FX::AUDUSD => Info.new( 10000 )
+      :USDJPY => Info.new( 10000 ),
+      :AUDUSD => Info.new( 10000 )
     }
 
     op = JIJI::Operator.new @dao
@@ -428,7 +429,6 @@ class TradeResultDaoTest <  RUNIT::TestCase
 
     # 1mは経過していないので、バッファ内のデータは保存されていない。
     p1_props = {
-       :open_interest_no=>"",
        :count=>1,
        :rate=>101.08,
        :state=>1,
@@ -440,6 +440,7 @@ class TradeResultDaoTest <  RUNIT::TestCase
        :price=>1010800.0,
        :trader=>"a",
        :position_id=>p1.position_id,
+       :raw_position_id=>nil,
        :profit_or_loss=>-500.0,
        :swap=>0
     }

data/test/jiji_plugin.rb

@@ -0,0 +1,7 @@
+
+require 'jiji/plugin/securities_plugin'
+require 'test_utils'
+
+JIJI::Plugin.register( 
+  JIJI::Plugin::SecuritiesPlugin::FUTURE_NAME, 
+  Test::MockClient.new )

data/test/migration/migrator1_1_0test_data/configuration.yaml

@@ -0,0 +1,11 @@
+---
+server:
+ port: 8080
+
+securities:
+  account:
+    user:     "foo"
+    password: "xxxx"
+
+foo:
+  var: aaa

data/test/migration/test_Migrator1_1_0.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+
+$: << "../../lib"
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'fileutils'
+require 'jiji/configuration'
+require 'jiji/migration/migrator1_1_0'
+
+# Migrator1_1_0 のテスト
+class Migrator1_1_0Test <  RUNIT::TestCase
+
+  def setup
+    @dir = File.dirname(__FILE__) + "/migrator1_1_0_test"
+    FileUtils.rm_rf @dir
+    FileUtils.mkdir_p "#{@dir}/conf"
+    
+    @registry = {}
+  end
+
+  def teardown
+    FileUtils.rm_rf @dir
+  end
+  
+  # 実際のデータを変更するテスト
+  def test_real_data
+    FileUtils.cp_r File.dirname(__FILE__) + "/migrator1_1_0test_data/configuration.yaml", "#{@dir}/conf"
+    
+    assert_equals( YAML.load_file("#{@dir}/conf/configuration.yaml"), {
+      "server"=>{ "port"=>8080 },
+      "securities"=>{ "account"=>{
+        "user"=>"foo",
+        "password"=>"xxxx"
+      }},
+      "foo"=>{"var"=>"aaa"}
+    })
+    
+    # データ移行
+    m = JIJI::Migration::Migrator1_1_0.new
+    m.migrate( Struct.new( :base_dir, :conf ).new( @dir, JIJI::Configuration.new ) )
+    
+    assert_equals( YAML.load_file("#{@dir}/conf/configuration.yaml"), {
+      :server=>{ :port=>8080 },
+      :securities=>{
+        :type=>:click_securities_demo, 
+        :user=>"foo",
+        :password=>"xxxx"
+      },
+      :foo=>{:var=>"aaa"}
+    })
+  end
+  
+end
+

data/test/{test_SingleClickClient.rb → plugin/embedded/test_SingleClickClient.rb}

@@ -1,13 +1,13 @@
 #!/usr/bin/ruby
 
-$: << "../lib"
-
+$: << "../../"
+$: << "../../../lib"
 
 require "runit/testcase"
 require "runit/cui/testrunner"
 require "jiji/configuration"
-require "jiji/single_click_client"
-require "testutils.rb"
+require 'jiji/plugin/embedded/single_click_client'
+require "test_utils"
 require 'logger'
 require 'csv'
 
@@ -19,7 +19,10 @@ class SingleClickClientTest <  RUNIT::TestCase
 
   def setup
     l = Logger.new STDOUT
-    @c = JIJI::SingleClickClient.new( ACCOUNT, CONF, l )
+    @c = JIJI::Plugin::SingleClickClient.new( {
+      :user=>Test::Constants::USER,
+      :password=>Test::Constants::PASSWORD
+    }, l )
   end
 
   def teardown
@@ -40,7 +43,7 @@ class SingleClickClientTest <  RUNIT::TestCase
   def test_request_error
     begin
       @c.request {|fx|
-        fx.list_orders( 1000 ) # エラーコードが不正。
+        fx.list_orders( 1000 ) # 通貨ペアコードが不正。
       }
       fail
     rescue RuntimeError
@@ -81,9 +84,12 @@ class SingleClickClientTest <  RUNIT::TestCase
     l = Logger.new STDOUT
 
     # 接続先が不正
-    conf = JIJI::Configuration.new
-    conf.set [:securities,:host], "notfound.com"
-    c = JIJI::SingleClickClient.new( ACCOUNT, conf, l ) # エラーは発生しない。
+    conf = {
+      :user=>Test::Constants::USER,
+      :password=>Test::Constants::PASSWORD,
+      :host=>"notfound.com"
+    }
+    c = JIJI::Plugin::SingleClickClient.new( conf, l ) # エラーは発生しない。
 
     # 接続失敗状態でリクエストを送付すると、常に接続失敗の例外が返される。
     3.times {
@@ -94,12 +100,19 @@ class SingleClickClientTest <  RUNIT::TestCase
         assert_equals JIJI::ERROR_NOT_CONNECTED, $!.code
       end
     }
+    # 接続できるようになると復帰する。
+    conf[:host] = nil
+    3.times {
+      c.request {|fx| fx.list_currency_pairs }
+    }
     c.close
-    
+
     # アカウントが不正
-    account = Struct.new(:user,:password).new( "illegal", "illegal" )
-    c = JIJI::SingleClickClient.new( account, CONF, l )
-    
+    c = JIJI::Plugin::SingleClickClient.new( {
+      :user=>"illegal",
+      :password=>Test::Constants::PASSWORD
+    }, l )
+
     # 接続失敗状態でリクエストを送付すると、常に接続失敗の例外が返される。
     3.times {
       begin
@@ -110,6 +123,23 @@ class SingleClickClientTest <  RUNIT::TestCase
       end
     }
     c.close
-    
+
+    # パスワードが不正
+    c = JIJI::Plugin::SingleClickClient.new( {
+      :user=>Test::Constants::USER,
+      :password=>"illegal"
+    }, l )
+
+    # 接続失敗状態でリクエストを送付すると、常に接続失敗の例外が返される。
+    3.times {
+      begin
+        c.request {|fx| fx.list_currency_pairs }
+        fail
+      rescue JIJI::FatalError
+        assert_equals JIJI::ERROR_NOT_CONNECTED, $!.code
+      end
+    }
+    c.close
+
   end
 end

data/test/plugin/error_test/jiji_plugin.rb

@@ -0,0 +1,2 @@
+
+raise "test"

data/test/plugin/test/foo_plugin.rb

@@ -0,0 +1 @@
+JIJI::Plugin.register( :test, "foo" )

data/test/plugin/test/jiji_plugin.rb

@@ -0,0 +1,2 @@
+
+JIJI::Plugin.register( :test, "test" )

data/test/plugin/test_Loader.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/ruby
+
+$: << "../../lib"
+$: << File.dirname(__FILE__) + "/test"
+$: << File.dirname(__FILE__) + "/error_test"
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'logger'
+require 'jiji/plugin/plugin_loader'
+
+# Loader のテスト
+class LoaderTest <  RUNIT::TestCase
+
+  # 基本動作のテスト
+  def test_basic
+    # ロード前は空
+    assert_equals [], JIJI::Plugin.get(:test)
+    
+    # ロード
+    loader = JIJI::Plugin::Loader.new
+    loader.server_logger = Logger.new STDOUT
+    loader.load
+    
+    # ./test以下の"jiji_plugin.rb"がロードされる。
+    assert_equals ["test"], JIJI::Plugin.get(:test)
+    
+    # テスト用のplugin gemがインストールされていれば aaa,bbb が表示される。
+    puts JIJI::Plugin.get(:test_gem) 
+  end
+end
+

data/test/plugin/test_gem/a/jiji_plugin_test_gem_a.gemspec

@@ -0,0 +1,10 @@
+Gem::Specification.new do |spec|
+  spec.name = "jiji_plugin_test_gem_a"
+  spec.version = "1.0.0"
+  spec.summary = "jiji_plugin_test_gem_a."
+  spec.files = [
+    "lib/jiji_plugin.rb",
+    "lib/jiji_plugin_test.rb"
+  ]
+  spec.test_files = []
+end

data/test/plugin/test_gem/a/lib/jiji_plugin.rb

@@ -0,0 +1,2 @@
+require 'jiji_plugin_test'
+JIJI::Plugin.register( :test_gem, JIJIPluginTest.aaa )

data/test/plugin/test_gem/a/lib/jiji_plugin_test.rb

@@ -0,0 +1,6 @@
+
+module JIJIPluginTest
+  def self.aaa
+    "aaa"
+  end
+end

data/test/plugin/test_gem/b/jiji_plugin_test_gem_b.gemspec

@@ -0,0 +1,9 @@
+Gem::Specification.new do |spec|
+  spec.name = "jiji_plugin_test_gem_b"
+  spec.version = "1.0.0"
+  spec.summary = "jiji_plugin_test_gem_b."
+  spec.files = [
+    "lib/jiji_plugin.rb"
+  ]
+  spec.test_files = []
+end

data/test/plugin/test_gem/b/lib/jiji_plugin.rb

@@ -0,0 +1,2 @@
+require 'logger'
+JIJI::Plugin.register( :test_gem, "bbb" )