gettext 3.0.0 → 3.0.1

data/test/test_po_entry.rb

@@ -354,72 +354,126 @@ msgstr "msgstr"
 EOP
       assert_equal(expected_po, entry.to_s)
     end
-  end
-
-  class TestEscape < self
-    def setup
-      @entry = GetText::POEntry.new(:normal)
-    end
 
-    def test_backslash
-      @entry.msgid = "You should escape '\\' as '\\\\'."
-      assert_equal("You should escape '\\\\' as '\\\\\\\\'.",
-                   @entry.escaped(:msgid))
-    end
+    class TestOptions < self
+      class TestIncludeReferenceComment < self
+        def setup
+          @entry = GetText::POEntry.new(:normal)
+          @entry.msgid = "hello"
+          @entry.references = ["hello.rb:1"]
+        end
 
-    def test_new_line
-      @entry.msgid = "First\nSecond\nThird"
-      assert_equal("First\\nSecond\\nThird",
-                   @entry.escaped(:msgid))
-    end
+        def test_default
+          assert_equal(<<-PO, @entry.to_s)
+#: hello.rb:1
+msgid "hello"
+msgstr ""
+          PO
+        end
 
-    def test_tab
-      @entry.msgid = "First\tSecond\tThird"
-      assert_equal("First\\tSecond\\tThird",
-                   @entry.escaped(:msgid))
+        def test_false
+          assert_equal(<<-PO, @entry.to_s(:include_reference_comment => false))
+msgid "hello"
+msgstr ""
+          PO
+        end
+      end
     end
   end
 
-  class TestFormatMessage < self
-    def setup
-      @entry = GetText::POEntry.new(:normal)
-    end
+  class TestFormatter < self
+    class TestEscape < self
+      def test_backslash
+        assert_equal("You should escape '\\\\' as '\\\\\\\\'.",
+                     escape("You should escape '\\' as '\\\\'."))
+      end
 
-    def test_including_newline
-      message = "line 1\n" +
-                  "line 2"
-      expected_message = "\"\"\n" +
-                          "\"line 1\\n\"\n" +
-                          "\"line 2\"\n"
-      assert_equal(expected_message, @entry.format_message(message))
-    end
+      def test_new_line
+        assert_equal("First\\nSecond\\nThird",
+                     escape("First\nSecond\nThird"))
+      end
 
-    def test_not_existed_newline
-      message = "line 1"
-      expected_message = "\"line 1\"\n"
-      assert_equal(expected_message, @entry.format_message(message))
-    end
-  end
+      def test_tab
+        assert_equal("First\\tSecond\\tThird",
+                     escape("First\tSecond\tThird"))
+      end
 
-  class TestFormatComment < self
-    def setup
-      @entry = GetText::POEntry.new(:normal)
+      private
+      def escape(message)
+        GetText::POEntry::Formatter.escape(message)
+      end
     end
 
-    def test_one_line_comment
-      comment = "comment"
-      mark = "#"
-      @entry.msgid = "msgid"
-      expected_comment = "# #{comment}\n"
-      assert_equal(expected_comment, @entry.format_comment(mark, comment))
+    class TestFormatMessage < self
+      def setup
+        @entry = GetText::POEntry.new(:normal)
+      end
+
+      def test_including_newline
+        message = "line 1\n" +
+                    "line 2"
+        expected_message = "\"\"\n" +
+                            "\"line 1\\n\"\n" +
+                            "\"line 2\"\n"
+        assert_equal(expected_message, format_message(message))
+      end
+
+      def test_not_existed_newline
+        message = "line 1"
+        expected_message = "\"line 1\"\n"
+        assert_equal(expected_message, format_message(message))
+      end
+
+      def test_wrap
+        message = "long line\n"
+        assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 4))
+""
+"long"
+" lin"
+"e\\n"
+        MESSAGE
+      end
+
+      def test_disable_wrap
+        message = "long line\n"
+        assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 0))
+"long line\\n"
+        MESSAGE
+      end
+
+      private
+      def format_message(message, options={})
+        formatter = GetText::POEntry::Formatter.new(@entry, options)
+        formatter.send(:format_message, message)
+      end
     end
 
-    def test_multiline_comment
-      comment = "comment1\ncomment2"
-      mark = "#"
-      @entry.msgid = ""
-      expected_comment = "#{comment.gsub(/^/, "#{mark} ")}\n"
-      assert_equal(expected_comment, @entry.format_comment(mark, comment))
+    class TestFormatComment < self
+      def setup
+        @entry = GetText::POEntry.new(:normal)
+        @formatter = GetText::POEntry::Formatter.new(@entry)
+      end
+
+      def test_one_line_comment
+        comment = "comment"
+        mark = "#"
+        @entry.msgid = "msgid"
+        expected_comment = "# #{comment}\n"
+        assert_equal(expected_comment, format_comment(mark, comment))
+      end
+
+      def test_multiline_comment
+        comment = "comment1\ncomment2"
+        mark = "#"
+        @entry.msgid = ""
+        expected_comment = "#{comment.gsub(/^/, "#{mark} ")}\n"
+        assert_equal(expected_comment, format_comment(mark, comment))
+      end
+
+      private
+      def format_comment(mark, comment)
+        @formatter.send(:format_comment, mark, comment)
+      end
     end
   end
 end

data/test/test_text_domain.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPL
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "gettext/text_domain"
+
+class TestTextDomain < Test::Unit::TestCase
+  class TestNomralizeCharset < self
+    def test_utf8
+      assert_equal("UTF-8", normalize_charset("utf8"))
+    end
+
+    def test_valid_charset
+      assert_equal("utf-8", normalize_charset("utf-8"))
+    end
+
+    private
+    def normalize_charset(charset)
+      text_domain = GetText::TextDomain.new("hello")
+      text_domain.send(:normalize_charset, charset)
+    end
+  end
+end

data/test/tools/test_msgmerge.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2010  Eddie Lau <tatonlto@gmail.com>
 #
 # License: Ruby's or LGPL
@@ -279,7 +279,7 @@ EOC
     end
   end
 
-  class TestMerge < self
+  class TestCommand < self
     include GetTextTestUtils
 
     def setup
@@ -330,12 +330,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
 
+#: hello.rb:2
+msgid "World"
+msgstr ""
+
 #: hello.rb:1
 msgid "Hello"
 msgstr ""
 
-#: hello.rb:2
-msgid "World"
+#: hello.rb:3
+msgid "Hello World"
 msgstr ""
 EOP
     end
@@ -373,7 +377,7 @@ EOP
 
     class TestFuzzy < self
       def test_header_message
-        @msgmerge.run(@po_file_path, @pot_file_path, "--output", @po_file_path)
+        @msgmerge.run("--update", @po_file_path, @pot_file_path)
         assert_equal(<<-EOP, File.read(@po_file_path))
 #{po_header(@pot_formatted_time, @po_formatted_time)}
 #: hello.rb:1
@@ -383,8 +387,205 @@ msgstr ""
 #: hello.rb:2
 msgid "World"
 msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
 EOP
       end
     end
+
+    class TestSort < self
+      def test_default
+        @msgmerge.run("--update", @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+        PO
+      end
+
+      def test_sort_output
+        @msgmerge.run("--update",
+                      "--sort-output",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+        PO
+      end
+
+      def test_sort_by_file
+        @msgmerge.run("--update",
+                      "--sort-by-file",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+        PO
+      end
+
+      def test_sort_by_msgid
+        @msgmerge.run("--update",
+                      "--sort-by-msgid",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+        PO
+      end
+    end
+
+    class TestLocation < self
+      def test_location
+        @msgmerge.run("--update",
+                      "--location",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+#: hello.rb:1
+msgid "Hello"
+msgstr ""
+
+#: hello.rb:2
+msgid "World"
+msgstr "Translated World"
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+        PO
+      end
+
+      def test_no_location
+        @msgmerge.run("--update",
+                      "--no-location",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#{po_header(@pot_formatted_time, @po_formatted_time)}
+msgid "Hello"
+msgstr ""
+
+msgid "World"
+msgstr "Translated World"
+
+msgid "Hello World"
+msgstr ""
+        PO
+      end
+    end
+
+    class TestWidth < self
+      def pot_content
+        <<-POT
+#: hello.rb:1
+msgid "Hello very long line! This line is very long. Yes! This line is very long! Very very long line!"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+        POT
+      end
+
+      def po_content
+        <<-PO
+#: hello.rb:3
+msgid "Hello World"
+msgstr "Translated Hello World. This translation is very long. Yes! Very long translation!!!"
+        PO
+      end
+
+      def test_default
+        @msgmerge.run("--update",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#: hello.rb:1
+msgid ""
+"Hello very long line! This line is very long. Yes! This line is very long! Ver"
+"y very long line!"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+"Translated Hello World. This translation is very long. Yes! Very long translat"
+"ion!!!"
+        PO
+      end
+
+      def test_width
+        @msgmerge.run("--update",
+                      "--width", "70",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#: hello.rb:1
+msgid ""
+"Hello very long line! This line is very long. Yes! This line is very l"
+"ong! Very very long line!"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr ""
+"Translated Hello World. This translation is very long. Yes! Very long "
+"translation!!!"
+        PO
+      end
+
+      def test_no_wrap
+        @msgmerge.run("--update",
+                      "--no-wrap",
+                      @po_file_path, @pot_file_path)
+        assert_equal(<<-PO, File.read(@po_file_path))
+#: hello.rb:1
+msgid "Hello very long line! This line is very long. Yes! This line is very long! Very very long line!"
+msgstr ""
+
+#: hello.rb:3
+msgid "Hello World"
+msgstr "Translated Hello World. This translation is very long. Yes! Very long translation!!!"
+        PO
+      end
+    end
   end
 end