merges r23618 from trunk into ruby_1_9_1.

--
* test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 59 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 93bca74a2..4a0c8e233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  2 13:27:21 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]
+
 Mon Jun  1 11:21:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* cont.c (cont_capture, fiber_store): reraise transferred error.
diff --git a/test/ripper/test_filter.rb b/test/ripper/test_filter.rb
new file mode 100644
index 000000000..4e9ee88dd
--- /dev/null
+++ b/test/ripper/test_filter.rb
@@ -0,0 +1,54 @@
+begin
+
+require 'ripper'
+require 'test/unit'
+
+class TestRipper_Filter < Test::Unit::TestCase
+
+  class Filter < Ripper::Filter
+    def on_default(event, token, data)
+      if data.empty?
+        data[:filename] = filename rescue nil
+        data[:lineno] = lineno
+        data[:column] = column
+        data[:token] = token
+      end
+      data
+    end
+  end
+
+  def filename
+    File.expand_path(__FILE__)
+  end
+
+  def test_filter_filename
+    data = {}
+    Filter.new(File.read(filename)).parse(data)
+    assert_equal('-', data[:filename], "[ruby-dev:37856]")
+
+    data = {}
+    Filter.new(File.read(filename), filename).parse(data)
+    assert_equal(filename, data[:filename])
+  end
+
+  def test_filter_lineno
+    data = {}
+    Filter.new(File.read(filename)).parse(data)
+    assert_equal(1, data[:lineno])
+  end
+
+  def test_filter_column
+    data = {}
+    Filter.new(File.read(filename)).parse(data)
+    assert_equal(0, data[:column])
+  end
+
+  def test_filter_token
+    data = {}
+    Filter.new(File.read(filename)).parse(data)
+    assert_equal("begin", data[:token])
+  end
+end
+
+rescue LoadError
+end
diff --git a/version.h b/version.h
index 13abbd9b9..3e7d44b7b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1