aozora2html 0.7.1 → 3.0.0

data/test/test_inline_caption_tag.rb

@@ -1,21 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class InlineCaptionTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_caption_new
-    tag = Inline_caption_tag.new(@parser,"aaa")
-    assert_equal Inline_caption_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::InlineCaption.new(@parser, 'aaa')
+    assert_equal Aozora2Html::Tag::InlineCaption, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Inline_caption_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<span class=\"caption\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineCaption.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<span class="caption">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_inline_font_size_tag.rb

@@ -1,31 +1,35 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class InlineFontSizeTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_font_size_new
-    tag = Inline_font_size_tag.new(@parser,"aa",1,:dai)
-    assert_equal Inline_font_size_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser, 'aa', 1, :dai)
+    assert_equal Aozora2Html::Tag::InlineFontSize, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),1,:dai)
-    assert_equal "<span class=\"dai1\" style=\"font-size: large;\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser, 'テスト'.to_sjis, 1, :dai)
+    assert_equal '<span class="dai1" style="font-size: large;">テスト</span>', tag.to_s.to_utf8
   end
 
   def test_to_s2
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),2,:sho)
-    assert_equal "<span class=\"sho2\" style=\"font-size: x-small;\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser, 'テスト'.to_sjis, 2, :sho)
+    assert_equal '<span class="sho2" style="font-size: x-small;">テスト</span>', tag.to_s.to_utf8
   end
 
   def test_to_s3
-    tag = Inline_font_size_tag.new(@parser,"テスト".encode("shift_jis"),3,:sho)
-    assert_equal "<span class=\"sho3\" style=\"font-size: xx-small;\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineFontSize.new(@parser, 'テスト'.to_sjis, 3, :sho)
+    assert_equal '<span class="sho3" style="font-size: xx-small;">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_inline_keigakomi_tag.rb

@@ -1,21 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class InlineKeigakomiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_keigakomi_new
-    tag = Inline_keigakomi_tag.new(@parser,"aaa")
-    assert_equal Inline_keigakomi_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::InlineKeigakomi.new(@parser, 'aaa')
+    assert_equal Aozora2Html::Tag::InlineKeigakomi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Inline_keigakomi_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<span class=\"keigakomi\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineKeigakomi.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<span class="keigakomi">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_inline_yokogumi_tag.rb

@@ -1,21 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class InlineYokogumiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_yokogumi_new
-    tag = Inline_yokogumi_tag.new(@parser,"aaa")
-    assert_equal Inline_yokogumi_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::InlineYokogumi.new(@parser, 'aaa')
+    assert_equal Aozora2Html::Tag::InlineYokogumi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Inline_yokogumi_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<span class=\"yokogumi\">テスト</span>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::InlineYokogumi.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<span class="yokogumi">テスト</span>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_jizume_tag.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class JizumeTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_jizume_new
-    tag = Jizume_tag.new(@parser,50)
-    assert_equal Jizume_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::Jizume.new(@parser, 50)
+    assert_equal Aozora2Html::Tag::Jizume, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Jizume_tag.new(@parser,50)
-    assert_equal "<div class=\"jizume_50\" style=\"width: 50em\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::Jizume.new(@parser, 50)
+    assert_equal '<div class="jizume_50" style="width: 50em">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def teardown

data/test/test_jstream.rb

@@ -1,9 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 require 'stringio'
 
 class JstreamTest < Test::Unit::TestCase
+  using Aozora2Html::StringRefinements
+
   def test_new_error
     strio = StringIO.new("aaa\nbbb\n")
     orig_stdout = $stdout
@@ -13,45 +16,45 @@ class JstreamTest < Test::Unit::TestCase
       Jstream.new(strio)
     end
     $stdout = orig_stdout
-    assert_equal "エラー(1行目):改行コードを、「CR+LF」にあらためてください. \r\n処理を停止します\n", out.string.encode("utf-8")
+    assert_equal "エラー(1行目):改行コードを、「CR+LF」にあらためてください. \r\n処理を停止します\n", out.string.to_utf8
   end
 
   def test_read_char
-    strio = StringIO.new("aあ５\r\n％\\b\r\n".encode("Shift_JIS"))
+    strio = StringIO.new("aあ５\r\n％\\b\r\n".to_sjis)
     stm = Jstream.new(strio)
-    assert_equal "a", stm.read_char.encode("utf-8")
-    assert_equal "あ", stm.read_char.encode("utf-8")
-    assert_equal "５", stm.read_char.encode("utf-8")
-    assert_equal "\r\n", stm.read_char.encode("utf-8")
-    assert_equal "％", stm.read_char.encode("utf-8")
-    assert_equal "\\", stm.read_char.encode("utf-8")
-    assert_equal "b", stm.read_char.encode("utf-8")
-    assert_equal "\r\n", stm.read_char.encode("utf-8")
+    assert_equal 'a', stm.read_char.to_utf8
+    assert_equal 'あ', stm.read_char.to_utf8
+    assert_equal '５', stm.read_char.to_utf8
+    assert_equal "\r\n", stm.read_char.to_utf8
+    assert_equal '％', stm.read_char.to_utf8
+    assert_equal '\\', stm.read_char.to_utf8
+    assert_equal 'b', stm.read_char.to_utf8
+    assert_equal "\r\n", stm.read_char.to_utf8
     assert_equal :eof, stm.read_char
-    assert_equal "\r\n", stm.read_char  # XXX ??
-    assert_equal :eof, stm.read_char    # XXX ??
+    # assert_equal "\r\n", stm.read_char  # :eof以降は正しい値を保証しない
+    assert_equal :eof, stm.read_char # 何度もread_charすると:eofが複数回出る
   end
 
   def test_peek_char
-    strio = StringIO.new("aあ５\r\n％\\b\r\n".encode("Shift_JIS"))
+    strio = StringIO.new("aあ５\r\n％\\b\r\n".to_sjis)
     stm = Jstream.new(strio)
-    assert_equal "a", stm.peek_char(0).encode("utf-8")
-    assert_equal "あ", stm.peek_char(1).encode("utf-8")
-    assert_equal "５", stm.peek_char(2).encode("utf-8")
-    assert_equal "\r\n", stm.peek_char(3).encode("utf-8")
-    assert_equal "\r\n", stm.peek_char(4).encode("utf-8") # XXX ??
-    assert_equal "\r\n", stm.peek_char(5).encode("utf-8") # XXX ??
-    assert_equal "\r\n", stm.peek_char(100).encode("utf-8") # XXX ??
-    assert_equal "a", stm.read_char.encode("utf-8")
+    assert_equal 'a', stm.peek_char(0).to_utf8
+    assert_equal 'あ', stm.peek_char(1).to_utf8
+    assert_equal '５', stm.peek_char(2).to_utf8
+    assert_equal "\r\n", stm.peek_char(3).to_utf8
+    # assert_equal "\r\n", stm.peek_char(4).to_utf8 # 改行文字以降は正しい値を保証しない
+    # assert_equal "\r\n", stm.peek_char(5).to_utf8 # 同上
+    # assert_equal "\r\n", stm.peek_char(100).to_utf8 # 同上
+    assert_equal 'a', stm.read_char.to_utf8
 
-    assert_equal "あ", stm.peek_char(0).encode("utf-8")
-    assert_equal "あ", stm.read_char.encode("utf-8")
-    assert_equal "５", stm.read_char.encode("utf-8")
-    assert_equal "\r\n", stm.read_char.encode("utf-8")
+    assert_equal 'あ', stm.peek_char(0).to_utf8
+    assert_equal 'あ', stm.read_char.to_utf8
+    assert_equal '５', stm.read_char.to_utf8
+    assert_equal "\r\n", stm.read_char.to_utf8
 
-    assert_equal "％", stm.peek_char(0).encode("utf-8")
-    assert_equal "\\", stm.peek_char(1).encode("utf-8")
-    assert_equal "b", stm.peek_char(2).encode("utf-8")
-    assert_equal "\r\n", stm.peek_char(3).encode("utf-8")
+    assert_equal '％', stm.peek_char(0).to_utf8
+    assert_equal '\\', stm.peek_char(1).to_utf8
+    assert_equal 'b', stm.peek_char(2).to_utf8
+    assert_equal "\r\n", stm.peek_char(3).to_utf8
   end
 end

data/test/test_kaeriten_tag.rb

@@ -1,21 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class KaeritenTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_kaeriten_new
-    tag = Kaeriten_tag.new(@parser,"aaa")
-    assert_equal Kaeriten_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Kaeriten.new(@parser, 'aaa')
+    assert_equal Aozora2Html::Tag::Kaeriten, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Kaeriten_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<sub class=\"kaeriten\">テスト</sub>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::Kaeriten.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<sub class="kaeriten">テスト</sub>', tag.to_s.to_utf8
   end
 
   def teardown

data/test/test_keigakomi_tag.rb

@@ -1,28 +1,31 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class KeigakomiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_keigakomi_new
-    tag = Keigakomi_tag.new(@parser,2)
-    assert_equal Keigakomi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser, 2)
+    assert_equal Aozora2Html::Tag::Keigakomi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Keigakomi_tag.new(@parser)
-    assert_equal "<div class=\"keigakomi\" style=\"border: solid 1px\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser)
+    assert_equal '<div class="keigakomi" style="border: solid 1px">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def test_to_s2
-    tag = Keigakomi_tag.new(@parser,2)
-    assert_equal "<div class=\"keigakomi\" style=\"border: solid 2px\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::Keigakomi.new(@parser, 2)
+    assert_equal '<div class="keigakomi" style="border: solid 2px">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def teardown

data/test/test_midashi_tag.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'aozora2html'
+
+class MidashiTagTest < Test::Unit::TestCase
+  def setup
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
+    stub(@parser).new_midashi_id { 2 }
+  end
+
+  using Aozora2Html::StringRefinements
+
+  def test_midashi_new
+    tag = Aozora2Html::Tag::Midashi.new(@parser, 'テスト見出し'.to_sjis, '小'.to_sjis, :normal)
+    assert_equal Aozora2Html::Tag::Midashi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
+  end
+
+  def test_to_s
+    tag = Aozora2Html::Tag::Midashi.new(@parser, 'テスト見出し'.to_sjis, '小'.to_sjis, :normal)
+    assert_equal "<h5 class=\"ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">#{'テスト見出し'.to_sjis}</a></h5>", tag.to_s
+  end
+
+  def test_to_s_mado
+    tag = Aozora2Html::Tag::Midashi.new(@parser, 'テスト見出し'.to_sjis, '小'.to_sjis, :mado)
+    assert_equal "<h5 class=\"mado-ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">#{'テスト見出し'.to_sjis}</a></h5>", tag.to_s
+  end
+
+  def test_undeined_midashi
+    Aozora2Html::Tag::Midashi.new(@parser, 'テスト見出し'.to_sjis, 'あ'.to_sjis, :normal)
+  rescue Aozora2Html::Error => e
+    assert_equal e.message(123).to_utf8, "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
+  end
+
+  def teardown
+  end
+end

data/test/test_multiline_caption_tag.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class MultilineCaptionTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_multiline_caption_new
-    tag = Multiline_caption_tag.new(@parser0)
-    assert_equal Multiline_caption_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineCaption.new(@parser)
+    assert_equal Aozora2Html::Tag::MultilineCaption, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_caption_tag.new(@parser)
-    assert_equal "<div class=\"caption\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineCaption.new(@parser)
+    assert_equal '<div class="caption">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def teardown

data/test/test_multiline_midashi_tag.rb

@@ -1,52 +1,52 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class MultilineMidashiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
-    stub(@parser).new_midashi_id{2}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
+    stub(@parser).new_midashi_id { 2 }
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_multiline_midashi_new
-    tag = Multiline_midashi_tag.new(@parser,"小".encode("shift_jis"),:normal)
-    assert_equal Multiline_midashi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser, '小'.to_sjis, :normal)
+    assert_equal Aozora2Html::Tag::MultilineMidashi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_midashi_tag.new(@parser,"小".encode("shift_jis"),:normal)
-    assert_equal "<h5 class=\"ko-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
-    assert_equal "</a></h5>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser, '小'.to_sjis, :normal)
+    assert_equal '<h5 class="ko-midashi"><a class="midashi_anchor" id="midashi2">', tag.to_s
+    assert_equal '</a></h5>', tag.close_tag
   end
 
   def test_to_s_chu
-    tag = Multiline_midashi_tag.new(@parser,"中".encode("shift_jis"),:dogyo)
-    assert_equal "<h4 class=\"dogyo-naka-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
-    assert_equal "</a></h4>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser, '中'.to_sjis, :dogyo)
+    assert_equal '<h4 class="dogyo-naka-midashi"><a class="midashi_anchor" id="midashi2">', tag.to_s
+    assert_equal '</a></h4>', tag.close_tag
   end
 
   def test_to_s_dai
-    tag = Multiline_midashi_tag.new(@parser,"大".encode("shift_jis"),:mado)
-    assert_equal "<h3 class=\"mado-o-midashi\"><a class=\"midashi_anchor\" id=\"midashi2\">", tag.to_s
-    assert_equal "</a></h3>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineMidashi.new(@parser, '大'.to_sjis, :mado)
+    assert_equal '<h3 class="mado-o-midashi"><a class="midashi_anchor" id="midashi2">', tag.to_s
+    assert_equal '</a></h3>', tag.close_tag
   end
 
   def test_undeined_midashi
-    begin
-      Multiline_midashi_tag.new(@parser,"あ".encode("shift_jis"),:mado)
-    rescue Aozora_Error => e
-      assert_equal e.message(123).encode("utf-8"), "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
-    end
+    Aozora2Html::Tag::MultilineMidashi.new(@parser, 'あ'.to_sjis, :mado)
+  rescue Aozora2Html::Error => e
+    assert_equal e.message(123).to_utf8, "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
   end
 
   def test_undeined_midashi2
-    begin
-      Multiline_midashi_tag.new(@parser,"大".encode("shift_jis"),:madoo)
-    rescue Aozora_Error => e
-      assert_equal e.message(123).encode("utf-8"), "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
-    end
+    Aozora2Html::Tag::MultilineMidashi.new(@parser, '大'.to_sjis, :madoo)
+  rescue Aozora2Html::Error => e
+    assert_equal e.message(123).to_utf8, "エラー(123行目):未定義な見出しです. \r\n処理を停止します"
   end
 
   def teardown

data/test/test_multiline_style_tag.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class MultilineStyleTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_multiline_style_new
-    tag = Multiline_style_tag.new(@parser,"style1")
-    assert_equal Multiline_style_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineStyle.new(@parser, 'style1')
+    assert_equal Aozora2Html::Tag::MultilineStyle, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_style_tag.new(@parser,"s1")
-    assert_equal "<div class=\"s1\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineStyle.new(@parser, 's1')
+    assert_equal '<div class="s1">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def teardown

data/test/test_multiline_yokogumi_tag.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class MultilineYokogumiTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true} 
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_multiline_yokogumi_new
-    tag = Multiline_yokogumi_tag.new(@parser0)
-    assert_equal Multiline_yokogumi_tag, tag.class
-    assert_equal true, tag.kind_of?(Block_tag)
-    assert_equal true, tag.kind_of?(Multiline_tag)
+    tag = Aozora2Html::Tag::MultilineYokogumi.new(@parser)
+    assert_equal Aozora2Html::Tag::MultilineYokogumi, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Block)
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Multiline)
   end
 
   def test_to_s
-    tag = Multiline_yokogumi_tag.new(@parser)
-    assert_equal "<div class=\"yokogumi\">", tag.to_s
-    assert_equal "</div>", tag.close_tag
+    tag = Aozora2Html::Tag::MultilineYokogumi.new(@parser)
+    assert_equal '<div class="yokogumi">', tag.to_s
+    assert_equal '</div>', tag.close_tag
   end
 
   def teardown

data/test/test_okurigana_tag.rb

@@ -1,21 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'aozora2html'
 
 class OkuriganaTagTest < Test::Unit::TestCase
   def setup
-    stub(@parser).block_allowed_context?{true}
+    @parser = Object.new
+    stub(@parser).block_allowed_context? { true }
   end
 
   def test_okurigana_new
-    tag = Okurigana_tag.new(@parser,"aaa")
-    assert_equal Okurigana_tag, tag.class
-    assert_equal true, tag.kind_of?(Inline_tag)
+    tag = Aozora2Html::Tag::Okurigana.new(@parser, 'aaa')
+    assert_equal Aozora2Html::Tag::Okurigana, tag.class
+    assert_equal true, tag.is_a?(Aozora2Html::Tag::Inline)
   end
 
+  using Aozora2Html::StringRefinements
+
   def test_to_s
-    tag = Okurigana_tag.new(@parser,"テスト".encode("shift_jis"))
-    assert_equal "<sup class=\"okurigana\">テスト</sup>", tag.to_s.encode("utf-8")
+    tag = Aozora2Html::Tag::Okurigana.new(@parser, 'テスト'.to_sjis)
+    assert_equal '<sup class="okurigana">テスト</sup>', tag.to_s.to_utf8
   end
 
   def teardown