tenjin 0.6.2 → 0.7.0

data/test/test_template.rb

@@ -1,17 +1,14 @@
 ###
-### $Rev: 71 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 
-require 'test/unit'
-#require 'testutil'
-require 'testcase-helper'
-require 'assert-text-equal'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
 
-require 'tenjin'
 
-class TenjinTemplateTest < Test::Unit::TestCase
+class TenjinTemplateTest
+  include Oktest::TestCase
 
   filename = __FILE__.sub(/\.\w+$/, '.yaml')
   #load_yaml_testdata(filename)
@@ -67,28 +64,30 @@ class TenjinTemplateTest < Test::Unit::TestCase
       if @exception.is_a?(String)
         @exception = @exception.split('::').inject(Object) {|klass, s| klass = klass.const_get(s) }
       end
-      ex = assert_raise(@exception) do
-        template = @templateclass.new(@options)
-        template.convert(@input, @filename)
-        template.render(@context)
-      end
-      #assert_equal(@exception, ex.class.name)
+      ex = ok_(proc {
+                 template = @templateclass.new(@options)
+                 template.convert(@input, @filename)
+                 template.render(@context)
+               }).raise?(@exception)
+      #ok_(ex.class.name) == @exception
       if @errormsg
         errmsg = ex.to_s.sub(/:0x[0-9a-fA-F]+/, ':0x12345')
         if defined?(RBX_VERSION)
-          assert_equal(@errormsg, errmsg[0, @errormsg.length-1] + '>')
+          ok_(errmsg[0, @errormsg.length-1] + '>') == @errormsg
         else
-          assert_equal(@errormsg, errmsg)
+          ok_(errmsg) == @errormsg
         end
       end
-      assert_equal(@filename, ex.filename) if @filename
+      if @filename
+        ok_(ex.filename, @filename)
+      end
     else
       template = @templateclass.new(@options)
       script = template.convert(@input, @filename)
-      assert_text_equal(@source, script)
+      ok_(script) == @source
       if @expected
         output = template.render(@context)
-        assert_text_equal(@expected, output)
+        ok_(output) == @expected
       end
     end
 
@@ -109,8 +108,8 @@ END
       File.open(filename, 'w') { |f| f.write(input) }
       template1 = Tenjin::Template.new(filename)
       template2 = Tenjin::Template.new()
-      assert_text_equal(template1.script, template2.convert(input))
-      assert_text_equal(template1.render(), template2.render())
+      ok_(template2.convert(input)) == template1.script
+      ok_(template2.render()) == template1.render()
     ensure
       File.unlink(filename)
     end
@@ -121,8 +120,51 @@ END
 
   #def test_import_module2()
 
+  def test_input
+    t = Tenjin::Template.new(:input=>"<p>Hello ${name}</p>")
+    ok_(t.script) == ' _buf << %Q`<p>Hello #{escape((name).to_s)}</p>`; ' + "\n"
+    ok_(t.filename) == nil
+    t = Tenjin::Template.new('example.rbhtml', :input=>"<p>Hello ${name}</p>")
+    ok_(t.filename) == 'example.rbhtml'
+    ok_(t.script) == ' _buf << %Q`<p>Hello #{escape((name).to_s)}</p>`; ' + "\n"
+  end
 
-  self.select_target_test()
+  def test_trace
+    input = <<'END'
+<ul>
+<?rb for item in @items ?>
+  <li>#{item}<li>
+<?rb end ?>
+</ul>
+END
+    t = Tenjin::Template.new('example.rbhtml', :input=>input, :trace=>true)
+    output = t.render({:items=>['A','B','C']})
+    ok_(output) == <<'END'
+<!-- ***** begin: example.rbhtml ***** -->
+<ul>
+  <li>A<li>
+  <li>B<li>
+  <li>C<li>
+</ul>
+<!-- ***** end: example.rbhtml ***** -->
+END
+  end
+
+  def test_TRACE
+    orig = Tenjin::Template::TRACE
+    ok_(Tenjin::Template::TRACE) == false
+    ok_(Tenjin::Template.new.instance_variable_get('@trace')) == false
+    Tenjin::Template.TRACE = true
+    ok_(Tenjin::Template::TRACE) == true
+    ok_(Tenjin::Template.new.instance_variable_get('@trace')) == true
+  ensure
+    Tenjin::Template.TRACE = false
+  end
+
+
+end
 
 
+if __FILE__ == $0
+  Oktest.run_all()
 end

data/test/test_template.yaml

@@ -361,7 +361,7 @@
   input*:
    "python": |
         <ul>
-        <?py for i in xrange(1,4): ?>
+        <?py for i in range(1,4): ?>
         <li>
         #{i}
         </li>
@@ -377,7 +377,7 @@
   source*:
    "python": |
         _buf.extend(('''<ul>\n''', ));
-        for i in xrange(1,4):
+        for i in range(1,4):
             _buf.extend(('''<li>
         ''', to_str(i), '''
         </li>\n''', ));
@@ -564,7 +564,7 @@
    "python": |
         <p>^
         <?py^
-        for value in xrange(0,3):^
+        for value in range(0,3):^
         ?>^
         i = #{value}^
         #{value}^
@@ -587,7 +587,7 @@
    "python": |
         _buf.extend(('''<p>\r\n''', ));
         
-        for value in xrange(0,3):
+        for value in range(0,3):
         
             _buf.extend(('''i = ''', to_str(value), '''^
         ''', to_str(value), '''\r\n''', ));
@@ -748,7 +748,7 @@
 - name:         option_encoding1
   desc:         encoding option
   disabled*:
-   "python": false
+   "python": true
    "ruby":   true
   options: { encoding: utf-8 }
   testopts: { encoding: utf-8 }
@@ -961,7 +961,7 @@
         <?PY            "FL": "Florida", } ?>
         <?PY # ?>
         <?py chk = { params['state']: ' checked="checked"' } ?>
-        <?PY codes = states.keys() ?>
+        <?PY codes = list(states.keys()) ?>
         <?PY codes.sort() ?>
         <select name="state">
           <option value="">-</option>
@@ -1014,7 +1014,7 @@
                    "FL": "Florida", }
         #
         _buf.extend(('''<?py chk = { params[\'state\']: \' checked="checked"\' } ?>\n''', ));
-        codes = states.keys()
+        codes = list(states.keys())
         codes.sort()
         _buf.extend(('''<select name="state">
           <option value="">-</option>\n''', ));

data/test/test_users_guide.rb

@@ -1,13 +1,11 @@
 ###
-### $Rev: 48 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 
-require 'test/unit'
-#require 'testutil'
-#require 'testcase-helper'
-require 'assert-text-equal'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
+require 'fileutils'
 
 #class Symbol
 #  def <=>(other)
@@ -24,46 +22,85 @@ require 'assert-text-equal'
 #  end
 #end
 
-require 'tenjin'
 
-class TenjinUsersGuideTest < Test::Unit::TestCase
+class TenjinUsersGuideTest
+  include Oktest::TestCase
 
-  DIR = File.expand_path(File.dirname(__FILE__) + '/data/users_guide')
+  DIR = ARGV[0] || File.expand_path(File.dirname(__FILE__) + '/data/users_guide')
   CWD = Dir.pwd()
 
-
-  def setup
+  def before
     Dir.chdir DIR
   end
 
 
-  def teardown
+  def after
     Dir.chdir CWD
   end
 
 
   def _test
-    @name = (caller()[0] =~ /`(.*?)'/) && $1
-    s = File.read(@filename)
-    s =~ /\A\$ (.*?)\n/
-    command = $1
-    expected = $'
-    result = `#{command}`
-    assert_text_equal(expected, result)
+    #@name = (caller()[0] =~ /`(.*?)'/) && $1
+    Dir.chdir @name do
+      Dir.glob("*.output").each do |filename|
+        s = File.read(filename)
+        s =~ /\A\$ (.*?)\n/
+        command = $1
+        expected = $'
+        result = `#{command}`
+        #
+        if RUBY_VERSION >= '1.9'
+          expected.gsub!(/expecting kEND/, 'expecting keyword_end')
+        end
+        case @name
+        when 'test_nested'
+          expected.gsub!(/ *\# .*$/, '')
+        when 'test_logging'
+          result  .gsub!(/\d+/, '9999')
+          expected.gsub!(/\d+/, '9999')
+        end
+        #
+        ok_(result) == expected
+      end
+    end
   end
 
+  def self.prepare
+    ## remove cache files
+    Dir.glob("test_*/**/*.cache").each do |fpath|
+      File.unlink(fpath)
+    end
+    ## copy necessary files
+    pathlist = Dir.glob("test_*")
+    d = {}
+    pathlist.select {|dirpath| dirpath =~ /_\d\d\d$/ }.each do |dirpath|
+      Dir.glob("#{dirpath}/**/*").each do |path|
+        next unless File.file?(path)
+        key = path.sub(/^[^\/]*\//, '')
+        d[key] = path
+      end
+      d.each_pair do |k, v|
+        fpath = "#{dirpath}/#{k}"
+        unless File.exist?(fpath)
+          dirname = File.dirname(fpath)
+          FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+          #puts "cp #{v} #{fpath}"
+          FileUtils.copy(v, fpath)
+        else
+          #puts "#cp #{v} #{fpath}"
+        end
+      end
+    end
+  end
 
-  Dir.chdir DIR do
-    filenames = []
-    filenames += Dir.glob('*.result')
-    filenames += Dir.glob('*.source')
-    filenames.each do |filename|
-      name = filename.gsub(/[^\w]/, '_')
+  def self.define_tests
+    dirnames = Dir.glob("test_*")
+    dirnames.each do |dirname|
+      name = dirname
       s = <<-END
-        def test_#{name}
-          # $stderr.puts "*** debug: test_#{name}"
+        def #{name}
+          # $stderr.puts "*** debug: #{name}
           @name = '#{name}'
-          @filename = '#{filename}'
           _test()
         end
       END
@@ -71,5 +108,14 @@ class TenjinUsersGuideTest < Test::Unit::TestCase
     end
   end
 
+  Dir.chdir DIR do
+    self.prepare()
+    self.define_tests()
+  end
+
+end
+
 
+if __FILE__ == $0
+  Oktest.run_all()
 end

data/test/testcase-helper.rb

@@ -1,7 +1,7 @@
 ###
-### $Rev: 72 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 
 if defined?(RBX_VERSION)
@@ -53,10 +53,11 @@ end
 
 
 
-class Test::Unit::TestCase   # :nodoc:
+#class Test::Unit::TestCase   # :nodoc:
+module Oktest::ClassMethodHelper
 
 
-  def self.select_target_test(target_name=ENV['TEST'])
+  def select_target_test(target_name=ENV['TEST'])
     if target_name
       self.instance_methods.each do |method|
         private method if method =~ /^test_(.*)/ && $1 != target_name
@@ -65,7 +66,7 @@ class Test::Unit::TestCase   # :nodoc:
   end
 
 
-  def self._untabify(str, width=8)         # :nodoc:
+  def _untabify(str, width=8)         # :nodoc:
     list = str.split(/\t/, -1)
     return list.first if list.length == 1
     last = list.pop
@@ -87,8 +88,9 @@ class Test::Unit::TestCase   # :nodoc:
   end
 
 
-  def self.load_yaml_documents(filename, options={})   # :nodoc:
+  def load_yaml_documents(filename, options={})   # :nodoc:
     str = File.read(filename)
+    str.force_encoding('utf-8') if str.respond_to?(:force_encoding)
     if filename =~ /\.rb$/
       str =~ /^__END__$/   or raise "*** error: __END__ is not found in '#{filename}'."
       str = $'
@@ -113,11 +115,11 @@ class Test::Unit::TestCase   # :nodoc:
       table[ident] = ydoc
     end
     #
-    target = $target || ENV['TEST']
-    if target
-       table[target] or raise "*** target '#{target}' not found."
-       list = [ table[target] ]
-    end
+    #target = $target || ENV['TEST']
+    #if target
+    #   table[target] or raise "*** target '#{target}' not found."
+    #   list = [ table[target] ]
+    #end
     #
     list.each do |ydoc| yield(ydoc) end if block_given?
     #
@@ -127,7 +129,7 @@ class Test::Unit::TestCase   # :nodoc:
 
   SPECIAL_KEYS = %[exception errormsg]
 
-  def self.load_yaml_testdata(filename, options={})   # :nodoc:
+  def load_yaml_testdata(filename, options={})   # :nodoc:
     identkey   = options[:identkey]   || 'name'
     testmethod = options[:testmethod] || '_test'
     lang       = options[:lang]
@@ -150,24 +152,24 @@ class Test::Unit::TestCase   # :nodoc:
       end
       s  <<  "  #{testmethod}\n"
       s  <<  "end\n"
-      $stderr.puts "*** #{method_name()}(): eval_str=<<'END'\n#{s}END" if $DEBUG
+      $stderr.puts "*** #{_method_name()}(): eval_str=<<'END'\n#{s}END" if $DEBUG
     end
     #module_eval s   # not eval!
     return s
   end
 
 
-  def self.method_name   # :nodoc:
+  def _method_name   # :nodoc:
     return (caller[0] =~ /in `(.*?)'/) && $1
   end
 
 
-  def self.load_yaml_testdata_with_each_lang(filename, options={})   # :nodoc:
+  def load_yaml_testdata_with_each_lang(filename, options={})   # :nodoc:
     identkey   = options[:identkey]   || 'name'
     testmethod = options[:testmethod] || '_test'
     special_keys = options[:special_keys] || SPECIAL_KEYS
     langs = defined?($lang) && $lang ? [ $lang ] : options[:langs]
-    langs or raise "*** #{method_name()}(): option ':langs' is required."
+    langs or raise "*** #{_method_name()}(): option ':langs' is required."
 
     load_yaml_documents(filename, options) do |ydoc|
       ident = ydoc[identkey]
@@ -184,7 +186,7 @@ class Test::Unit::TestCase   # :nodoc:
         end
         s  <<  "  #{testmethod}\n"
         s  <<  "end\n"
-        #$stderr.puts "*** #{method_name()}(): eval_str=<<'END'\n#{s}END" if $DEBUG
+        #$stderr.puts "*** #{_method_name()}(): eval_str=<<'END'\n#{s}END" if $DEBUG
         module_eval s   # not eval!
       end
     end

data/test/testunit-assertions.rb

@@ -0,0 +1,71 @@
+###
+### $Rev$
+### 0.7.0
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
+###
+
+require 'test/unit'
+require 'tempfile'
+
+
+module Test::Unit::Assertions
+
+  def assert_text_equal(expected, actual, message=nil, diffopt='-u', flag_cut=true)
+    if expected == actual
+      assert(true)
+      return
+    end
+    if expected && actual && (expected[-1] != ?\n || actual[-1] != ?\n)
+      expected += "\n"
+      actual   += "\n"
+    end
+    begin
+      expfile = Tempfile.new(".expected.")
+      expfile.write(expected); expfile.flush()
+      actfile = Tempfile.new(".actual.")
+      actfile.write(actual);   actfile.flush()
+      diff = `diff #{diffopt} #{expfile.path} #{actfile.path}`
+    ensure
+      expfile.close(true) if expfile
+      actfile.close(true) if actfile
+    end
+    # cut 1st & 2nd lines
+    message = (flag_cut ? diff.gsub(/\A.*\n.*\n/, '') : diff) unless message
+    #raise Test::Unit::AssertionFailedError.new(message)
+    assert_block(message) { false }  # or assert(false, message)
+  end
+
+  alias assert_equal_with_diff assert_text_equal    # for compatibility
+  alias assert_text_equals     assert_text_equal    # for typo
+
+#  def assert_true(val, message=nil)
+#    message ||= "true is expected but got #{val.inspect}"
+#    assert(val == true, message)
+#  end
+#
+#  def assert_false(val, message=nil)
+#    message ||= "false is expected but got #{val.inspect}"
+#    assert(val == false, message)
+#  end
+
+  def assert_exist(path, message=nil)
+    message ||= "'#{path}' doesn't exist"
+    assert(File.exist?(path), message)
+  end
+
+  def assert_not_exist(path, message=nil)
+    message ||= "'#{path}' exist"
+    assert(! File.exist?(path), message)
+  end
+
+  def assert_file_exist(path, message=nil)
+    message ||= "'#{path}' doesn't exist or not a file"
+    assert(File.file?(path), message)
+  end
+
+  def assert_dir_exist(path, message=nil)
+    message ||= "'#{path}' doesn't exist or not a directory"
+    assert(File.file?(path), message)
+  end
+
+end