review 5.0.0 → 5.3.0

data/test/test_epubmaker_cmd.rb

@@ -3,21 +3,20 @@ require 'tmpdir'
 require 'fileutils'
 require 'yaml'
 require 'rbconfig'
+require 'zip'
 
-REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', File.dirname(__FILE__))
+REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', __dir__)
 
 class EPUBMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
-    @tmpdir2 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('lib', __dir__)
   end
 
   def teardown
     FileUtils.rm_rf(@tmpdir1)
-    FileUtils.rm_rf(@tmpdir2)
     ENV['RUBYLIB'] = @old_rubylib
   end
 
@@ -35,11 +34,23 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
     end
   end
 
+  def check_filesize(epubfile)
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      Zip::File.open(epubfile) do |zio|
+        zio.each do |entry|
+          assert_not_equal(0, entry.size, "#{entry.name} is 0 byte.")
+        end
+      end
+    end
+  end
+
   def test_epubmaker_cmd_samplebook
     common_buildepub('sample-book/src', 'config.yml', 'book.epub')
+    check_filesize(File.join(@tmpdir1, 'book.epub'))
   end
 
   def test_epubmaker_cmd_syntaxbook
     common_buildepub('syntax-book', 'config.yml', 'syntax-book.epub')
+    check_filesize(File.join(@tmpdir1, 'syntax-book.epub'))
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
+$LOAD_PATH.unshift(File.realpath('../lib', __dir__))
+
 require 'test/unit'
 require 'fileutils'
 require 'review/yamlloader'
@@ -9,18 +10,18 @@ def touch_file(path)
 end
 
 def assets_dir
-  File.join(File.dirname(__FILE__), 'assets')
+  File.join(__dir__, 'assets')
 end
 
 def prepare_samplebook(srcdir, bookdir, latextemplatedir, configfile)
-  samplebook_dir = File.expand_path("../samples/#{bookdir}/", File.dirname(__FILE__))
+  samplebook_dir = File.expand_path("../samples/#{bookdir}/", __dir__)
   files = Dir.glob(File.join(samplebook_dir, '*'))
   # ignore temporary built files
   files.delete_if { |file| file =~ /.*-(pdf|epub|text)/ || file == 'webroot' }
   FileUtils.cp_r(files, srcdir)
   if latextemplatedir
     # copy from review-jsbook or review-jlreq
-    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", File.dirname(__FILE__))
+    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", __dir__)
     FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
   end
   loader = ReVIEW::YAMLLoader.new

data/test/test_htmlbuilder.rb

@@ -8,7 +8,6 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def setup
     ReVIEW::I18n.setup
-    @builder = HTMLBuilder.new
     @config = ReVIEW::Configure.values
     @config['secnolevel'] = 2
     @config['stylesheet'] = nil
@@ -16,11 +15,16 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @config['epubmaker'] = {}
     @book = Book::Base.new('.')
     @book.config = @config
+    img_math = ReVIEW::ImgMath.new(@config)
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
+    @builder = HTMLBuilder.new(img_math: img_math)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
     I18n.setup('ja')
+    @skip_pygments = true # temporary suppress pygments test
   end
 
   def test_xmlns_ops_prefix_epub3
@@ -131,6 +135,48 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(\n<h3 id="test"><a id="h1-0-1"></a><span class="secno">1.0.1　</span>this is test.</h3>\n), actual
   end
 
+  def test_headline_sections
+    @book.config['epubmaker']['use_section'] = true
+    actual = compile_block("= H1\n== H2\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("= H1\n== H2\n==== H4\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+<section class="level4">
+<h4><a id="h1-1-0-1"></a>H4</h4>
+</section>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("===== H5\n= H1\n")
+    expected = <<-EOS
+<section class="level5">
+<h5><a id="h1-0-0-0-1"></a>H5</h5>
+</section>
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+</section>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<a id="label_test"></a>\n), actual
@@ -358,12 +404,26 @@ EOS
     rescue LoadError
       return true
     end
-    @config['mathml'] = true
+    @config['math_format'] = 'mathml'
     actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
-    @config['mathml'] = nil
     assert_equal %Q(<span class="equation"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>), actual
   end
 
+  def test_inline_mathjax
+    @config['math_format'] = 'mathjax'
+    actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
+    assert_equal %Q(<span class="equation">\\( \\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a} \\)</span>), actual
+
+    content = <<-EOF
+//texequation{
+\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}
+//}
+EOF
+    actual = compile_block(content)
+    expected = %Q(<div class="equation">\n$$\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}$$\n</div>\n)
+    assert_equal expected, actual
+  end
+
   def test_inline_img
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
@@ -614,6 +674,20 @@ EOS
 EOS
     assert_equal expected, actual
 
+    actual = compile_block("//image[sampleimg][]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="" />
+<p class="caption">
+図1.1: 
+</p>
+</div>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//image[sampleimg][][]{\n//}\n")
+    assert_equal expected, actual
+
     @config['caption_position']['image'] = 'top'
     actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
     expected = <<-EOS
@@ -730,6 +804,12 @@ EOS
 </div>
 EOS
     assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][]\n")
+    assert_equal expected, actual
+
+    actual = compile_block("//indepimage[sampleimg][][]\n")
+    assert_equal expected, actual
   end
 
   def test_indepimage_with_metric
@@ -944,6 +1024,8 @@ EOS
   end
 
   def test_list_pygments
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -971,6 +1053,8 @@ test&lt;i&gt;2&lt;/i&gt;
   end
 
   def test_list_pygments_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -999,6 +1083,8 @@ EOS
   end
 
   def test_list_pygments_nulllang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1191,6 +1277,8 @@ EOS
   end
 
   def test_listnum_pygments_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1218,6 +1306,8 @@ EOS
   end
 
   def test_listnum_pygments_lang_linenum
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1246,6 +1336,8 @@ EOS
   end
 
   def test_listnum_pygments_lang_without_lang
+    return true if @skip_pygments
+
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1432,6 +1524,8 @@ EOS
   end
 
   def test_emlist_pygments_lang
+    return true if @skip_pygments
+
     begin
       require 'pygments'
     rescue LoadError
@@ -1568,6 +1662,8 @@ EOS
   end
 
   def test_cmd_pygments
+    return true if @skip_pygments
+
     begin
       require 'pygments'
     rescue LoadError
@@ -1614,13 +1710,16 @@ EOS
   def test_texequation
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
+
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       expected = <<-EOB
@@ -1644,14 +1743,17 @@ EOS
     # Re:VIEW 3 never fail on defer mode. This test is only for Re:VIEW 2.
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
+
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P}} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
       @config['review_version'] = 2
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       tmpio = $stderr
@@ -1971,8 +2073,8 @@ EOS
   * AA
 EOS
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':1: error: too many *.', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_match(/too many \*\./, @log_io.string)
   end
 
   def test_ul_nest4
@@ -2220,6 +2322,43 @@ EOS
     assert_equal expected, fn
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote">(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['epubmaker'] ||= {}
+    @book.config['epubmaker']['back_footnote'] = true
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">⏎</a>(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    I18n.set('html_endnote_textmark', '+%s:')
+    I18n.set('html_endnote_refmark', '+%s:')
+    I18n.set('html_footnote_backmark', '←')
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">+1:</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">←</a>+1:bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd
     book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
@@ -2320,10 +2459,10 @@ EOS
 
   def test_empty_table
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
-    assert_equal ':2: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
 
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
-    assert_equal ':3: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -2678,8 +2817,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2695,8 +2834,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2712,8 +2851,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2755,28 +2894,28 @@ EOS
 EOB
       end
       @book.config['words_file'] = File.join(dir, 'words.csv')
-      io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(<p>foo bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ} <b>bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ}</b> [missing word: N]</p>\n), actual
-      assert_match(/WARN --: :1: word not bound: N/, io.string)
+      assert_match(/WARN --: :1: word not bound: N/, @log_io.string)
     end
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ':1: error: key not found: "n"', e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -2851,7 +2990,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2869,7 +3008,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -2889,7 +3028,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_idgxmlbuilder.rb

@@ -14,6 +14,8 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config['tableopt'] = '10'
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -48,6 +50,19 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(<title id="test" aid:pstyle="h3">1.0.1　this is test.</title><?dtp level="3" section="1.0.1　this is test."?>), actual
   end
 
+  def test_headline_secttags
+    @config['structuredxml'] = true
+    actual = compile_block("= HEAD1\n== HEAD1-1\n\n=== HEAD1-1-1\n\n== HEAD1-2\n\n==== HEAD1-2-0-1\n\n===== HEAD1-2-0-1-1\n\n== HEAD1-3\n")
+    expected = '<chapter id="chap:1"><title aid:pstyle="h1">第1章　HEAD1</title><?dtp level="1" section="第1章　HEAD1"?>' +
+               '<sect id="sect:1.1"><title aid:pstyle="h2">1.1　HEAD1-1</title><?dtp level="2" section="1.1　HEAD1-1"?>' +
+               '<sect2 id="sect:1.1.1"><title aid:pstyle="h3">HEAD1-1-1</title><?dtp level="3" section="HEAD1-1-1"?></sect2></sect>' +
+               '<sect id="sect:1.2"><title aid:pstyle="h2">1.2　HEAD1-2</title><?dtp level="2" section="1.2　HEAD1-2"?>' +
+               '<sect3 id="sect:1.2.0.1"><title aid:pstyle="h4">HEAD1-2-0-1</title><?dtp level="4" section="HEAD1-2-0-1"?>' +
+               '<sect4 id="sect:1.2.0.1.1"><title aid:pstyle="h5">HEAD1-2-0-1-1</title><?dtp level="5" section="HEAD1-2-0-1-1"?></sect4></sect3></sect>' +
+               '<sect id="sect:1.3"><title aid:pstyle="h2">1.3　HEAD1-3</title><?dtp level="2" section="1.3　HEAD1-3"?></sect></chapter>'
+    assert_equal expected, actual
+  end
+
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<label id='label_test' />), actual
@@ -156,10 +171,10 @@ EOS
 
   def test_empty_table
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
-    assert_equal ':2: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
 
     e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
-    assert_equal ':3: error: no rows in the table', e.message
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_emtable
@@ -423,8 +438,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -440,8 +455,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -456,8 +471,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -1082,8 +1097,8 @@ EOS
   * AA
 EOS
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':1: error: too many *.', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_match(/too many \*\./, @log_io.string)
   end
 
   def test_ul_nest4
@@ -1118,19 +1133,25 @@ EOS
   end
 
   def test_inline_unknown
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
-    assert_equal ':1: error: unknown image: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
-      assert_equal ':1: error: key not found: "n"', e.message
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -1270,7 +1291,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -1288,7 +1309,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -1308,7 +1329,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_idgxmlmaker_cmd.rb

@@ -5,14 +5,14 @@ require 'yaml'
 require 'rbconfig'
 require 'open3'
 
-REVIEW_IDGXMLMAKER = File.expand_path('../bin/review-idgxmlmaker', File.dirname(__FILE__))
+REVIEW_IDGXMLMAKER = File.expand_path('../bin/review-idgxmlmaker', __dir__)
 
 class IDGXMLMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
 
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('../lib', __dir__)
   end
 
   def teardown
@@ -29,7 +29,11 @@ class IDGXMLMakerCmdTest < Test::Unit::TestCase
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
       Dir.chdir(@tmpdir1) do
         _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_IDGXMLMAKER} #{option} #{configfile}")
-        assert_equal '', e
+        if defined?(ReVIEW::TTYLogger)
+          assert_match(/SUCCESS/, e)
+        else
+          assert_equal '', e
+        end
         assert s.success?
       end
       assert File.exist?(File.join(@tmpdir1, targetfile))