fluentd 0.12.43 → 0.14.0

data/test/config/test_types.rb

@@ -68,24 +68,13 @@ class TestConfigTypes < ::Test::Unit::TestCase
       assert_equal '   ', Config::STRING_TYPE.call('   ', {})
     end
 
-    data('latin' => 'Märch',
-         'ascii' => 'ascii',
-         'space' => '     ',
-         'number' => '1',
-         'Hiragana' => 'あいうえお')
-    test 'string w/ binary' do |str|
-      actual = Config::STRING_TYPE.call(str.b, {})
-      assert_equal str, actual
-      assert_equal Encoding::UTF_8, actual.encoding
-    end
-
     test 'enum' do
       assert_equal :val, Config::ENUM_TYPE.call('val', {list: [:val, :value, :v]})
       assert_equal :v, Config::ENUM_TYPE.call('v', {list: [:val, :value, :v]})
       assert_equal :value, Config::ENUM_TYPE.call('value', {list: [:val, :value, :v]})
-      assert_raises(Fluent::ConfigError.new("valid options are val,value,v but got x")){ Config::ENUM_TYPE.call('x', {list: [:val, :value, :v]}) }
-      assert_raises(RuntimeError.new("Plugin BUG: config type 'enum' requires :list of symbols")){ Config::ENUM_TYPE.call('val', {}) }
-      assert_raises(RuntimeError.new("Plugin BUG: config type 'enum' requires :list of symbols")){ Config::ENUM_TYPE.call('val', {list: ["val", "value", "v"]}) }
+      assert_raises(Fluent::ConfigError){ Config::ENUM_TYPE.call('x', {list: [:val, :value, :v]}) }
+      assert_raises(RuntimeError){ Config::ENUM_TYPE.call('val', {}) }
+      assert_raises(RuntimeError){ Config::ENUM_TYPE.call('val', {list: ["val", "value", "v"]}) }
     end
 
     test 'integer' do
@@ -149,16 +138,6 @@ class TestConfigTypes < ::Test::Unit::TestCase
 
       assert_equal({"x"=>1,"y"=>60,"z"=>3600}, Config::HASH_TYPE.call('{"x":"1s","y":"1m","z":"1h"}', {value_type: :time}))
       assert_equal({"x"=>1,"y"=>60,"z"=>3600}, Config::HASH_TYPE.call('x:1s,y:1m,z:1h',               {value_type: :time}))
-
-      assert_raise(RuntimeError.new("unknown type in REFORMAT: foo")){ Config::HASH_TYPE.call("x:1,y:2", {value_type: :foo}) }
-    end
-
-    data('latin' => ['3:Märch', {"3"=>"Märch"}],
-         'ascii' => ['ascii:ascii', {"ascii"=>"ascii"}],
-         'number' => ['number:1', {"number"=>"1"}],
-         'Hiragana' => ['hiragana:あいうえお', {"hiragana"=>"あいうえお"}])
-    test 'hash w/ binary' do |(target, expected)|
-      assert_equal(expected, Config::HASH_TYPE.call(target.b, { value_type: :string }))
     end
 
     test 'array' do
@@ -183,8 +162,6 @@ class TestConfigTypes < ::Test::Unit::TestCase
       }
       assert_equal(["1","2"], Config::ARRAY_TYPE.call('["1","2"]', array_options))
       assert_equal(["3"], Config::ARRAY_TYPE.call('["3"]', array_options))
-
-      assert_raise(RuntimeError.new("unknown type in REFORMAT: foo")){ Config::ARRAY_TYPE.call("1,2", {value_type: :foo}) }
     end
   end
 end

data/test/helper.rb

@@ -39,22 +39,88 @@ require 'rr'
 require 'test/unit'
 require 'test/unit/rr'
 require 'fileutils'
+require 'fluent/config/element'
 require 'fluent/log'
 require 'fluent/test'
-require 'fluent/test/helpers'
+require 'fluent/plugin/base'
+require 'fluent/log'
+require 'fluent/plugin_id'
+require 'fluent/plugin_helper'
+require 'fluent/msgpack_factory'
+require 'fluent/time'
+require 'serverengine'
+
+module Fluent
+  module Plugin
+    class TestBase < Base
+      # a base plugin class, but not input nor output
+      # mainly for helpers and owned plugins
+      include PluginId
+      include PluginLoggerMixin
+      include PluginHelper::Mixin
+    end
+  end
+end
 
 unless defined?(Test::Unit::AssertionFailedError)
   class Test::Unit::AssertionFailedError < StandardError
   end
 end
 
-include Fluent::Test::Helpers
+def config_element(name = 'test', argument = '', params = {}, elements = [])
+  Fluent::Config::Element.new(name, argument, params, elements)
+end
+
+def event_time(str=nil)
+  if str
+    Fluent::EventTime.parse(str)
+  else
+    Fluent::EventTime.now
+  end
+end
+
+def msgpack(type)
+  case type
+  when :factory
+    Fluent::MessagePackFactory.factory
+  when :packer
+    Fluent::MessagePackFactory.packer
+  when :unpacker
+    Fluent::MessagePackFactory.unpacker
+  else
+    raise ArgumentError, "unknown msgpack object type '#{type}'"
+  end
+end
+
+def unused_port(num = 1)
+  ports = []
+  sockets = []
+  num.times do
+    s = TCPServer.open(0)
+    sockets << s
+    ports << s.addr[1]
+  end
+  sockets.each{|s| s.close }
+  if num == 1
+    return ports.first
+  else
+    return *ports
+  end
+end
 
-def unused_port
-  s = TCPServer.open(0)
-  port = s.addr[1]
-  s.close
-  port
+def waiting(seconds, logs: nil, plugin: nil)
+  begin
+    Timeout.timeout(seconds) do
+      yield
+    end
+  rescue Timeout::Error
+    if logs
+      STDERR.print(*logs)
+    elsif plugin
+      STDERR.print(*plugin.log.out.logs)
+    end
+    raise
+  end
 end
 
 def ipv6_enabled?
@@ -68,4 +134,8 @@ def ipv6_enabled?
   end
 end
 
-$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)
+dl_opts = {}
+dl_opts[:log_level] = ServerEngine::DaemonLogger::WARN
+logdev = Fluent::Test::DummyLogDevice.new
+logger = ServerEngine::DaemonLogger.new(logdev, dl_opts)
+$log ||= Fluent::Log.new(logger)

data/test/plugin/test_bare_output.rb

@@ -0,0 +1,118 @@
+require_relative '../helper'
+require 'fluent/plugin/bare_output'
+require 'fluent/event'
+
+module FluentPluginBareOutputTest
+  class DummyPlugin < Fluent::Plugin::BareOutput
+    attr_reader :store
+    def initialize
+      super
+      @store = []
+    end
+    def process(tag, es)
+      es.each do |time, record|
+        @store << [tag, time, record]
+      end
+    end
+  end
+end
+
+class BareOutputTest < Test::Unit::TestCase
+  setup do
+    Fluent::Test.setup
+    @p = FluentPluginBareOutputTest::DummyPlugin.new
+  end
+
+  test 'has healthy lifecycle' do
+    assert !@p.configured?
+    @p.configure(config_element())
+    assert @p.configured?
+
+    assert !@p.started?
+    @p.start
+    assert @p.start
+
+    assert !@p.stopped?
+    @p.stop
+    assert @p.stopped?
+
+    assert !@p.before_shutdown?
+    @p.before_shutdown
+    assert @p.before_shutdown?
+
+    assert !@p.shutdown?
+    @p.shutdown
+    assert @p.shutdown?
+
+    assert !@p.after_shutdown?
+    @p.after_shutdown
+    assert @p.after_shutdown?
+
+    assert !@p.closed?
+    @p.close
+    assert @p.closed?
+
+    assert !@p.terminated?
+    @p.terminate
+    assert @p.terminated?
+  end
+
+  test 'has plugin_id automatically generated' do
+    assert @p.respond_to?(:plugin_id_configured?)
+    assert @p.respond_to?(:plugin_id)
+
+    @p.configure(config_element())
+
+    assert !@p.plugin_id_configured?
+    assert @p.plugin_id
+    assert{ @p.plugin_id != 'mytest' }
+  end
+
+  test 'has plugin_id manually configured' do
+    @p.configure(config_element('ROOT', '', {'@id' => 'mytest'}))
+    assert @p.plugin_id_configured?
+    assert_equal 'mytest', @p.plugin_id
+  end
+
+  test 'has plugin logger' do
+    assert @p.respond_to?(:log)
+    assert @p.log
+
+    # default logger
+    original_logger = @p.log
+
+    @p.configure(config_element('ROOT', '', {'@log_level' => 'debug'}))
+
+    assert{ @p.log.object_id != original_logger.object_id }
+    assert_equal Fluent::Log::LEVEL_DEBUG, @p.log.level
+  end
+
+  test 'can load plugin helpers' do
+    assert_nothing_raised do
+      class FluentPluginBareOutputTest::DummyPlugin2 < Fluent::Plugin::BareOutput
+        helpers :storage
+      end
+    end
+  end
+
+  test 'can get input event stream to write' do
+    @p.configure(config_element('ROOT'))
+    @p.start
+
+    es1 = Fluent::OneEventStream.new(event_time('2016-05-21 18:37:31 +0900'), {'k1' => 'v1'})
+    es2 = Fluent::ArrayEventStream.new([
+        [event_time('2016-05-21 18:38:33 +0900'), {'k2' => 'v2'}],
+        [event_time('2016-05-21 18:39:10 +0900'), {'k3' => 'v3'}],
+      ])
+    @p.emit_events('mytest1', es1)
+    @p.emit_events('mytest2', es2)
+
+    all_events = [
+      ['mytest1', event_time('2016-05-21 18:37:31 +0900'), {'k1' => 'v1'}],
+      ['mytest2', event_time('2016-05-21 18:38:33 +0900'), {'k2' => 'v2'}],
+      ['mytest2', event_time('2016-05-21 18:39:10 +0900'), {'k3' => 'v3'}],
+    ]
+
+    assert_equal all_events, @p.store
+  end
+end

data/test/plugin/test_base.rb

@@ -0,0 +1,75 @@
+require_relative '../helper'
+require 'fluent/plugin/base'
+
+module FluentPluginBaseTest
+  class DummyPlugin < Fluent::Plugin::Base
+  end
+end
+
+class BaseTest < Test::Unit::TestCase
+  setup do
+    @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
+    assert !@p.configured?
+    @p.configure(config_element())
+    assert @p.configured?
+
+    assert !@p.started?
+    @p.start
+    assert @p.start
+
+    assert !@p.stopped?
+    @p.stop
+    assert @p.stopped?
+
+    assert !@p.before_shutdown?
+    @p.before_shutdown
+    assert @p.before_shutdown?
+
+    assert !@p.shutdown?
+    @p.shutdown
+    assert @p.shutdown?
+
+    assert !@p.after_shutdown?
+    @p.after_shutdown
+    assert @p.after_shutdown?
+
+    assert !@p.closed?
+    @p.close
+    assert @p.closed?
+
+    assert !@p.terminated?
+    @p.terminate
+    assert @p.terminated?
+  end
+
+  test 'can access system config' do
+    assert @p.system_config
+
+    @p.system_config_override({'process_name' => 'mytest'})
+    assert_equal 'mytest', @p.system_config.process_name
+  end
+
+  test 'does not have router in default' do
+    assert !@p.has_router?
+  end
+
+  test 'is configurable by config_param and config_section' do
+    assert_nothing_raised do
+      class FluentPluginBaseTest::DummyPlugin2 < Fluent::Plugin::TestBase
+        config_param :myparam1, :string
+        config_section :mysection, multi: false do
+          config_param :myparam2, :integer
+        end
+      end
+    end
+    p2 = FluentPluginBaseTest::DummyPlugin2.new
+    assert_nothing_raised do
+      p2.configure(config_element('ROOT', '', {'myparam1' => 'myvalue1'}, [config_element('mysection', '', {'myparam2' => 99})]))
+    end
+    assert_equal 'myvalue1', p2.myparam1
+    assert_equal 99, p2.mysection.myparam2
+  end
+end

data/test/plugin/test_buf_file.rb

@@ -1,604 +1,503 @@
-# -*- coding: utf-8 -*-
 require_relative '../helper'
-require 'fluent/test'
 require 'fluent/plugin/buf_file'
+require 'fluent/plugin/output'
+require 'fluent/unique_id'
+require 'fluent/system_config'
+require 'fluent/env'
 
-require 'fileutils'
-
-require 'stringio'
 require 'msgpack'
 
-module FluentFileBufferTest
-  class FileBufferChunkTest < Test::Unit::TestCase
-    BUF_FILE_TMPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'buf_file_chunk'))
-
-    def setup
-      if Dir.exists? BUF_FILE_TMPDIR
-        FileUtils.remove_entry_secure BUF_FILE_TMPDIR
-      end
-      FileUtils.mkdir_p BUF_FILE_TMPDIR
-    end
-
-    def bufpath(unique, link=false)
-      File.join(BUF_FILE_TMPDIR, unique + '.log' + (link ? '.link' : ''))
-    end
-
-    def filebufferchunk(key, unique, opts={})
-      Fluent::FileBufferChunk.new(key, bufpath(unique), unique, opts[:mode] || "a+", opts[:symlink])
-    end
-
-    def test_init
-      chunk = filebufferchunk('key', 'init1')
-      assert_equal 'key', chunk.key
-      assert_equal 'init1', chunk.unique_id
-      assert_equal bufpath('init1'), chunk.path
-
-      chunk.close # size==0, then, unlinked
-
-      symlink_path = bufpath('init2', true)
-
-      chunk = filebufferchunk('key2', 'init2', symlink: symlink_path)
-      assert_equal 'key2', chunk.key
-      assert_equal 'init2', chunk.unique_id
-      assert File.exists?(symlink_path) && File.symlink?(symlink_path)
-
-      chunk.close # unlink
-
-      assert File.symlink?(symlink_path)
-      File.unlink(symlink_path)
-    end
-
-    def test_buffer_chunk_interface
-      chunk = filebufferchunk('key', 'interface1')
+module FluentPluginFileBufferTest
+  class DummyOutputPlugin < Fluent::Plugin::Output
+    Fluent::Plugin.register_output('buffer_file_test_output', self)
+  end
+end
 
-      assert chunk.respond_to?(:empty?)
-      assert chunk.respond_to?(:<<)
-      assert chunk.respond_to?(:size)
-      assert chunk.respond_to?(:close)
-      assert chunk.respond_to?(:purge)
-      assert chunk.respond_to?(:read)
-      assert chunk.respond_to?(:open)
-      assert chunk.respond_to?(:write_to)
-      assert chunk.respond_to?(:msgpack_each)
+class FileBufferTest < Test::Unit::TestCase
+  def metadata(timekey: nil, tag: nil, variables: nil)
+    Fluent::Plugin::Buffer::Metadata.new(timekey, tag, variables)
+  end
 
-      chunk.close
+  def write_metadata(path, chunk_id, metadata, size, ctime, mtime)
+    metadata = {
+      timekey: metadata.timekey, tag: metadata.tag, variables: metadata.variables,
+      id: chunk_id,
+      s: size,
+      c: ctime,
+      m: mtime,
+    }
+    File.open(path, 'wb') do |f|
+      f.write metadata.to_msgpack
     end
+  end
 
-    def test_empty?
-      chunk = filebufferchunk('e1', 'empty1')
-      assert chunk.empty?
-      chunk.close
+  sub_test_case 'non configured buffer plugin instance' do
+    setup do
+      Fluent::Test.setup
 
-      open(bufpath('empty2'), 'w') do |file|
-        file.write "data1\ndata2\n"
+      @dir = File.expand_path('../../tmp/buffer_file_dir', __FILE__)
+      unless File.exist?(@dir)
+        FileUtils.mkdir_p @dir
       end
-      chunk = filebufferchunk('e2', 'empty2')
-      assert !(chunk.empty?)
-      chunk.close
-    end
-
-    def test_append_close_purge
-      chunk = filebufferchunk('a1', 'append1')
-      assert chunk.empty?
-
-      test_data1 = ("1" * 9 + "\n" + "2" * 9 + "\n").force_encoding('ASCII-8BIT')
-      test_data2 = "日本語Japanese\n".force_encoding('UTF-8')
-      chunk << test_data1
-      chunk << test_data2
-      assert_equal 38, chunk.size
-      chunk.close
-
-      assert File.exists?(bufpath('append1'))
-
-      chunk = filebufferchunk('a1', 'append1', mode: 'r')
-      test_data = test_data1.force_encoding('ASCII-8BIT') + test_data2.force_encoding('ASCII-8BIT')
-
-      #### TODO: This assertion currently fails. Oops.
-      # FileBuffer#read does NOT do force_encoding('ASCII-8BIT'). So encoding of output string instance are 'UTF-8'.
-      # I think it is a kind of bug, but fixing it may break some behavior of buf_file. So I cannot be sure to fix it just now.
-      #
-      # assert_equal test_data, chunk.read
-
-      chunk.purge
-
-      assert !(File.exists?(bufpath('append1')))
-    end
-
-    def test_empty_chunk_key # for BufferedOutput#emit
-      chunk = filebufferchunk('', 'append1')
-      assert chunk.empty?
-
-      test_data1 = ("1" * 9 + "\n" + "2" * 9 + "\n").force_encoding('ASCII-8BIT')
-      test_data2 = "日本語Japanese\n".force_encoding('UTF-8')
-      chunk << test_data1
-      chunk << test_data2
-      assert_equal 38, chunk.size
-      chunk.close
-    end
-
-    def test_read
-      chunk = filebufferchunk('r1', 'read1')
-      assert chunk.empty?
-
-      d1 = "abcde" * 200 + "\n"
-      chunk << d1
-      d2 = "12345" * 200 + "\n"
-      chunk << d2
-      assert_equal (d1.size + d2.size), chunk.size
-
-      read_data = chunk.read
-      assert_equal (d1 + d2), read_data
-
-      chunk.purge
-    end
-
-    def test_open
-      chunk = filebufferchunk('o1', 'open1')
-      assert chunk.empty?
-
-      d1 = "abcde" * 200 + "\n"
-      chunk << d1
-      d2 = "12345" * 200 + "\n"
-      chunk << d2
-      assert_equal (d1.size + d2.size), chunk.size
-
-      read_data = chunk.open do |io|
-        io.read
+      Dir.glob(File.join(@dir, '*')).each do |path|
+        next if ['.', '..'].include?(File.basename(path))
+        File.delete(path)
       end
-      assert_equal (d1 + d2), read_data
-
-      chunk.purge
     end
 
-    def test_write_to
-      chunk = filebufferchunk('w1', 'write1')
-      assert chunk.empty?
-
-      d1 = "abcde" * 200 + "\n"
-      chunk << d1
-      d2 = "12345" * 200 + "\n"
-      chunk << d2
-      assert_equal (d1.size + d2.size), chunk.size
-
-      dummy_dst = StringIO.new
-
-      chunk.write_to(dummy_dst)
-      assert_equal (d1 + d2), dummy_dst.string
-
-      chunk.purge
+    test 'path should include * normally' do
+      d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      p = Fluent::Plugin::FileBuffer.new
+      p.owner = d
+      p.configure(config_element('buffer', '', {'path' => File.join(@dir, 'buffer.*.file')}))
+      assert_equal File.join(@dir, 'buffer.*.file'), p.path
     end
 
-    def test_msgpack_each
-      chunk = filebufferchunk('m1', 'msgpack1')
-      assert chunk.empty?
-
-      d0 = MessagePack.pack([[1, "foo"], [2, "bar"], [3, "baz"]])
-      d1 = MessagePack.pack({"key1" => "value1", "key2" => "value2"})
-      d2 = MessagePack.pack("string1")
-      d3 = MessagePack.pack(1)
-      d4 = MessagePack.pack(nil)
-      chunk << d0
-      chunk << d1
-      chunk << d2
-      chunk << d3
-      chunk << d4
-
-      store = []
-      chunk.msgpack_each do |data|
-        store << data
-      end
-
-      assert_equal 5, store.size
-      assert_equal [[1, "foo"], [2, "bar"], [3, "baz"]], store[0]
-      assert_equal({"key1" => "value1", "key2" => "value2"}, store[1])
-      assert_equal "string1", store[2]
-      assert_equal 1, store[3]
-      assert_equal nil, store[4]
-
-      chunk.purge
+    test 'existing directory will be used with additional default file name' do
+      d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      p = Fluent::Plugin::FileBuffer.new
+      p.owner = d
+      p.configure(config_element('buffer', '', {'path' => @dir}))
+      assert_equal File.join(@dir, 'buffer.*.log'), p.path
     end
 
-    def test_mv
-      chunk = filebufferchunk('m1', 'move1')
-      assert chunk.empty?
-
-      d1 = "abcde" * 200 + "\n"
-      chunk << d1
-      d2 = "12345" * 200 + "\n"
-      chunk << d2
-      assert_equal (d1.size + d2.size), chunk.size
-
-      assert_equal bufpath('move1'), chunk.path
-
-      assert File.exists?( bufpath( 'move1' ) )
-      assert !(File.exists?( bufpath( 'move2' ) ))
-
-      chunk.mv(bufpath('move2'))
-
-      assert !(File.exists?( bufpath( 'move1' ) ))
-      assert File.exists?( bufpath( 'move2' ) )
-
-      assert_equal bufpath('move2'), chunk.path
-
-      chunk.purge
+    test 'unexisting path without * handled as directory' do
+      d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      p = Fluent::Plugin::FileBuffer.new
+      p.owner = d
+      p.configure(config_element('buffer', '', {'path' => File.join(@dir, 'buffer')}))
+      assert_equal File.join(@dir, 'buffer', 'buffer.*.log'), p.path
     end
   end
 
-  class FileBufferTest < Test::Unit::TestCase
-    BUF_FILE_TMPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'buf_file'))
-
-    def setup
-      if Dir.exists? BUF_FILE_TMPDIR
-        FileUtils.remove_entry_secure BUF_FILE_TMPDIR
+  sub_test_case 'buffer plugin configured only with path' do
+    setup do
+      @bufdir = File.expand_path('../../tmp/buffer_file', __FILE__)
+      @bufpath = File.join(@bufdir, 'testbuf.*.log')
+      FileUtils.rm_r @bufdir if File.exist?(@bufdir)
+
+      Fluent::Test.setup
+      @d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      @p = Fluent::Plugin::FileBuffer.new
+      @p.owner = @d
+      @p.configure(config_element('buffer', '', {'path' => @bufpath}))
+      @p.start
+    end
+
+    teardown do
+      if @p
+        @p.stop unless @p.stopped?
+        @p.before_shutdown unless @p.before_shutdown?
+        @p.shutdown unless @p.shutdown?
+        @p.after_shutdown unless @p.after_shutdown?
+        @p.close unless @p.closed?
+        @p.terminate unless @p.terminated?
       end
-      FileUtils.mkdir_p BUF_FILE_TMPDIR
-    end
-
-    def bufpath(basename)
-      File.join(BUF_FILE_TMPDIR, basename)
-    end
-
-    def filebuffer(key, unique, opts={})
-      Fluent::FileBufferChunk.new(key, bufpath(unique), unique, opts[:mode] || "a+", opts[:symlink])
-    end
-
-    def test_init_configure
-      buf = Fluent::FileBuffer.new
-
-      assert_raise(Fluent::ConfigError){ buf.configure({}) }
-
-      buf.configure({'buffer_path' => bufpath('configure1.*.log')})
-      assert_equal bufpath('configure1.*.log'), buf.buffer_path
-      assert_equal nil, buf.symlink_path
-      assert_equal false, buf.instance_eval{ @flush_at_shutdown }
-
-      buf2 = Fluent::FileBuffer.new
-
-      # Same buffer_path value is rejected, not to overwrite exisitng buffer file.
-      assert_raise(Fluent::ConfigError){ buf2.configure({'buffer_path' => bufpath('configure1.*.log')}) }
-
-      buf2.configure({'buffer_path' => bufpath('configure2.*.log'), 'flush_at_shutdown' => ''})
-      assert_equal bufpath('configure2.*.log'), buf2.buffer_path
-      assert_equal true, buf2.instance_eval{ @flush_at_shutdown }
-    end
-
-    def test_configure_path_prefix_suffix
-      # With '*' in path, prefix is the part before '*', suffix is the part after '*'
-      buf = Fluent::FileBuffer.new
-
-      path1 = bufpath('suffpref1.*.log')
-      prefix1, suffix1 = path1.split('*', 2)
-      buf.configure({'buffer_path' => path1})
-      assert_equal prefix1, buf.instance_eval{ @buffer_path_prefix }
-      assert_equal suffix1, buf.instance_eval{ @buffer_path_suffix }
-
-      # Without '*', prefix is the string of whole path + '.', suffix is '.log'
-      path2 = bufpath('suffpref2')
-      buf.configure({'buffer_path' => path2})
-      assert_equal path2 + '.', buf.instance_eval{ @buffer_path_prefix }
-      assert_equal '.log', buf.instance_eval{ @buffer_path_suffix }
-    end
-
-    class DummyOutput
-      attr_accessor :written
-
-      def write(chunk)
-        @written ||= []
-        @written.push chunk
-        "return value"
+      if @bufdir
+        Dir.glob(File.join(@bufdir, '*')).each do |path|
+          next if ['.', '..'].include?(File.basename(path))
+          File.delete(path)
+        end
       end
     end
 
-    def test_encode_key
-      buf = Fluent::FileBuffer.new
-      safe_chars = '-_.abcdefgxyzABCDEFGXYZ0123456789'
-      assert_equal safe_chars, buf.send(:encode_key, safe_chars)
-      unsafe_chars = '-_.abcdefgxyzABCDEFGXYZ0123456789 ~/*()'
-      assert_equal safe_chars + '%20%7E%2F%2A%28%29', buf.send(:encode_key, unsafe_chars)
+    test 'this is persistent plugin' do
+      assert @p.persistent?
     end
 
-    def test_decode_key
-      buf = Fluent::FileBuffer.new
-      safe_chars = '-_.abcdefgxyzABCDEFGXYZ0123456789'
-      assert_equal safe_chars, buf.send(:decode_key, safe_chars)
-      unsafe_chars = '-_.abcdefgxyzABCDEFGXYZ0123456789 ~/*()'
-      assert_equal unsafe_chars, buf.send(:decode_key, safe_chars + '%20%7E%2F%2A%28%29')
+    test '#start creates directory for buffer chunks' do
+      plugin = Fluent::Plugin::FileBuffer.new
+      plugin.owner = @d
+      rand_num = rand(0..100)
+      bufpath = File.join(File.expand_path("../../tmp/buffer_file_#{rand_num}", __FILE__), 'testbuf.*.log')
+      bufdir = File.dirname(bufpath)
 
-      assert_equal safe_chars, buf.send(:decode_key, buf.send(:encode_key, safe_chars))
-      assert_equal unsafe_chars, buf.send(:decode_key, buf.send(:encode_key, unsafe_chars))
-    end
+      FileUtils.rm_r bufdir if File.exist?(bufdir)
+      assert !File.exist?(bufdir)
 
-    def test_make_path
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('makepath.*.log')})
-      prefix = buf.instance_eval{ @buffer_path_prefix }
-      suffix = buf.instance_eval{ @buffer_path_suffix }
+      plugin.configure(config_element('buffer', '', {'path' => bufpath}))
+      assert !File.exist?(bufdir)
 
-      path,tsuffix = buf.send(:make_path, buf.send(:encode_key, 'foo bar'), 'b')
-      assert path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.[bq][0-9a-f]+#{suffix}\Z/, "invalid format:#{path}"
-      assert tsuffix =~ /\A[0-9a-f]+\Z/, "invalid hexadecimal:#{tsuffix}"
+      plugin.start
+      assert File.exist?(bufdir)
+      assert{ File.stat(bufdir).mode.to_s(8).end_with?('755') }
 
-      path,tsuffix = buf.send(:make_path, buf.send(:encode_key, 'baz 123'), 'q')
-      assert path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.[bq][0-9a-f]+#{suffix}\Z/, "invalid format:#{path}"
-      assert tsuffix =~ /\A[0-9a-f]+\Z/, "invalid hexadecimal:#{tsuffix}"
+      plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
+      FileUtils.rm_r bufdir
     end
 
-    def test_tsuffix_to_unique_id
-      buf = Fluent::FileBuffer.new
-      # why *2 ? frsyuki said "I forgot why completely."
-      assert_equal "\xFF\xFF\xFF\xFF".force_encoding('ASCII-8BIT'), buf.send(:tsuffix_to_unique_id, 'ffff')
-      assert_equal "\x88\x00\xFF\x00\x11\xEE\x88\x00\xFF\x00\x11\xEE".force_encoding('ASCII-8BIT'), buf.send(:tsuffix_to_unique_id, '8800ff0011ee')
-    end
-
-    def test_start_makes_parent_directories
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('start/base.*.log')})
-      parent_dirname = File.dirname(buf.instance_eval{ @buffer_path_prefix })
-      assert !(Dir.exists?(parent_dirname))
-      buf.start
-      assert Dir.exists?(parent_dirname)
-    end
+    test '#start creates directory for buffer chunks with specified permission' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
 
-    def test_new_chunk
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('new_chunk_1')})
-      prefix = buf.instance_eval{ @buffer_path_prefix }
-      suffix = buf.instance_eval{ @buffer_path_suffix }
-
-      chunk = buf.new_chunk('key1')
-      assert chunk
-      assert File.exists?(chunk.path)
-      assert chunk.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.b[0-9a-f]+#{suffix}\Z/, "path from new_chunk must be a 'b' buffer chunk"
-      chunk.close
-    end
+      plugin = Fluent::Plugin::FileBuffer.new
+      plugin.owner = @d
+      rand_num = rand(0..100)
+      bufpath = File.join(File.expand_path("../../tmp/buffer_file_#{rand_num}", __FILE__), 'testbuf.*.log')
+      bufdir = File.dirname(bufpath)
 
-    def test_chunk_identifier_in_path
-      buf1 = Fluent::FileBuffer.new
-      buf1.configure({'buffer_path' => bufpath('chunkid1')})
-      prefix1 = buf1.instance_eval{ @buffer_path_prefix }
-      suffix1 = buf1.instance_eval{ @buffer_path_suffix }
+      FileUtils.rm_r bufdir if File.exist?(bufdir)
+      assert !File.exist?(bufdir)
 
-      chunk1 = buf1.new_chunk('key1')
-      assert_equal chunk1.path, prefix1 + buf1.chunk_identifier_in_path(chunk1.path) + suffix1
+      plugin.configure(config_element('buffer', '', {'path' => bufpath, 'dir_permission' => 0700}))
+      assert !File.exist?(bufdir)
 
-      buf2 = Fluent::FileBuffer.new
-      buf2.configure({'buffer_path' => bufpath('chunkid2')})
-      prefix2 = buf2.instance_eval{ @buffer_path_prefix }
-      suffix2 = buf2.instance_eval{ @buffer_path_suffix }
+      plugin.start
+      assert File.exist?(bufdir)
+      assert{ File.stat(bufdir).mode.to_s(8).end_with?('700') }
 
-      chunk2 = buf2.new_chunk('key2')
-      assert_equal chunk2.path, prefix2 + buf2.chunk_identifier_in_path(chunk2.path) + suffix2
+      plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
+      FileUtils.rm_r bufdir
     end
 
-    def test_enqueue_moves_chunk_from_b_to_q
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('enqueue1')})
-      prefix = buf.instance_eval{ @buffer_path_prefix }
-      suffix = buf.instance_eval{ @buffer_path_suffix }
+    test '#start creates directory for buffer chunks with specified permission via system config' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
 
-      chunk = buf.new_chunk('key1')
-      chunk << "data1\ndata2\n"
+      sysconf = {'dir_permission' => '700'}
+      Fluent::SystemConfig.overwrite_system_config(sysconf) do
+        plugin = Fluent::Plugin::FileBuffer.new
+        plugin.owner = @d
+        rand_num = rand(0..100)
+        bufpath = File.join(File.expand_path("../../tmp/buffer_file_#{rand_num}", __FILE__), 'testbuf.*.log')
+        bufdir = File.dirname(bufpath)
 
-      assert chunk
-      old_path = chunk.path.dup
-      assert File.exists?(chunk.path)
-      assert chunk.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.b[0-9a-f]+#{suffix}\Z/, "path from new_chunk must be a 'b' buffer chunk"
+        FileUtils.rm_r bufdir if File.exist?(bufdir)
+        assert !File.exist?(bufdir)
 
-      buf.enqueue(chunk)
+        plugin.configure(config_element('buffer', '', {'path' => bufpath}))
+        assert !File.exist?(bufdir)
 
-      assert chunk
-      assert File.exists?(chunk.path)
-      assert !(File.exists?(old_path))
-      assert chunk.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.q[0-9a-f]+#{suffix}\Z/, "enqueued chunk's path must be a 'q' buffer chunk"
+        plugin.start
+        assert File.exist?(bufdir)
+        assert{ File.stat(bufdir).mode.to_s(8).end_with?('700') }
 
-      data = chunk.read
-      assert "data1\ndata2\n", data
+        plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
+        FileUtils.rm_r bufdir
+      end
     end
 
-    # empty chunk keys are used w/ BufferedOutput
-    #  * ObjectBufferedOutput's keys are tag
-    #  * TimeSlicedOutput's keys are time_key
-    def test_enqueue_chunk_with_empty_key
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('enqueue2')})
-      prefix = buf.instance_eval{ @buffer_path_prefix }
-      suffix = buf.instance_eval{ @buffer_path_suffix }
-
-      chunk = buf.new_chunk('')
-      chunk << "data1\ndata2\n"
-
-      assert chunk
-      old_path = chunk.path.dup
-      assert File.exists?(chunk.path)
-      # chunk key is empty
-      assert chunk.path =~ /\A#{prefix}\.b[0-9a-f]+#{suffix}\Z/, "path from new_chunk must be a 'b' buffer chunk"
-
-      buf.enqueue(chunk)
-
-      assert chunk
-      assert File.exists?(chunk.path)
-      assert !(File.exists?(old_path))
-      # chunk key is empty
-      assert chunk.path =~ /\A#{prefix}\.q[0-9a-f]+#{suffix}\Z/, "enqueued chunk's path must be a 'q' buffer chunk"
-
-      data = chunk.read
-      assert "data1\ndata2\n", data
+    test '#generate_chunk generates blank file chunk on path from unique_id of metadata' do
+      m1 = metadata()
+      c1 = @p.generate_chunk(m1)
+      assert c1.is_a? Fluent::Plugin::Buffer::FileChunk
+      assert_equal m1, c1.metadata
+      assert c1.empty?
+      assert_equal :staged, c1.state
+      assert_equal Fluent::Plugin::Buffer::FileChunk::FILE_PERMISSION, c1.permission
+      assert_equal @bufpath.gsub('.*.', ".b#{Fluent::UniqueId.hex(c1.unique_id)}."), c1.path
+      assert{ File.stat(c1.path).mode.to_s(8).end_with?('644') }
+
+      m2 = metadata(timekey: event_time('2016-04-17 11:15:00 -0700').to_i)
+      c2 = @p.generate_chunk(m2)
+      assert c2.is_a? Fluent::Plugin::Buffer::FileChunk
+      assert_equal m2, c2.metadata
+      assert c2.empty?
+      assert_equal :staged, c2.state
+      assert_equal Fluent::Plugin::Buffer::FileChunk::FILE_PERMISSION, c2.permission
+      assert_equal @bufpath.gsub('.*.', ".b#{Fluent::UniqueId.hex(c2.unique_id)}."), c2.path
+      assert{ File.stat(c2.path).mode.to_s(8).end_with?('644') }
+
+      c1.purge
+      c2.purge
+    end
+
+    test '#generate_chunk generates blank file chunk with specified permission' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
+      plugin = Fluent::Plugin::FileBuffer.new
+      plugin.owner = @d
+      rand_num = rand(0..100)
+      bufpath = File.join(File.expand_path("../../tmp/buffer_file_#{rand_num}", __FILE__), 'testbuf.*.log')
+      bufdir = File.dirname(bufpath)
+
+      FileUtils.rm_r bufdir if File.exist?(bufdir)
+      assert !File.exist?(bufdir)
+
+      plugin.configure(config_element('buffer', '', {'path' => bufpath, 'file_permission' => 0600}))
+      assert !File.exist?(bufdir)
+      plugin.start
+
+      m = metadata()
+      c = plugin.generate_chunk(m)
+      assert c.is_a? Fluent::Plugin::Buffer::FileChunk
+      assert_equal m, c.metadata
+      assert c.empty?
+      assert_equal :staged, c.state
+      assert_equal 0600, c.permission
+      assert_equal bufpath.gsub('.*.', ".b#{Fluent::UniqueId.hex(c.unique_id)}."), c.path
+      assert{ File.stat(c.path).mode.to_s(8).end_with?('600') }
+
+      c.purge
+
+      plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
+      FileUtils.rm_r bufdir
     end
+  end
 
-    def test_before_shutdown_without_flush_at_shutdown
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('before_shutdown1')})
-      buf.start
-
-      # before_shutdown does nothing
-
-      c1 = [ buf.new_chunk('k0'), buf.new_chunk('k1'), buf.new_chunk('k2'), buf.new_chunk('k3') ]
-      c2 = [ buf.new_chunk('q0'), buf.new_chunk('q1') ]
 
-      buf.instance_eval do
-        @map = {
-          'k0' => c1[0], 'k1' => c1[1], 'k2' => c1[2], 'k3' => c1[3],
-          'q0' => c2[0], 'q1' => c2[1]
-        }
+  sub_test_case 'there are no existing file chunks' do
+    setup do
+      @bufdir = File.expand_path('../../tmp/buffer_file', __FILE__)
+      @bufpath = File.join(@bufdir, 'testbuf.*.log')
+      FileUtils.rm_r @bufdir if File.exist?(@bufdir)
+
+      Fluent::Test.setup
+      @d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      @p = Fluent::Plugin::FileBuffer.new
+      @p.owner = @d
+      @p.configure(config_element('buffer', '', {'path' => @bufpath}))
+      @p.start
+    end
+    teardown do
+      if @p
+        @p.stop unless @p.stopped?
+        @p.before_shutdown unless @p.before_shutdown?
+        @p.shutdown unless @p.shutdown?
+        @p.after_shutdown unless @p.after_shutdown?
+        @p.close unless @p.closed?
+        @p.terminate unless @p.terminated?
       end
-      c1[0] << "data1\ndata2\n"
-      c1[1] << "data1\ndata2\n"
-      c1[2] << "data1\ndata2\n"
-      # k3 chunk is empty!
-
-      c2[0] << "data1\ndata2\n"
-      c2[1] << "data1\ndata2\n"
-      buf.push('q0')
-      buf.push('q1')
-
-      buf.instance_eval do
-        @enqueue_hook_times = 0
-        def enqueue(chunk)
-          @enqueue_hook_times += 1
+      if @bufdir
+        Dir.glob(File.join(@bufdir, '*')).each do |path|
+          next if ['.', '..'].include?(File.basename(path))
+          File.delete(path)
         end
       end
-      assert_equal 0, buf.instance_eval{ @enqueue_hook_times }
-
-      out = DummyOutput.new
-      assert_equal nil, out.written
-
-      buf.before_shutdown(out)
-
-      assert_equal 0, buf.instance_eval{ @enqueue_hook_times } # k0, k1, k2
-      assert_nil out.written
     end
 
-    def test_before_shutdown_with_flush_at_shutdown
-      buf = Fluent::FileBuffer.new
-      buf.configure({'buffer_path' => bufpath('before_shutdown2'), 'flush_at_shutdown' => 'true'})
-      buf.start
-
-      # before_shutdown flushes all chunks in @map and @queue
-
-      c1 = [ buf.new_chunk('k0'), buf.new_chunk('k1'), buf.new_chunk('k2'), buf.new_chunk('k3') ]
-      c2 = [ buf.new_chunk('q0'), buf.new_chunk('q1') ]
+    test '#resume returns empty buffer state' do
+      ary = @p.resume
+      assert_equal({}, ary[0])
+      assert_equal([], ary[1])
+    end
+  end
 
-      buf.instance_eval do
-        @map = {
-          'k0' => c1[0], 'k1' => c1[1], 'k2' => c1[2], 'k3' => c1[3],
-          'q0' => c2[0], 'q1' => c2[1]
-        }
+  sub_test_case 'there are some existing file chunks' do
+    setup do
+      @bufdir = File.expand_path('../../tmp/buffer_file', __FILE__)
+      FileUtils.mkdir_p @bufdir unless File.exist?(@bufdir)
+
+      @c1id = Fluent::UniqueId.generate
+      p1 = File.join(@bufdir, "etest.q#{Fluent::UniqueId.hex(@c1id)}.log")
+      File.open(p1, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 13:58:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 13:58:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 13:58:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t4.test", event_time('2016-04-17 13:58:22 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      write_metadata(
+        p1 + '.meta', @c1id, metadata(timekey: event_time('2016-04-17 13:58:00 -0700').to_i),
+        4, event_time('2016-04-17 13:58:00 -0700').to_i, event_time('2016-04-17 13:58:22 -0700').to_i
+      )
+
+      @c2id = Fluent::UniqueId.generate
+      p2 = File.join(@bufdir, "etest.q#{Fluent::UniqueId.hex(@c2id)}.log")
+      File.open(p2, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 13:59:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 13:59:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 13:59:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      write_metadata(
+        p2 + '.meta', @c2id, metadata(timekey: event_time('2016-04-17 13:59:00 -0700').to_i),
+        3, event_time('2016-04-17 13:59:00 -0700').to_i, event_time('2016-04-17 13:59:23 -0700').to_i
+      )
+
+      @c3id = Fluent::UniqueId.generate
+      p3 = File.join(@bufdir, "etest.b#{Fluent::UniqueId.hex(@c3id)}.log")
+      File.open(p3, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:00:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:00:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:00:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t4.test", event_time('2016-04-17 14:00:28 -0700').to_i, {"message" => "yay"}].to_json + "\n"
       end
-      c1[0] << "data1\ndata2\n"
-      c1[1] << "data1\ndata2\n"
-      c1[2] << "data1\ndata2\n"
-      # k3 chunk is empty!
-
-      c2[0] << "data1\ndata2\n"
-      c2[1] << "data1\ndata2\n"
-      buf.push('q0')
-      buf.push('q1')
-
-      buf.instance_eval do
-        @enqueue_hook_times = 0
-        def enqueue(chunk)
-          @enqueue_hook_times += 1
+      write_metadata(
+        p3 + '.meta', @c3id, metadata(timekey: event_time('2016-04-17 14:00:00 -0700').to_i),
+        4, event_time('2016-04-17 14:00:00 -0700').to_i, event_time('2016-04-17 14:00:28 -0700').to_i
+      )
+
+      @c4id = Fluent::UniqueId.generate
+      p4 = File.join(@bufdir, "etest.b#{Fluent::UniqueId.hex(@c4id)}.log")
+      File.open(p4, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:01:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:01:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:01:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      write_metadata(
+        p4 + '.meta', @c4id, metadata(timekey: event_time('2016-04-17 14:01:00 -0700').to_i),
+        3, event_time('2016-04-17 14:01:00 -0700').to_i, event_time('2016-04-17 14:01:25 -0700').to_i
+      )
+
+      @bufpath = File.join(@bufdir, 'etest.*.log')
+
+      Fluent::Test.setup
+      @d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      @p = Fluent::Plugin::FileBuffer.new
+      @p.owner = @d
+      @p.configure(config_element('buffer', '', {'path' => @bufpath}))
+      @p.start
+    end
+
+    teardown do
+      if @p
+        @p.stop unless @p.stopped?
+        @p.before_shutdown unless @p.before_shutdown?
+        @p.shutdown unless @p.shutdown?
+        @p.after_shutdown unless @p.after_shutdown?
+        @p.close unless @p.closed?
+        @p.terminate unless @p.terminated?
+      end
+      if @bufdir
+        Dir.glob(File.join(@bufdir, '*')).each do |path|
+          next if ['.', '..'].include?(File.basename(path))
+          File.delete(path)
         end
       end
-      assert_equal 0, buf.instance_eval{ @enqueue_hook_times }
-
-      out = DummyOutput.new
-      assert_equal nil, out.written
-
-      buf.before_shutdown(out)
-
-      assert_equal 3, buf.instance_eval{ @enqueue_hook_times } # k0, k1, k2
-      assert_equal 5, out.written.size
-      assert_equal [c2[0], c2[1], c1[0], c1[1], c1[2]], out.written
     end
 
-    def test_resume
-      buffer_path_for_resume_test = bufpath('resume')
-
-      buf1 = Fluent::FileBuffer.new
-      buf1.configure({'buffer_path' => buffer_path_for_resume_test})
-      prefix = buf1.instance_eval{ @buffer_path_prefix }
-      suffix = buf1.instance_eval{ @buffer_path_suffix }
-
-      buf1.start
+    test '#resume returns staged/queued chunks with metadata' do
+      assert_equal 2, @p.stage.size
+      assert_equal 2, @p.queue.size
 
-      chunk1 = buf1.new_chunk('key1')
-      chunk1 << "data1\ndata2\n"
+      stage = @p.stage
 
-      chunk2 = buf1.new_chunk('key2')
-      chunk2 << "data3\ndata4\n"
+      m3 = metadata(timekey: event_time('2016-04-17 14:00:00 -0700').to_i)
+      assert_equal @c3id, stage[m3].unique_id
+      assert_equal 4, stage[m3].size
+      assert_equal :staged, stage[m3].state
 
-      assert chunk1
-      assert chunk1.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.b[0-9a-f]+#{suffix}\Z/, "path from new_chunk must be a 'b' buffer chunk"
-
-      buf1.enqueue(chunk1)
-
-      assert chunk1
-      assert chunk1.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.q[0-9a-f]+#{suffix}\Z/, "chunk1 must be enqueued"
-      assert chunk2
-      assert chunk2.path =~ /\A#{prefix}[-_.a-zA-Z0-9\%]+\.b[0-9a-f]+#{suffix}\Z/, "chunk2 is not enqueued yet"
-
-      buf1.shutdown
+      m4 = metadata(timekey: event_time('2016-04-17 14:01:00 -0700').to_i)
+      assert_equal @c4id, stage[m4].unique_id
+      assert_equal 3, stage[m4].size
+      assert_equal :staged, stage[m4].state
+    end
 
-      buf2 = Fluent::FileBuffer.new
-      Fluent::FileBuffer.send(:class_variable_set, :'@@buffer_paths', {})
-      buf2.configure({'buffer_path' => buffer_path_for_resume_test})
-      prefix = buf2.instance_eval{ @buffer_path_prefix }
-      suffix = buf2.instance_eval{ @buffer_path_suffix }
+    test '#resume returns queued chunks ordered by last modified time (FIFO)' do
+      assert_equal 2, @p.stage.size
+      assert_equal 2, @p.queue.size
 
-      # buf1.start -> resume is normal operation, but now, we cannot it.
-      queue, map = buf2.resume
+      queue = @p.queue
 
-      assert_equal 1, queue.size
-      assert_equal 1, map.size
+      assert{ queue[0].modified_at < queue[1].modified_at }
 
-      resumed_chunk1 = queue.first
-      assert_equal chunk1.path, resumed_chunk1.path
-      resumed_chunk2 = map['key2']
-      assert_equal chunk2.path, resumed_chunk2.path
+      assert_equal @c1id, queue[0].unique_id
+      assert_equal :queued, queue[0].state
+      assert_equal event_time('2016-04-17 13:58:00 -0700').to_i, queue[0].metadata.timekey
+      assert_nil queue[0].metadata.tag
+      assert_nil queue[0].metadata.variables
+      assert_equal Time.parse('2016-04-17 13:58:00 -0700').localtime, queue[0].created_at
+      assert_equal Time.parse('2016-04-17 13:58:22 -0700').localtime, queue[0].modified_at
+      assert_equal 4, queue[0].size
 
-      assert_equal "data1\ndata2\n", resumed_chunk1.read
-      assert_equal "data3\ndata4\n", resumed_chunk2.read
+      assert_equal @c2id, queue[1].unique_id
+      assert_equal :queued, queue[1].state
+      assert_equal event_time('2016-04-17 13:59:00 -0700').to_i, queue[1].metadata.timekey
+      assert_nil queue[1].metadata.tag
+      assert_nil queue[1].metadata.variables
+      assert_equal Time.parse('2016-04-17 13:59:00 -0700').localtime, queue[1].created_at
+      assert_equal Time.parse('2016-04-17 13:59:23 -0700').localtime, queue[1].modified_at
+      assert_equal 3, queue[1].size
     end
+  end
 
-    class DummyChain
-      def next
-        true
+  sub_test_case 'there are some existing file chunks without metadata file' do
+    setup do
+      @bufdir = File.expand_path('../../tmp/buffer_file', __FILE__)
+
+      @c1id = Fluent::UniqueId.generate
+      p1 = File.join(@bufdir, "etest.201604171358.q#{Fluent::UniqueId.hex(@c1id)}.log")
+      File.open(p1, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 13:58:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 13:58:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 13:58:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t4.test", event_time('2016-04-17 13:58:22 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      FileUtils.touch(p1, mtime: Time.parse('2016-04-17 13:58:28 -0700'))
+
+      @c2id = Fluent::UniqueId.generate
+      p2 = File.join(@bufdir, "etest.201604171359.q#{Fluent::UniqueId.hex(@c2id)}.log")
+      File.open(p2, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 13:59:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 13:59:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 13:59:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      FileUtils.touch(p2, mtime: Time.parse('2016-04-17 13:59:30 -0700'))
+
+      @c3id = Fluent::UniqueId.generate
+      p3 = File.join(@bufdir, "etest.201604171400.b#{Fluent::UniqueId.hex(@c3id)}.log")
+      File.open(p3, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:00:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:00:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:00:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t4.test", event_time('2016-04-17 14:00:28 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      FileUtils.touch(p3, mtime: Time.parse('2016-04-17 14:00:29 -0700'))
+
+      @c4id = Fluent::UniqueId.generate
+      p4 = File.join(@bufdir, "etest.201604171401.b#{Fluent::UniqueId.hex(@c4id)}.log")
+      File.open(p4, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:01:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:01:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:01:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      FileUtils.touch(p4, mtime: Time.parse('2016-04-17 14:01:22 -0700'))
+
+      @bufpath = File.join(@bufdir, 'etest.*.log')
+
+      Fluent::Test.setup
+      @d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      @p = Fluent::Plugin::FileBuffer.new
+      @p.owner = @d
+      @p.configure(config_element('buffer', '', {'path' => @bufpath}))
+      @p.start
+    end
+
+    teardown do
+      if @p
+        @p.stop unless @p.stopped?
+        @p.before_shutdown unless @p.before_shutdown?
+        @p.shutdown unless @p.shutdown?
+        @p.after_shutdown unless @p.after_shutdown?
+        @p.close unless @p.closed?
+        @p.terminate unless @p.terminated?
+      end
+      if @bufdir
+        Dir.glob(File.join(@bufdir, '*')).each do |path|
+          next if ['.', '..'].include?(File.basename(path))
+          File.delete(path)
+        end
       end
     end
 
-    def test_resume_only_for_my_buffer_path
-      chain = DummyChain.new
-
-      buffer_path_for_resume_test_1 = bufpath('resume_fix.1.*.log')
-      buffer_path_for_resume_test_2 = bufpath('resume_fix.*.log')
-
-      buf1 = Fluent::FileBuffer.new
-      buf1.configure({'buffer_path' => buffer_path_for_resume_test_1})
-      buf1.start
-
-      buf1.emit('key1', "x1\ty1\tz1\n", chain)
-      buf1.emit('key1', "x2\ty2\tz2\n", chain)
+    test '#resume returns queued chunks for files without metadata' do
+      assert_equal 0, @p.stage.size
+      assert_equal 4, @p.queue.size
 
-      assert buf1.instance_eval{ @map['key1'] }
+      queue = @p.queue
 
-      buf1.shutdown
+      m = metadata()
 
-      buf2 = Fluent::FileBuffer.new
-      buf2.configure({'buffer_path' => buffer_path_for_resume_test_2}) # other buffer_path
+      assert_equal @c1id, queue[0].unique_id
+      assert_equal m, queue[0].metadata
+      assert_equal 0, queue[0].size
+      assert_equal :queued, queue[0].state
+      assert_equal Time.parse('2016-04-17 13:58:28 -0700'), queue[0].modified_at
 
-      queue, map = buf2.resume
+      assert_equal @c2id, queue[1].unique_id
+      assert_equal m, queue[1].metadata
+      assert_equal 0, queue[1].size
+      assert_equal :queued, queue[1].state
+      assert_equal Time.parse('2016-04-17 13:59:30 -0700'), queue[1].modified_at
 
-      assert_equal 0, queue.size
+      assert_equal @c3id, queue[2].unique_id
+      assert_equal m, queue[2].metadata
+      assert_equal 0, queue[2].size
+      assert_equal :queued, queue[2].state
+      assert_equal Time.parse('2016-04-17 14:00:29 -0700'), queue[2].modified_at
 
-      ### TODO: This map size MUST be 0, but actually, 1
-      # This is because 1.XXXXX is misunderstood like chunk key of resume_fix.*.log.
-      # This may be a kind of bug, but we cannot decide whether 1. is a part of chunk key or not,
-      # because current version of buffer plugin uses '.'(dot) as a one of chars for chunk encoding.
-      # I think that this is a mistake of design, but we cannot fix it because updated plugin become
-      # not to be able to resume existing file buffer chunk.
-      # We will fix it in next API version of buffer plugin.
-      assert_equal 1, map.size
+      assert_equal @c4id, queue[3].unique_id
+      assert_equal m, queue[3].metadata
+      assert_equal 0, queue[3].size
+      assert_equal :queued, queue[3].state
+      assert_equal Time.parse('2016-04-17 14:01:22 -0700'), queue[3].modified_at
     end
   end
 end