Merge branch 'develop' into multi-account

Conflicts:
	core/plugin/display_requirements/display_requirements.rb

12 files changed, 30 insertions, 28 deletions

diff --git a/test/core/lib/test_instance_storage.rb b/test/core/lib/test_instance_storage.rb
index eaa2a27e..3c340aff 100644
--- a/test/core/lib/test_instance_storage.rb
+++ b/test/core/lib/test_instance_storage.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../../helper')
 
 Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../../core'))
diff --git a/test/core/test_cairo_markup_generator.rb b/test/core/test_cairo_markup_generator.rb
index f0bb2e2c..6da57680 100644
--- a/test/core/test_cairo_markup_generator.rb
+++ b/test/core/test_cairo_markup_generator.rb
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'mocha'
 $cairo = true
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 # require File.expand_path(File.dirname(__FILE__) + '/../utils')
diff --git a/test/core/test_event.rb b/test/core/test_event.rb
index 0740c6fd..e8bff6d7 100644
--- a/test/core/test_event.rb
+++ b/test/core/test_event.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))
diff --git a/test/core/test_event_filter.rb b/test/core/test_event_filter.rb
index 1e8a9205..248cebed 100644
--- a/test/core/test_event_filter.rb
+++ b/test/core/test_event_filter.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))
diff --git a/test/core/test_event_listener.rb b/test/core/test_event_listener.rb
index 37578eb7..5ea27561 100644
--- a/test/core/test_event_listener.rb
+++ b/test/core/test_event_listener.rb
@@ -2,7 +2,6 @@
 
 require 'test/unit'
 require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))
diff --git a/test/core/test_message.rb b/test/core/test_message.rb
index 26bd575b..7eb58fbc 100644
--- a/test/core/test_message.rb
+++ b/test/core/test_message.rb
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 miquire :core, 'message'
 miquire :core, 'service'
diff --git a/test/core/test_messageconverters.rb b/test/core/test_messageconverters.rb
index e3ac7f6e..263d495d 100644
--- a/test/core/test_messageconverters.rb
+++ b/test/core/test_messageconverters.rb
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 miquire :core, 'messageconverters'
 miquire :lib, 'weakstorage'
diff --git a/test/core/test_miquire.rb b/test/core/test_miquire.rb
index 0f5e3243..e2a1f742 100644
--- a/test/core/test_miquire.rb
+++ b/test/core/test_miquire.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha' # !> already initialized constant AssertionFailedError
 require File.expand_path(File.dirname(__FILE__)+'/../helper')
 # require File.expand_path(File.dirname(__FILE__) + '/../miquire')
 # require File.expand_path(File.dirname(__FILE__) + '/../lib/test_unit_extensions')
diff --git a/test/core/test_miquire_plugin.rb b/test/core/test_miquire_plugin.rb
index ca139db0..b81dc000 100644
--- a/test/core/test_miquire_plugin.rb
+++ b/test/core/test_miquire_plugin.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__)+'/../helper')
 
 miquire :core, "miquire_plugin"
diff --git a/test/core/test_plugin.rb b/test/core/test_plugin.rb
index 39082111..c3221759 100644
--- a/test/core/test_plugin.rb
+++ b/test/core/test_plugin.rb
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 miquire :core, 'plugin'
@@ -27,6 +24,35 @@ class TC_Plugin < Test::Unit::TestCase
     assert_equal(2, sum)
   end
 
+  must "filter in another thread" do
+    filter_thread = nil
+    Plugin.create(:event) do
+      on_thread do
+      end
+
+      filter_thread do
+        filter_thread = Thread.current
+        []
+      end
+    end
+    Event[:thread].call
+    Delayer.run while not Delayer.empty?
+    assert filter_thread
+    assert_equal Thread.current, filter_thread
+
+    Event.filter_another_thread = true
+    filter_thread = nil
+    r = true
+    Event[:thread].call.next{ r = false }.trap{ r = false }
+
+    Delayer.run while r
+    # p r
+    # p SerialThread.instance_eval{ @queue.size }
+    # p Delayer.empty?
+    assert filter_thread
+    assert_not_equal Thread.current, filter_thread
+  end
+
   must "uninstall" do
     sum = 0
     Plugin.create(:event) do
@@ -119,3 +145,4 @@ class TC_Plugin < Test::Unit::TestCase
   end
 end
 
+
diff --git a/test/core/test_userlist.rb b/test/core/test_userlist.rb
index e0a4d1b3..a0627c44 100644
--- a/test/core/test_userlist.rb
+++ b/test/core/test_userlist.rb
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 miquire :lib, 'test_unit_extensions'
 miquire :core, 'userlist'
diff --git a/test/core/test_weakstorage.rb b/test/core/test_weakstorage.rb
index 98b3f739..54518fa2 100644
--- a/test/core/test_weakstorage.rb
+++ b/test/core/test_weakstorage.rb
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'test/unit'
 require 'rubygems'
-require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../helper')
 
 Dir.chdir(File.expand_path(File.dirname(__FILE__) + '/../core'))