Change Tokenizer test to fetch tokens instead of exposing ivar

dyspop · Jun 4, 2015 · fc8e6c8 · fc8e6c8
1 parent 79d7dd0
commit fc8e6c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/liquid/tokenizer.rb b/lib/liquid/tokenizer.rb
@@ -1,7 +1,5 @@
 module Liquid
   class Tokenizer
-    attr_reader :tokens
-
     def initialize(source, line_numbers = false)
       @source, @line_numbers = source, line_numbers
       @tokens = tokenize

diff --git a/test/unit/tokenizer_unit_test.rb b/test/unit/tokenizer_unit_test.rb
@@ -22,18 +22,20 @@ def test_tokenize_blocks
   end
 
   def test_calculate_line_numbers_per_token_with_profiling
-    template = Liquid::Template.parse("", :profile => true)
-
-    assert_equal [1],       template.send(:tokenize, "{{funk}}").tokens.map(&:line_number)
-    assert_equal [1, 1, 1], template.send(:tokenize, " {{funk}} ").tokens.map(&:line_number)
-    assert_equal [1, 2, 2], template.send(:tokenize, "\n{{funk}}\n").tokens.map(&:line_number)
-    assert_equal [1, 1, 3], template.send(:tokenize, " {{\n funk \n}} ").tokens.map(&:line_number)
+    assert_equal [1],       tokenize("{{funk}}", true).map(&:line_number)
+    assert_equal [1, 1, 1], tokenize(" {{funk}} ", true).map(&:line_number)
+    assert_equal [1, 2, 2], tokenize("\n{{funk}}\n", true).map(&:line_number)
+    assert_equal [1, 1, 3], tokenize(" {{\n funk \n}} ", true).map(&:line_number)
   end
 
   private
 
-  def tokenize(source)
-    tokenizer = Liquid::Tokenizer.new(source)
-    tokenizer.tokens
+  def tokenize(source, line_numbers = false)
+    tokenizer = Liquid::Tokenizer.new(source, line_numbers)
+    tokens = []
+    while t = tokenizer.shift
+      tokens << t
+    end
+    tokens
   end
 end