Kentaro Hayashi
null+****@clear*****
Wed Apr 12 18:34:28 JST 2017
Kentaro Hayashi 2017-04-12 18:34:28 +0900 (Wed, 12 Apr 2017) New Revision: 6a6186dec8aaf0c9b8dbd06329cf6ced7d5aea0c https://github.com/groonga/fluent-plugin-groonga/commit/6a6186dec8aaf0c9b8dbd06329cf6ced7d5aea0c Merged 780ee73: Merge pull request #16 from groonga/use-v0.14-api-out-groonga Message: test: use Fluent::Test::Driver for v0.14 Modified files: test/test_output.rb Modified: test/test_output.rb (+15 -11) =================================================================== --- test/test_output.rb 2017-04-12 18:26:01 +0900 (9480164) +++ test/test_output.rb 2017-04-12 18:34:28 +0900 (85db954) @@ -22,6 +22,7 @@ require "webrick/config" require "webrick/httpresponse" require "fluent/test" +require "fluent/test/driver/output" require "fluent/test/helpers" require "fluent/plugin/out_groonga" @@ -37,8 +38,7 @@ class GroongaOutputTest < Test::Unit::TestCase private def create_driver(tag) - driver = Fluent::Test::BufferedOutputTestDriver.new(Fluent::Plugin::GroongaOutput, - tag) + driver = Fluent::Test::Driver::Output.new(Fluent::Plugin::GroongaOutput) driver.configure(configuration) driver end @@ -103,8 +103,9 @@ EOC @response_body = JSON.generate([[0, 0.0, 0.0], true]) driver = create_driver("groonga.command.table_create") time = event_time("2012-10-26T08:45:42Z") - driver.emit({"name" => "Users"}, time) - driver.run + driver.run(default_tag: "groonga.command.table_create") do + driver.feed(time, {"name" => "Users"}) + end assert_equal("/d/table_create?name=Users", @request_parser.request_url) end @@ -122,8 +123,9 @@ EOC @response_body = JSON.generate([[0, 0.0, 0.0], [1]]) driver = create_driver("log") time = event_time("2012-10-26T08:45:42Z") - driver.emit({"message" => "1st message"}, time) - driver.run + driver.run(default_tag: "log") do + driver.feed(time, {"message" => "1st message"}) + end assert_equal("/d/load?table=Logs", @request_parser.request_url) assert_equal([{"message" => "1st message"}], @@ -134,9 +136,10 @@ EOC @response_body = JSON.generate([[0, 0.0, 0.0], [2]]) driver = create_driver("log") time = event_time("2012-10-26T08:45:42Z") - driver.emit({"message" => "1st message"}, time) - driver.emit({"message" => "2nd message"}, time + 1) - driver.run + driver.run(default_tag: "log") do + driver.feed(time, {"message" => "1st message"}) + driver.feed(time + 1, {"message" => "2nd message"}) + end assert_equal("/d/load?table=Logs", @request_parser.request_url) assert_equal([ @@ -234,8 +237,9 @@ EOC def test_basic_command driver = create_driver("groonga.command.table_create") time = event_time("2012-10-26T08:45:42Z") - driver.emit({"name" => "Users"}, time) - driver.run + driver.run(default_tag: "groonga.command.table_create") do + driver.feed(time, {"name" => "Users"}) + end assert_equal([ [ "--input-fd", actual_input_fd, -------------- next part -------------- HTML����������������������������...다운로드
