unageanu-jiji 1.1.4 → 1.2.1

data/test/agent/test_AgentRegistry.rb

@@ -1,18 +1,18 @@
 #!/usr/bin/ruby
 
-$: << "../../lib"
-$: << "../"
+$: << "../lib"
 
 require 'rubygems'
-require "runit/testcase"
-require "runit/cui/testrunner"
+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 "fileutils"
+require 'jiji/configuration'
+require 'jiji/dao/file_system_dao'
+require 'fileutils'
 
 # AgentRegistory のテスト
 class AgentRegistryTest <  RUNIT::TestCase
@@ -21,12 +21,19 @@ class AgentRegistryTest <  RUNIT::TestCase
     @dir = File.dirname(__FILE__) + "/agents"
     FileUtils.mkdir_p @dir
 
-    @registry = JIJI::AgentRegistry.new( "#{@dir}/agent", "#{@dir}/sharedlib" )
+    @dao =  JIJI::Dao::FileSystemDao.new( @dir )
+    @dao.mkcol "agents"
+    @dao.mkcol "shared"
+
+    @registry = JIJI::AgentRegistry.new( "agents", "shared" )
     @registry.conf = JIJI::Configuration.new
+    @registry.file_dao = @dao
+    @registry.server_logger = Logger.new STDOUT
   end
 
   def teardown
     FileUtils.rm_rf @dir
+    sleep 1
   end
 
   # 基本動作のテスト
@@ -34,8 +41,6 @@ class AgentRegistryTest <  RUNIT::TestCase
 
     # 最初は空
     assert_equals @registry.collect, []
-    assert_equals @registry.files, []
-    assert_equals @registry.files(:shared_lib), []
 
     # 追加
     foo_body = "class Foo; include JIJI::Agent; end"
@@ -47,13 +52,15 @@ class AgentRegistryTest <  RUNIT::TestCase
       end
     end
 BODY
-    
-    assert_equals @registry.add_file( "foo.rb", foo_body ), :success
-    assert_equals @registry.add_file( "var.rb", var_body ), :success
+
+    assert_equals @dao.put( "agents/foo.rb", foo_body ), :success
+    assert_equals @dao.put( "agents/var.rb", var_body ), :success
+    @registry.load( "agents/foo.rb" )
+    @registry.load( "agents/var.rb" )
 
     assert_equals @registry.collect.sort!, ["Foo@foo.rb", "Var@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
-    assert_agent_files @registry.files(:shared_lib), []
+    assert_agent_files @dao.list("agents"), ["foo.rb","var.rb"]
+    assert_agent_files @dao.list("shared"), []
 
 
     # 取得
@@ -82,12 +89,13 @@ BODY
       "method called."
     end
 BODY
-    assert_equals @registry.add_file( "shared_lib.rb", shared_lib_body, :shared_lib ), :success
+    assert_equals @dao.put( "shared/shared_lib.rb", shared_lib_body ), :success
+    @registry.load( "shared/shared_lib.rb" )
 
     # 一覧
     assert_equals @registry.collect.sort!, ["Foo@foo.rb", "Var@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
-    assert_agent_files @registry.files(:shared_lib), ["shared_lib.rb"]
+    assert_agent_files @dao.list( "agents" ), ["foo.rb","var.rb"]
+    assert_agent_files @dao.list( "shared" ), ["shared_lib.rb"]
 
     # 共有ライブラリを呼び出すAPIが利用可能になる。
     assert_equals( safe(4) { obj.test[0] }, "val")
@@ -114,28 +122,28 @@ BODY
     end
 
     #ファイル取得
-    assert_equals @registry.get_file("foo.rb"), foo_body + "\n"
-    assert_equals @registry.get_file("var.rb"), var_body
-    assert_equals @registry.get_file("shared_lib.rb", :shared_lib), shared_lib_body
+    assert_equals @dao.get( "agents/foo.rb" ), foo_body
+    assert_equals @dao.get( "agents/var.rb" ), var_body
+    assert_equals @dao.get( "shared/shared_lib.rb" ), shared_lib_body
     begin
-      @registry.get_file("Not_Found")
+      @dao.get( "agents/Not_Found" )
       fail
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
     begin
-      @registry.get_file("Not_Found", :shared_lib)
+      @dao.get( "shared/Not_Found" )
       fail
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
     begin
-      @registry.get_file("foo.rb", :shared_lib)
+      @dao.get( "shared/foo.rb" )
       fail
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
-    
+
     # 上書き更新
      var_body = <<-BODY
     class Var2
@@ -145,13 +153,15 @@ BODY
       end
     end
 BODY
-    assert_equals @registry.add_file( "var.rb", var_body ), :success
+    assert_equals @dao.put( "agents/var.rb", var_body ), :success
+    @registry.load( "agents/var.rb" )
+
     assert_equals @registry.collect.sort!, ["Foo@foo.rb", "Var2@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
+    assert_agent_files @dao.list("agents"), ["foo.rb","var.rb"]
 
-    assert_equals @registry.get_file("foo.rb"), foo_body + "\n"
-    assert_equals @registry.get_file("var.rb"), var_body
-    assert_equals @registry.get_file("shared_lib.rb", :shared_lib), shared_lib_body
+    assert_equals @dao.get( "agents/foo.rb" ), foo_body
+    assert_equals @dao.get( "agents/var.rb" ), var_body
+    assert_equals @dao.get( "shared/shared_lib.rb" ), shared_lib_body
 
     cl = @registry.get "Var2@var.rb"
     assert_not_nil cl
@@ -160,7 +170,7 @@ BODY
     assert_equals( safe(4) { obj.test[0] }, "val")
     assert_equals( safe(4) { obj.test[1].foo}, "fooo" )
     assert_equals( safe(4) { obj.test[2] }, "xx")
-    
+
     # 古いクラスは利用不可
     begin
       @registry.get("Var@var.rb")
@@ -170,52 +180,61 @@ BODY
     end
 
     # レジストリを再作成
-    @registry = JIJI::AgentRegistry.new( "#{@dir}/agent", "#{@dir}/sharedlib" )
+    @registry = JIJI::AgentRegistry.new( "agents", "shared" )
     @registry.conf = JIJI::Configuration.new
+    @registry.file_dao = @dao
+    @registry.server_logger = Logger.new STDOUT
+
     assert_equals @registry.collect, []
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
-    assert_agent_files @registry.files(:shared_lib), ["shared_lib.rb"]
-    
+    assert_agent_files @dao.list( "agents" ), ["foo.rb","var.rb"]
+    assert_agent_files @dao.list( "shared" ), ["shared_lib.rb"]
+
     # 再読み込み
     @registry.load_all
     assert_equals @registry.collect.sort!, ["Foo@foo.rb", "Var2@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
-    assert_agent_files @registry.files(:shared_lib), ["shared_lib.rb"]
-    
+    assert_agent_files @dao.list( "agents" ), ["foo.rb","var.rb"]
+    assert_agent_files @dao.list( "shared" ), ["shared_lib.rb"]
+
     # 共有ライブラリを削除
-    #ライブラリ内のクラスはレジストリ自体を再作成するまで利用可能
-    @registry.remove_file( "shared_lib.rb", :shared_lib )
+    #ライブラリ内のクラスは利用不可
+    @dao.delete( "shared/shared_lib.rb" )
+    @registry.unload( "shared/shared_lib.rb" )
     assert_equals @registry.collect.sort!, ["Foo@foo.rb", "Var2@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
-    assert_agent_files @registry.files(:shared_lib), []
-    
+    assert_agent_files @dao.list( "agents" ), ["foo.rb","var.rb"]
+    assert_agent_files @dao.list( "shared" ), []
+
     cl = @registry.get "Var2@var.rb"
     assert_not_nil cl
     obj = @registry.create("Var2@var.rb",{})
-    assert_equals( safe(4) { obj.test[0] }, "val")
-    assert_equals( safe(4) { obj.test[1].foo}, "fooo" )
-    assert_equals( safe(4) { obj.test[2] }, "xx")
-    
     begin
-      @registry.remove_file( "NotFound", :shared_lib )
+      safe(4) { obj.test[0] }
+    rescue NameError
+    end
+    #assert_equals( safe(4) { obj.test[0] }, "val")
+    #assert_equals( safe(4) { obj.test[1].foo}, "fooo" )
+    #assert_equals( safe(4) { obj.test[2] }, "xx")
+
+    begin
+      @dao.delete( "shared/NotFound" )
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
-    
+
     # 削除
-    @registry.remove_file( "var.rb" )
+    @dao.delete( "agents/var.rb" )
+    @registry.unload( "agents/var.rb" )
     assert_equals @registry.collect.sort!, ["Foo@foo.rb"]
-    assert_agent_files @registry.files, ["foo.rb"]
-    assert_agent_files @registry.files(:shared_lib), []
-    
+    assert_agent_files @dao.list( "agents" ), ["foo.rb"]
+    assert_agent_files @dao.list( "shared" ), []
+
     begin
-      @registry.remove_file( "NotFound" )
+      @dao.delete( "NotFound" )
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
-    
+
     assert_equals @registry.collect.sort!, ["Foo@foo.rb"]
-    assert_agent_files @registry.files, ["foo.rb"]
+    assert_agent_files @dao.list( "agents" ), ["foo.rb"]
 
     # 削除したクラスは利用不可
     cl = @registry.get "Foo@foo.rb"
@@ -228,16 +247,19 @@ BODY
     end
 
     # レジストリを再作成
-    @registry = JIJI::AgentRegistry.new( "#{@dir}/agent", "#{@dir}/sharedlib" )
+    @registry = JIJI::AgentRegistry.new( "agents", "shared" )
     @registry.conf = JIJI::Configuration.new
+    @registry.file_dao = @dao
+    @registry.server_logger = Logger.new STDOUT
+
     @registry.load_all
     assert_equals @registry.collect.sort!, ["Foo@foo.rb"]
-    assert_agent_files @registry.files, ["foo.rb"]
-    assert_agent_files @registry.files(:shared_lib), []
- 
+    assert_agent_files @dao.list( "agents" ), ["foo.rb"]
+    assert_agent_files @dao.list( "shared" ), []
+
      cl = @registry.get "Foo@foo.rb"
     assert_not_nil cl
- 
+
     # 再登録
     str = <<-CLASS_DEF
     class Var; include JIJI::Agent; end
@@ -259,9 +281,10 @@ BODY
       end
     end
 CLASS_DEF
-    @registry.add_file( "var.rb", str )
+    @dao.put( "agents/var.rb", str )
+    @registry.load( "agents/var.rb" )
     assert_equals @registry.collect.sort!, ["Foo@foo.rb",  "S@var.rb", "Var3@var.rb", "Var@var.rb", "Xx::Var2_1@var.rb", "Xx::Var2_2@var.rb","Xx::Yy::Var2_3@var.rb"]
-    assert_agent_files @registry.files, ["foo.rb","var.rb"]
+    assert_agent_files @dao.list( "agents" ), ["foo.rb","var.rb"]
 
     # 取得
     begin
@@ -294,7 +317,7 @@ CLASS_DEF
     rescue JIJI::UserError
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
-    
+
   end
 
   # エージェントファイル一覧を確認する。
@@ -302,8 +325,8 @@ CLASS_DEF
     assert_equals files.length, expects.length
     files.each_index { |i|
       # 名前が取得できることを確認。最終更新日時は設定されていることのみ確認
-      assert_equals expects[i], files[i]["name"]
-      assert_not_nil files[i]["update"]
+      assert_equals expects[i], files[i][:name]
+      assert_not_nil files[i][:update]
     }
   end
 
@@ -333,7 +356,8 @@ CLASS_DEF
       end
     AGENT_STR
 
-    @registry.add_file( "foo.rb", str )
+    @dao.put( "agents/foo.rb", str )
+    @registry.load( "agents/foo.rb" )
 
     ps = @registry.get_property_infos "Foo@foo.rb"
     assert_equals ps, [
@@ -371,7 +395,8 @@ CLASS_DEF
     end
   end
 CLASS_DEF
-    @registry.add_file( "var.rb", str )
+    @dao.put( "agents/var.rb", str )
+    @registry.load( "agents/var.rb" )
 
     agent = @registry.create "Test::Foo@var.rb"
     assert_equals "test", safe(4){
@@ -389,13 +414,14 @@ CLASS_DEF
     end
   end
 CLASS_DEF
-    @registry.add_file( "var.rb", str )
+    @dao.put( "agents/var.rb", str )
+    @registry.load( "agents/var.rb" )
 
     agent2 = @registry.create "Test::Foo@var.rb"
     assert_equals ["test","test2"], safe(4){
       [agent.test, agent2.test] # 古いクラスも再作成されるまでは有効
     }
-    
+
     # コンパイルエラーになる場合
     str = <<-CLASS_DEF
   module Test
@@ -406,9 +432,13 @@ CLASS_DEF
       end
     end
 CLASS_DEF
-    result = @registry.add_file( "var.rb", str )
-    puts result
-    assert_not_nil result
+    @dao.put( "agents/var.rb", str )
+    begin
+      @registry.load( "agents/var.rb" )
+      fail
+    rescue SyntaxError
+    end
+
     begin
       @registry.get("Test::Foo@var.rb")
       fail
@@ -416,12 +446,12 @@ CLASS_DEF
       assert_equals JIJI::ERROR_NOT_FOUND, $!.code
     end
   end
-  
+
   # 共有ライブラリの更新
   def test_update_sharedlib
-    
+
     # 共有ライブラリを使うクラス
-    @registry.add_file "foo.rb", <<-BODY
+    @dao.put "agents/foo.rb", <<-BODY
     class Var
       include JIJI::Agent
       def init
@@ -436,21 +466,22 @@ CLASS_DEF
       attr_reader :s
     end
 BODY
-    
+    @registry.load( "agents/foo.rb" )
+
     obj = @registry.create("Var@foo.rb",{})
-    
+
     # まだ共有ライブラリがないのでエラー
-    begin 
-      safe(4) { obj.test } 
+    begin
+      safe(4) { obj.test }
       fail
     rescue
     end
-    begin 
-      safe(4) { obj.init } 
+    begin
+      safe(4) { obj.init }
       fail
     rescue
   end
-  
+
     # 共有ライブラリを定義
     shared_lib_body = <<-BODY
     VALUE='val'
@@ -463,32 +494,33 @@ BODY
       "method called."
     end
 BODY
-    assert_equals @registry.add_file( "shared_lib.rb", shared_lib_body, :shared_lib ), :success
-    
+    assert_equals @dao.put( "shared/shared_lib.rb", shared_lib_body ), :success
+    @registry.load( "shared/shared_lib.rb" )
+
     assert_equals safe(4){obj.test[0]},  'val'
     assert_equals safe(4){obj.test[1].foo},  'fooo'
     assert_equals safe(4){obj.test[2]},  'method called.'
-    
+
     safe(4){ obj.init }
     assert_equals safe(4){obj.s.foo},  'fooo'
-    
+
     obj2 = @registry.create("Var@foo.rb", {})
     assert_equals safe(4){obj2.test[0]},  'val'
     assert_equals safe(4){obj2.test[1].foo},  'fooo'
     assert_equals safe(4){obj2.test[2]},  'method called.'
     safe(4){ obj2.init }
     assert_equals safe(4){obj2.s.foo},  'fooo'
-    
+
     # テスト2はまだ呼び出せない
-    begin 
-      safe(4) { obj.test2 } 
+    begin
+      safe(4) { obj.test2 }
       fail
     rescue; end
-    begin 
-      safe(4) { obj2.test2 } 
+    begin
+      safe(4) { obj2.test2 }
       fail
     rescue; end
-    
+
     # 共有ライブラリ2を追加
     shared_lib_body = <<-BODY
     VALUE2=JIJI::Agent::Shared::VALUE + ":" +JIJI::Agent::Shared.m
@@ -501,8 +533,9 @@ BODY
       JIJI::Agent::Shared.m
     end
 BODY
-    assert_equals @registry.add_file( "shared_lib2.rb", shared_lib_body, :shared_lib ), :success
-    
+    assert_equals @dao.put( "shared/shared_lib2.rb", shared_lib_body ), :success
+    @registry.load( "shared/shared_lib2.rb" )
+
     assert_equals safe(4){obj.test[0]},  'val'
     assert_equals safe(4){obj.test[1].foo},  'fooo'
     assert_equals safe(4){obj.test[2]},  'method called.'
@@ -511,7 +544,7 @@ BODY
     assert_equals safe(4){obj2.test[2]},  'method called.'
     assert_equals safe(4){obj.s.foo},  'fooo'
     assert_equals safe(4){obj2.s.foo},  'fooo'
-    
+
     assert_equals safe(4){obj.test2[0]},  'val:method called.'
     assert_equals safe(4){obj.test2[1].foo},  'fooo'
     assert_equals safe(4){obj.test2[1].foo2},  'method called.:fooo'
@@ -520,7 +553,7 @@ BODY
     assert_equals safe(4){obj2.test2[1].foo},  'fooo'
     assert_equals safe(4){obj2.test2[1].foo2},  'method called.:fooo'
     assert_equals safe(4){obj2.test2[2]},  'method called.'
-    
+
     # 共有ライブラリを上書き更新
     shared_lib_body = <<-BODY
     VALUE='val2'
@@ -533,8 +566,9 @@ BODY
       "method called2."
     end
 BODY
-    assert_equals @registry.add_file( "shared_lib.rb", shared_lib_body, :shared_lib ), :success
-    
+    assert_equals @dao.put( "shared/shared_lib.rb", shared_lib_body ), :success
+    @registry.load( "shared/shared_lib.rb" )
+
     assert_equals safe(4){obj.test[0]},  'val2'
     assert_equals safe(4){obj.test[1].foo},  'fooo2'
     assert_equals safe(4){obj.test[2]},  'method called2.'
@@ -551,7 +585,7 @@ BODY
     }
     assert_equals safe(4){obj.s.foo},  'fooo2'
     assert_equals safe(4){obj2.s.foo},  'fooo2'
-    
+
     # 依存モジュール内からの呼び出し結果も変わる
     assert_equals safe(4){obj.test2[0]},  'val:method called.' # 定数は定義の段階で評価されているので変わらない
     assert_equals safe(4){obj.test2[1].foo},  'fooo'
@@ -563,5 +597,66 @@ BODY
     assert_equals safe(4){obj2.test2[2]},  'method called2.'
   end
 
+  #階層構造を作成し、load_allするテスト。
+  def test_deep_directory
+
+    # 最初は空
+    assert_equals @registry.collect, []
+
+    # エージェントを追加
+    foo_body = "class Foo; include JIJI::Agent; end"
+    var_body = <<-BODY
+    class Var
+      include JIJI::Agent
+      def var
+        [JIJI::Agent::Shared::VALUE_D1, JIJI::Agent::Shared::VALUE_D2] # 共有ライブラリのAPIを使用。
+      end
+    end
+BODY
+
+    @dao.mkcol "agents/folder1"
+    @dao.mkcol "agents/folder1/folder2"
+
+    assert_equals @dao.put( "agents/folder1/foo.rb", foo_body ), :success
+    assert_equals @dao.put( "agents/folder1/folder2/var.rb", var_body ), :success
+    @registry.load( "agents/folder1/foo.rb" )
+    @registry.load( "agents/folder1/folder2/var.rb" )
+
+    assert_equals @registry.collect.sort!, ["Foo@folder1/foo.rb", "Var@folder1/folder2/var.rb"]
+
+    obj = @registry.create("Var@folder1/folder2/var.rb",{})
+    begin
+      safe(4) { obj.var } #共有ライブラリが追加されていないのでエラーになる
+      fail
+    rescue; end
+
+    # 共有ライブラリを追加
+    @dao.mkcol "shared/folder1"
+    @dao.mkcol "shared/folder1/folder2"
+
+    shared_lib_body  = "VALUE_D1='val'"
+    shared_lib_body2 = "VALUE_D2='val2'"
+    assert_equals @dao.put( "shared/folder1/shared_lib.rb", shared_lib_body ), :success
+    assert_equals @dao.put( "shared/folder1/folder2/shared_lib.rb", shared_lib_body2 ), :success
+    @registry.load( "shared/folder1/shared_lib.rb" )
+    @registry.load( "shared/folder1/folder2/shared_lib.rb" )
+
+    #定数が定義され、varメソッドが実行できるようになる
+    assert_equals safe(4) { obj.var }, ["val", "val2"]
+
+
+    # レジストリを再構築
+    @registry = JIJI::AgentRegistry.new( "agents", "shared" )
+    @registry.conf = JIJI::Configuration.new
+    @registry.file_dao = @dao
+    @registry.server_logger = Logger.new STDOUT
+    @registry.load_all
+
+    #エージェントと共有ライブラリが全てロードされていることを確認
+    assert_equals @registry.collect.sort!, ["Foo@folder1/foo.rb", "Var@folder1/folder2/var.rb"]
+    obj = @registry.create("Var@folder1/folder2/var.rb",{})
+    assert_equals safe(4) { obj.var }, ["val", "val2"]
+  end
+
 end
 

data/test/agent/test_PeriodicallyAgent.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
-$: << "../../lib"
-$: << "../"
+$: << "../lib"
 
 require 'rubygems'
 require 'runit/testcase'

data/test/agent/test_Permitter.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
-$: << "../../lib"
-$: << "../"
+$: << "../lib"
 
 require 'rubygems'
 require 'runit/testcase'

data/test/all_tests.rb

@@ -13,24 +13,12 @@ require 'test_Configuration'
 require 'test_Operator'
 require 'test_Output'
 require 'test_Output_registry'
+require 'test_OutputManager'
 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 'agent/agent_tests'
+require 'dao/dao_tests'
+require 'migration/migration_tests'
+require 'plugin/plugin_tests'
+require 'shared/shared_tests'
+require 'util/util_tests'

data/test/dao/dao_tests.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'dao/test_FileSystemDao'
+require 'dao/test_RateDao'
+require 'dao/test_TradeResultDao'