Merge branch 'develop' into delayer-priority

7 files changed, 111 insertions, 55 deletions

diff --git a/test/core/test_gtk_webicon.rb b/test/core/test_gtk_webicon.rb
index e7730cae..9328f26f 100644
--- a/test/core/test_gtk_webicon.rb
+++ b/test/core/test_gtk_webicon.rb
@@ -4,11 +4,9 @@ require 'rubygems'
 require 'mocha'
 require 'webmock'
 require 'gtk2'
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
-Dir.chdir(File.expand_path(File.dirname(__FILE__)+'/../core'))
+require File.expand_path(File.dirname(__FILE__) + '/../../core/utils')
 
-miquire :core, 'utils'
-miquire :lib, 'test_unit_extensions'
+require 'lib/test_unit_extensions'
 miquire :mui, 'webicon'
 
 class TC_GtkWebIcon < Test::Unit::TestCase
@@ -16,11 +14,10 @@ class TC_GtkWebIcon < Test::Unit::TestCase
   end
 
   must "local image load" do
-    image = Gtk::WebIcon.new('test/result.png', 48, 48)
+    image = Gtk::WebIcon.new(Skin.get('icon.png'), 48, 48)
     assert_kind_of(Gdk::Pixbuf, image.pixbuf)
     assert_not_equal(Gdk::WebImageLoader.loading_pixbuf(48, 48), image.pixbuf)
     assert_not_equal(Gdk::WebImageLoader.notfound_pixbuf(48, 48), image.pixbuf)
-    image.pixbuf.save('test/result2.png', 'png')
   end
 
   must "local image not found" do
diff --git a/test/core/test_message.rb b/test/core/test_message.rb
index 3c88f4ab..e16ccd82 100644
--- a/test/core/test_message.rb
+++ b/test/core/test_message.rb
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 require 'test/unit'
 require 'mocha'
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
-# require File.expand_path(File.dirname(__FILE__) + '/../lib/test_unit_extensions')
-# require File.expand_path(File.dirname(__FILE__) + '/../utils')
+require File.expand_path(File.dirname(__FILE__) + '/../../core/lib/test_unit_extensions')
+require File.expand_path(File.dirname(__FILE__) + '/../../core/utils')
 miquire :core, 'message'
-miquire :core, 'post'
+miquire :core, 'service'
 
 $debug = false
 # seterrorlevel(:notice)
diff --git a/test/core/test_messageconverters.rb b/test/core/test_messageconverters.rb
index 0fd25836..4b88b59e 100644
--- a/test/core/test_messageconverters.rb
+++ b/test/core/test_messageconverters.rb
@@ -2,12 +2,11 @@
 require 'test/unit'
 require 'rubygems'
 require 'mocha'
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
-# require File.expand_path(File.dirname(__FILE__) + '/../utils')
+require File.expand_path(File.dirname(__FILE__) + '/../../core/utils')
 miquire :core, 'messageconverters'
+miquire :lib, 'weakstorage'
 
 $debug = true
-# seterrorlevel(:notice)
 $logfile = nil
 $daemon = false
 
diff --git a/test/core/test_plugin.rb b/test/core/test_plugin.rb
index df64d70a..8daf1ec8 100644
--- a/test/core/test_plugin.rb
+++ b/test/core/test_plugin.rb
@@ -4,10 +4,7 @@ require 'test/unit'
 require 'rubygems'
 require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
-
-Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))
-$LOAD_PATH.push '.'
-require 'utils'
+require File.expand_path(File.dirname(__FILE__) + '/../../core/utils')
 
 miquire :lib, 'test_unit_extensions'
 miquire :core, 'plugin'
diff --git a/test/core/test_userlist.rb b/test/core/test_userlist.rb
new file mode 100644
index 00000000..622a7764
--- /dev/null
+++ b/test/core/test_userlist.rb
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+require 'test/unit'
+require 'mocha'
+require File.expand_path(File.join(File.dirname(__FILE__), '../../core/utils'))
+miquire :lib, 'test_unit_extensions'
+miquire :core, 'userlist'
+miquire :core, 'service'
+
+Dir::chdir File.dirname(__FILE__) + '/../'
+
+$debug = false
+# seterrorlevel(:notice)
+$logfile = nil
+$daemon = false
+Plugin = Class.new do
+  def self.call(*args); end
+  def self.filtering(*args)
+    args[1, args.size] end
+end
+
+class TC_Message < Test::Unit::TestCase
+  def setup
+    user_obj = {
+      id: 164348251,
+      name: "mikutter_bot",
+      idname: "mikutter_bot" }
+    user = User.new_ifnecessary( user_obj )
+    Service.any_instance.stubs(:user_initialize).returns(user)
+    @service ||= Service.new
+  end # !> ambiguous first argument; put parentheses or even spaces
+
+  must "get member" do
+    u = [User.new_ifnecessary(:id => 128450, :idname => 'a', :name => 'a'),
+         User.new_ifnecessary(:id => 128451, :idname => 'b', :name => 'b'),
+         User.new_ifnecessary(:id => 128452, :idname => 'c', :name => 'c')]
+    l = [UserList.new_ifnecessary(id: 128453, name: "testlist", full_name: "@a/testlist", slug: "@a/testlist", user: u[0], member: [ u[1] ]),
+         UserList.new_ifnecessary(id: 128454, name: "testlist2", full_name: "@a/testlist2", slug: "@a/testlist", user: u[0], member: [ u[1], u[2] ])]
+    assert_equal [u[1]], l[0].member
+    assert_equal [u[1], u[2]], l[1].member
+  end
+
+  must "member?" do
+    u = [User.new_ifnecessary(:id => 128450, :idname => 'a', :name => 'a'),
+         User.new_ifnecessary(:id => 128451, :idname => 'b', :name => 'b'),
+         User.new_ifnecessary(:id => 128452, :idname => 'c', :name => 'c')]
+    l = [UserList.new_ifnecessary(id: 128453, name: "testlist", full_name: "@a/testlist", slug: "@a/testlist", user: u[0], member: [ u[1] ]),
+         UserList.new_ifnecessary(id: 128454, name: "testlist2", full_name: "@a/testlist2", slug: "@a/testlist", user: u[0], member: [ u[1], u[2] ])]
+    assert not(l[0].member? u[0])
+    assert l[0].member? u[1]
+    assert not(l[0].member? u[2])
+    assert not(l[1].member? u[0])
+    assert l[1].member? u[1]
+    assert l[1].member? u[2]
+  end
+
+  must "related" do
+    u = [User.new_ifnecessary(:id => 128450, :idname => 'a', :name => 'a'),
+         User.new_ifnecessary(:id => 128451, :idname => 'b', :name => 'b'),
+         User.new_ifnecessary(:id => 128452, :idname => 'c', :name => 'c')]
+    l = [UserList.new_ifnecessary(id: 128453, name: "testlist", full_name: "@a/testlist", slug: "@a/testlist", user: u[0], member: [ u[1] ]),
+         UserList.new_ifnecessary(id: 128454, name: "testlist2", full_name: "@a/testlist2", slug: "@a/testlist", user: u[0], member: [ u[1], u[2] ])]
+    m = [[Message.new_ifnecessary(id: 639620, message: "", user: u[0]),
+          Message.new_ifnecessary(id: 639621, message: "", user: u[1]),
+          Message.new_ifnecessary(id: 639622, message: "", user: u[2])],
+         [Message.new_ifnecessary(id: 639600, message: "@b", user: u[0]),
+          Message.new_ifnecessary(id: 639601, message: "@b", user: u[1]),
+          Message.new_ifnecessary(id: 639602, message: "@b", user: u[2])],
+         [Message.new_ifnecessary(id: 639610, message: "@b @c", user: u[0]),
+          Message.new_ifnecessary(id: 639611, message: "@b @c", user: u[1]),
+          Message.new_ifnecessary(id: 639612, message: "@b @c", user: u[2])]]
+    assert !l[0].related?(m[0][0]), "リストに関係ないユーザa"
+    assert l[0].related?(m[0][1])
+    assert !l[0].related?(m[0][2])
+    assert !l[1].related?(m[0][0])
+    assert l[1].related?(m[0][1])
+    assert l[1].related?(m[0][2])
+
+    assert !l[0].related?(m[1][0]), "関係ないユーザaからリスト内ユーザbに対するリプライ"
+    assert l[0].related?(m[1][1]), "リスト内ユーザbがリスト内ユーザbにリプライ"
+    assert !l[0].related?(m[1][2]), "リスト内ユーザbが第三者cにリプライ"
+    assert !l[1].related?(m[1][0])
+    assert l[1].related?(m[1][1])
+    assert l[1].related?(m[1][2])
+
+    assert !l[0].related?(m[2][0])
+    assert l[0].related?(m[2][1])
+    assert !l[0].related?(m[2][2])
+    assert !l[1].related?(m[2][0])
+    assert l[1].related?(m[2][1])
+    assert l[1].related?(m[2][2])
+  end
+
+end
diff --git a/test/core/test_utils.rb b/test/core/test_utils.rb
deleted file mode 100644
index 2727b236..00000000
--- a/test/core/test_utils.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'test/unit'
-require 'uri'
-<<<<<<< HEAD:core/test/test_utils.rb
-require File.expand_path(File.dirname(__FILE__) + '/../utils')
-=======
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
-# require File.expand_path(File.dirname(__FILE__) + '/../utils')
->>>>>>> remotes/katsyoshi/miku_dis:test/core/test_utils.rb
-miquire :lib, 'test_unit_extensions'
-
-$debug = true
-$debug_avail_level = 3
-
-class TC_Utils < Test::Unit::TestCase
-
-  must "shrink too long text includs url in tail" do
-    text = '10.10の開発は9月2日のBetaリリースを控え，UserInterfaceFreeze・BetaFreezeを無事に通過しました。以降は原則としてGUI部分の大きな変更はなく，各機能のブラッシュアップに入ります。Ubuntu Weekly Topics　http://bit.ly/123456'
-    assert_equal("10.10の開発は9月2日のBetaリリースを控え，UserInterfaceFreeze・BetaFreezeを無事に通過しました。以降は原則としてGUI部分の大きな変更はなく，各機能のブラッシュアップに入ります。Ubuntu Week http://bit.ly/123456", text.shrink(140, URI.regexp(['http','https'])))
-  end
-
-  must "shrink too long url only" do
-    text = 'http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com' # aが140回
-    assert_equal(text, text.shrink(140, URI.regexp(['http','https'])))
-  end
-
-end
diff --git a/test/core/test_web_image_loader.rb b/test/core/test_web_image_loader.rb
index 6d8b3641..f4405f7e 100644
--- a/test/core/test_web_image_loader.rb
+++ b/test/core/test_web_image_loader.rb
@@ -4,13 +4,11 @@ require 'rubygems'
 require 'mocha'
 require 'webmock'
 require 'gtk2'
-require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
-Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))
-$LOAD_PATH.push '.'
-# require 'utils'
+ICON_TEST = File.expand_path(File.dirname(__FILE__) + "/icon_test.png")
+require File.expand_path(File.dirname(__FILE__) + '/../../core/utils')
 
-# require 'lib/test_unit_extensions'
+require 'lib/test_unit_extensions'
 miquire :mui, 'web_image_loader'
 miquire :core, 'delayer'
 
@@ -19,6 +17,7 @@ Plugin = Class.new do
 end
 
 class TC_GtkWebImageLoader < Test::Unit::TestCase
+
   def setup
     Gdk::WebImageLoader::ImageCache.clear
     urls = ['http://a0.twimg.com/profile_images/1522298893/itiiti_hitono_icon_no_file_mei_mirutoka_teokure_desune.png',
@@ -57,7 +56,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
 
   must "successfully load image" do
     url = 'http://a0.twimg.com/profile_images/1522298893/itiiti_hitono_icon_no_file_mei_mirutoka_teokure_desune.png'
-    WebMock.stub_request(:get, url).to_return(File.open('test/icon_test.png'){ |io| io.read })
+    WebMock.stub_request(:get, url).to_return(File.open(ICON_TEST){ |io| io.read })
     response = nil
     Gdk::WebImageLoader.pixbuf(url, 48, 48){ |pixbuf, success, url|
       response = [pixbuf, success]
@@ -81,7 +80,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
     # URI::InvalidURIError
     # url = 'http://a1.twimg.com/profile_images/80925056/クリップボード01_normal.jpg'
     url = 'http://a0.twimg.com/profile_images/1522298893/みくかわいい.png'
-    WebMock.stub_request(:get, url).to_return(File.open('test/icon_test.png'){ |io| io.read })
+    WebMock.stub_request(:get, url).to_return(File.open(ICON_TEST){ |io| io.read })
     response = nil
     Gdk::WebImageLoader.pixbuf(url, 48, 48){ |pixbuf, success, url|
       response = [pixbuf, success]
@@ -116,7 +115,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
     access_count = 0
     WebMock.stub_request(:get, url).to_return{
       atomic{ access_count += 1 }
-      File.open('test/icon_test.png'){ |io| io.read }
+      File.open(ICON_TEST){ |io| io.read }
     }
     response = Array.new(20)
     20.times{ |cnt|
@@ -140,7 +139,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
     raw = response = nil
     Thread.new {
       url = 'http://a0.twimg.com/profile_images/1522298893/itiiti_hitono_icon_no_file_mei_mirutoka_teokure_desune.png'
-      http_raw = File.open('test/icon_test.png'){ |io| io.read }.force_encoding('ASCII-8BIT').freeze
+      http_raw = File.open(ICON_TEST){ |io| io.read }.force_encoding('ASCII-8BIT').freeze
       raw = http_raw[http_raw.index("\211PNG".force_encoding('ASCII-8BIT')), http_raw.size]
       WebMock.stub_request(:get, url).to_return(http_raw)
       Gdk::WebImageLoader.get_raw_data(url){ |data, success, url|
@@ -156,7 +155,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
     localpath = nil
     url = 'http://a0.twimg.com/profile_images/1522298893/itiiti_hitono_icon_no_file_mei_mirutoka_teokure_desune.png'
     Thread.new {
-      WebMock.stub_request(:get, url).to_return(File.open('test/icon_test.png'){ |io| io.read })
+      WebMock.stub_request(:get, url).to_return(File.open(ICON_TEST){ |io| io.read })
       localpath = Gdk::WebImageLoader.local_path(url)
     }.join
     assert_equal("/home/toshi/.mikutter/tmp/e9183b9265dcf0728fceceb07444e8c1.png.png", localpath)