Add namespace module not to conflict to other tests

fluent · Apr 6, 2016 · e30b592 · e30b592
1 parent 6c6fab2
commit e30b592
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/test/plugin/test_base.rb b/test/plugin/test_base.rb
@@ -1,12 +1,14 @@
 require_relative '../helper'
 require 'fluent/plugin/base'
 
-class DummyPlugin < Fluent::Plugin::Base
+module FluentPluginBaseTest
+  class DummyPlugin < Fluent::Plugin::Base
+  end
 end
 
 class BaseTest < Test::Unit::TestCase
   setup do
-    @p = DummyPlugin.new
+    @p = FluentPluginBaseTest::DummyPlugin.new
   end
 
   test 'has methods for phases of plugin life cycle, and methods to know "super"s were correctly called or not' do
@@ -56,14 +58,14 @@ class BaseTest < Test::Unit::TestCase
 
   test 'is configurable by config_param and config_section' do
     assert_nothing_raised do
-      class DummyPlugin2 < Fluent::Plugin::TestBase
+      class FluentPluginBaseTest::DummyPlugin2 < Fluent::Plugin::TestBase
         config_param :myparam1, :string
         config_section :mysection, multi: false do
           config_param :myparam2, :integer
         end
       end
     end
-    p2 = DummyPlugin2.new
+    p2 = FluentPluginBaseTest::DummyPlugin2.new
     assert_nothing_raised do
       p2.configure(config_element('ROOT', '', {'myparam1' => 'myvalue1'}, [config_element('mysection', '', {'myparam2' => 99})]))
     end

diff --git a/test/plugin/test_input.rb b/test/plugin/test_input.rb
@@ -2,13 +2,15 @@
 require 'fluent/plugin/input'
 require 'flexmock/test_unit'
 
-class DummyPlugin < Fluent::Plugin::Input
+module FluentPluginInputTest
+  class DummyPlugin < Fluent::Plugin::Input
+  end
 end
 
 class InputTest < Test::Unit::TestCase
   setup do
     Fluent::Test.setup
-    @p = DummyPlugin.new
+    @p = FluentPluginInputTest::DummyPlugin.new
   end
 
   test 'has plugin_id automatically generated' do
@@ -43,7 +45,7 @@ class InputTest < Test::Unit::TestCase
 
   test 'can load plugin helpers' do
     assert_nothing_raised do
-      class DummyPlugin2 < Fluent::Plugin::Input
+      class FluentPluginInputTest::DummyPlugin2 < Fluent::Plugin::Input
         helpers :storage
       end
     end

diff --git a/test/plugin/test_owned_by.rb b/test/plugin/test_owned_by.rb
@@ -3,12 +3,14 @@
 require 'fluent/plugin/input'
 require 'fluent/plugin/owned_by_mixin'
 
-class DummyParent < Fluent::Plugin::Input
-  Fluent::Plugin.register_input('dummy_parent', self)
-end
-class DummyChild < Fluent::Plugin::Base
-  include Fluent::Plugin::OwnedByMixin
-  Fluent::Plugin.register_parser('dummy_child', self)
+module OwnedByMixinTestEnv
+  class DummyParent < Fluent::Plugin::Input
+    Fluent::Plugin.register_input('dummy_parent', self)
+  end
+  class DummyChild < Fluent::Plugin::Base
+    include Fluent::Plugin::OwnedByMixin
+    Fluent::Plugin.register_parser('dummy_child', self)
+  end
 end
 
 class OwnedByMixinTest < Test::Unit::TestCase