RetrieverのDataSourceチェーンを廃止

1 files changed, 23 insertions, 22 deletions

diff --git a/test/core/test_message.rb b/test/core/test_message.rb
index b095912c..c97ae122 100644
--- a/test/core/test_message.rb
+++ b/test/core/test_message.rb
@@ -18,13 +18,13 @@ class TC_Message < Test::Unit::TestCase
   end # !> ambiguous first argument; put parentheses or even spaces
 
   must "hierarchy check" do
-    toshi = User.new_ifnecessary(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
-    miku = User.new_ifnecessary(:id => 393939, :idname => 'ha2ne39', :name => 'miku')
-    c1 = Message.new_ifnecessary(:id => 11, :message => '@ha2ne39 みくちゃああああああああああああん', :user => toshi, :created => Time.now)
-    c2 = Message.new_ifnecessary(:id => 12, :message => '@toshi_a なに', :user => miku, :replyto =>c1, :created => Time.now)
-    c3 = Message.new_ifnecessary(:id => 13, :message => '@ha2ne39 ぺろぺろぺろぺろ（＾ω＾）', :user => toshi, :replyto =>c2, :created => Time.now)
-    c4 = Message.new_ifnecessary(:id => 14, :message => '@toshi_a 垢消せ', :user => miku, :replyto =>c3, :created => Time.now)
-    c5 = Message.new_ifnecessary(:id => 15, :message => '@toshi_a キモい', :user => miku, :replyto =>c3, :created => Time.now)
+    toshi = User.new(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
+    miku = User.new(:id => 393939, :idname => 'ha2ne39', :name => 'miku')
+    c1 = Message.new(:id => 11, :message => '@ha2ne39 みくちゃああああああああああああん', :user => toshi, :created => Time.now)
+    c2 = Message.new(:id => 12, :message => '@toshi_a なに', :user => miku, :replyto =>c1, :created => Time.now)
+    c3 = Message.new(:id => 13, :message => '@ha2ne39 ぺろぺろぺろぺろ（＾ω＾）', :user => toshi, :replyto =>c2, :created => Time.now)
+    c4 = Message.new(:id => 14, :message => '@toshi_a 垢消せ', :user => miku, :replyto =>c3, :created => Time.now)
+    c5 = Message.new(:id => 15, :message => '@toshi_a キモい', :user => miku, :replyto =>c3, :created => Time.now)
     assert_equal(c1, c2.receive_message)
     assert_kind_of(Message, c2.receive_message)
     assert_kind_of(Message, c1) # !> method redefined; discarding old inspect
@@ -43,12 +43,12 @@ class TC_Message < Test::Unit::TestCase
   end
 
   must "around check" do
-    toshi = User.new_ifnecessary(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
-    miku = User.new_ifnecessary(:id => 393939, :idname => 'ha2ne39', :name => 'miku')
-    c1 = Message.new_ifnecessary(:id => 21, :message => 'おはよう', :user => toshi, :created => Time.now)
-    c2 = Message.new_ifnecessary(:id => 22, :message => '@toshi_a おはよう', :user => miku, :replyto =>c1, :created => Time.now)
-    c3 = Message.new_ifnecessary(:id => 23, :message => '@ha2ne39 ぺろぺろぺろぺろ（＾ω＾）', :user => toshi, :replyto =>c2, :created => Time.now)
-    c4 = Message.new_ifnecessary(:id => 24, :message => '@toshi_a おはよう', :user => toshi, :replyto =>c1, :created => Time.now)
+    toshi = User.new(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
+    miku = User.new(:id => 393939, :idname => 'ha2ne39', :name => 'miku')
+    c1 = Message.new(:id => 21, :message => 'おはよう', :user => toshi, :created => Time.now)
+    c2 = Message.new(:id => 22, :message => '@toshi_a おはよう', :user => miku, :replyto =>c1, :created => Time.now)
+    c3 = Message.new(:id => 23, :message => '@ha2ne39 ぺろぺろぺろぺろ（＾ω＾）', :user => toshi, :replyto =>c2, :created => Time.now)
+    c4 = Message.new(:id => 24, :message => '@toshi_a おはよう', :user => toshi, :replyto =>c1, :created => Time.now)
     c1.children << c2
     c2.children << c3
     c1.children << c4
@@ -57,23 +57,24 @@ class TC_Message < Test::Unit::TestCase
   end
 
   must "receive user detect" do
-    toshi = User.new_ifnecessary(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
-    message = Message.new_ifnecessary(:id => 11, :message => '@ha2ne39 @mikutter_bot hey, miku!', :user => toshi, :created => Time.now)
+    toshi = User.new(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
+    message = Message.new(:id => 11, :message => '@ha2ne39 @mikutter_bot hey, miku!', :user => toshi, :created => Time.now)
+    assert_equal '@ha2ne39 @mikutter_bot hey, miku!', message[:message]
     assert_equal ["ha2ne39", "mikutter_bot"], message.receive_user_screen_names
   end
 
   must "receive user not detect" do
-    toshi = User.new_ifnecessary(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
-    message = Message.new_ifnecessary(:id => 11, :message => 'nemui', :user => toshi, :created => Time.now)
+    toshi = User.new(:id => 123456, :idname => 'toshi_a', :name => 'toshi')
+    message = Message.new(:id => 11, :message => 'nemui', :user => toshi, :created => Time.now)
     assert message.receive_user_screen_names.empty?
   end
 
   must "message to me" do
-    toshi = User.new_ifnecessary(:id => 156, :idname => 'toshi', :name => 'toshi')
-    toshi_a = User.new_ifnecessary(:id => 123456, :idname => 'toshi_a', :name => 'toshi_a')
-    toshi_b = User.new_ifnecessary(:id => 1234567, :idname => 'toshi_b', :name => 'toshi_b')
-    toshi_a_a = User.new_ifnecessary(:id => 156156, :idname => 'toshi_a_a', :name => 'toshi_a_a')
-    message = Message.new_ifnecessary(id: 11, message: "krile で where user == @toshi_a | user == @toshi_a_a だけのタブ作っただけでわずかにタブ切り替えが遅くなってるのわかると思うしアカウント切り替えは極端に遅くなってる", system: true, created: Time.now, receiver: toshi_b)
+    toshi = User.new(:id => 156, :idname => 'toshi', :name => 'toshi')
+    toshi_a = User.new(:id => 123456, :idname => 'toshi_a', :name => 'toshi_a')
+    toshi_b = User.new(:id => 1234567, :idname => 'toshi_b', :name => 'toshi_b')
+    toshi_a_a = User.new(:id => 156156, :idname => 'toshi_a_a', :name => 'toshi_a_a')
+    message = Message.new(id: 11, message: "krile で where user == @toshi_a | user == @toshi_a_a だけのタブ作っただけでわずかにタブ切り替えが遅くなってるのわかると思うしアカウント切り替えは極端に遅くなってる", system: true, created: Time.now, receiver: toshi_b)
     assert !message.receive_to?(toshi), 'toshi宛てのメッセージではない'
     assert message.receive_to?(toshi_a), 'toshi_a宛てのメッセージ'
     assert message.receive_to?(toshi_a_a), 'toshi_a_a宛てのメッセージ'