Use v1 plugin API in test

test/helper.rb

@@ -1,19 +1,13 @@
 require 'rubygems'
 require 'bundler'
-begin
- Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
- $stderr.puts e.message
- $stderr.puts "Run `bundle install` to install missing gems"
- exit e.status_code
-end
+
 require 'test/unit'
+require 'test/unit/rr'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'fluent/test'
-require 'fluent/plugin/out_flowcounter_simple'
-require 'fluent/plugin/filter_flowcounter_simple'
 
 class Test::Unit::TestCase
  def capture_log(log)

test/plugin/test_filter_flowcounter_simple.rb

@@ -1,5 +1,6 @@
 require_relative '../helper'
-require "test/unit/rr"
+require 'fluent/test/driver/filter'
+require 'fluent/plugin/filter_flowcounter_simple'
 
 class FlowCounterSimpleFilterTest < Test::Unit::TestCase
  include Fluent
@@ -14,7 +15,7 @@ def setup
  ]
 
  def create_driver(conf = CONFIG)
- Fluent::Test::FilterTestDriver.new(Fluent::FlowCounterSimpleFilter).configure(conf, true)
+ Fluent::Test::Driver::Filter.new(Fluent::Plugin::FlowCounterSimpleFilter).configure(conf)
  end
 
  def test_filter
@@ -32,18 +33,14 @@ def test_filter
  private
 
  def filter(d, msgs)
- stub(d.instance).start
- stub(d.instance).shutdown
- d.run {
+ d.run(default_tag: 'test') {
  msgs.each {|msg|
- d.filter(msg, @time)
+ d.feed(msg)
  }
  }
  out = capture_log(d.instance.log) do
  d.instance.flush_emit(0)
  end
- filtered = d.filtered_as_array
- filtered_msgs = filtered.map {|m| m[2] }
- [filtered_msgs, out]
+ [d.filtered_records, out]
  end
-end if defined?(Fluent::Filter)
+end

test/plugin/test_out_flowcounter_simple.rb

@@ -1,4 +1,6 @@
 require_relative '../helper'
+require 'fluent/test/driver/output'
+require 'fluent/plugin/out_flowcounter_simple'
 
 class FlowCounterSimpleOutputTest < Test::Unit::TestCase
  def setup
@@ -10,7 +12,7 @@ def setup
  ]
 
  def create_driver(conf=CONFIG,tag='test')
- Fluent::Test::OutputTestDriver.new(Fluent::FlowCounterSimpleOutput, tag).configure(conf)
+ Fluent::Test::Driver::Output.new(Fluent::Plugin::FlowCounterSimpleOutput).configure(conf)
  end
 
  def test_configure
@@ -29,38 +31,38 @@ def test_configure
  end
 
  def test_num
- d1 = create_driver(CONFIG, 'test.tag1')
- d1.run do
+ d1 = create_driver(CONFIG)
+ d1.run(default_tag: 'test.tag1') do
  10.times do
- d1.emit({'message'=> 'a' * 100})
- d1.emit({'message'=> 'b' * 100})
- d1.emit({'message'=> 'c' * 100})
+ d1.feed({'message'=> 'a' * 100})
+ d1.feed({'message'=> 'b' * 100})
+ d1.feed({'message'=> 'c' * 100})
  end
  end
  out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }
  assert { out.include?("count:30") }
  end
 
  def test_byte
- d1 = create_driver(CONFIG + %[indicator byte], 'test.tag1')
- d1.run do
+ d1 = create_driver(CONFIG + %[indicator byte])
+ d1.run(default_tag: 'test.tag1') do
  10.times do
- d1.emit({'message'=> 'a' * 100})
- d1.emit({'message'=> 'b' * 100})
- d1.emit({'message'=> 'c' * 100})
+ d1.feed({'message'=> 'a' * 100})
+ d1.feed({'message'=> 'b' * 100})
+ d1.feed({'message'=> 'c' * 100})
  end
  end
  out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }
  assert { out =~ /count:\d+\tindicator:byte\tunit:second/ }
  end
 
  def test_comment
- d1 = create_driver(CONFIG + %[comment foobar], 'test.tag1')
- d1.run do
+ d1 = create_driver(CONFIG + %[comment foobar])
+ d1.run(default_tag: 'test.tag1') do
  1.times do
- d1.emit({'message'=> 'a' * 100})
- d1.emit({'message'=> 'b' * 100})
- d1.emit({'message'=> 'c' * 100})
+ d1.feed({'message'=> 'a' * 100})
+ d1.feed({'message'=> 'b' * 100})
+ d1.feed({'message'=> 'c' * 100})
  end
  end
  out = capture_log(d1.instance.log) { d1.instance.flush_emit(60) }