diff --git a/Rakefile b/Rakefile index acc543a..de272d7 100644 --- a/Rakefile +++ b/Rakefile @@ -3,7 +3,6 @@ require 'rake/testtask' Rake::TestTask.new do |t| t.libs = ['lib', 'test'] - t.pattern = 'test/**/*_test.rb' end task :default => :test diff --git a/lib/twine/runner.rb b/lib/twine/runner.rb index 17d2f0f..31dc010 100644 --- a/lib/twine/runner.rb +++ b/lib/twine/runner.rb @@ -7,9 +7,10 @@ module Twine VALID_COMMANDS = ['generate-string-file', 'generate-all-string-files', 'consume-string-file', 'consume-all-string-files', 'generate-loc-drop', 'consume-loc-drop', 'validate-strings-file'] class Runner - def initialize(args) - @options = {} + def initialize(args, options = nil) + @options = options || {} @args = args + @strings = StringsFile.new end def self.run(args) diff --git a/test/command_test_case.rb b/test/command_test_case.rb new file mode 100644 index 0000000..fb1f5ec --- /dev/null +++ b/test/command_test_case.rb @@ -0,0 +1,19 @@ +require 'twine_test_case' + +class CommandTestCase < TwineTestCase + def prepare_mock_formatter(formatter_class) + formatter = formatter_class.new(@mock_strings, {}) + formatter_class.stubs(:new).returns(formatter) + formatter + end + + def setup + super + + @known_languages = %w(en fr de es) + + @mock_strings = Twine::StringsFile.new + @mock_strings.language_codes.concat @known_languages + Twine::StringsFile.stubs(:new).returns(@mock_strings) + end +end diff --git a/test/fixtures/en-1.json b/test/fixtures/en-1.json deleted file mode 100644 index 943acb0..0000000 --- a/test/fixtures/en-1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"key1":"key1-english", -"key3":"key3-english", -"key5":"A new string" -} diff --git a/test/fixtures/en-1.po b/test/fixtures/en-1.po deleted file mode 100644 index 4d153d4..0000000 --- a/test/fixtures/en-1.po +++ /dev/null @@ -1,16 +0,0 @@ -msgid "" -msgstr "" -"Language: en\n" -"X-Generator: Twine\n" - -msgctxt "key1" -msgid "key1-english" -msgstr "key1-english" - -msgctxt "key3" -msgid "key3-english" -msgstr "" - -msgctxt "key5" -msgid "A new string" -msgstr "A new string" diff --git a/test/fixtures/en-1.strings b/test/fixtures/en-1.strings deleted file mode 100644 index 35cb6ca..0000000 --- a/test/fixtures/en-1.strings +++ /dev/null @@ -1,10 +0,0 @@ -/** - * iOS Strings File - * Generated by Twine - * Language: en - */ - -/* My Strings */ -"key1" = "key1-english"; -"key3" = "key3-english"; -"key5" = "A new string"; diff --git a/test/fixtures/en-2.po b/test/fixtures/en-2.po deleted file mode 100644 index 81ce2ce..0000000 --- a/test/fixtures/en-2.po +++ /dev/null @@ -1,23 +0,0 @@ -msgid "" -msgstr "" -"Language: en\n" -"X-Generator: Twine\n" - -msgctxt "key1" -msgid "key1-english" -msgstr "key1-english" - -msgctxt "key3" -msgid "key3-english" -msgstr "" - -msgctxt "key4" -msgid "key4" -"multiline" -msgstr "A multi" -"line string\n" -"can occur" - -msgctxt "key5" -msgid "A new string" -msgstr "A new string" diff --git a/test/fixtures/en-3.xml b/test/fixtures/en-3.xml deleted file mode 100644 index 4e77462..0000000 --- a/test/fixtures/en-3.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \u0020string with spaces\u0020\u0020 - diff --git a/test/fixtures/formatter_android.xml b/test/fixtures/formatter_android.xml new file mode 100644 index 0000000..786557b --- /dev/null +++ b/test/fixtures/formatter_android.xml @@ -0,0 +1,15 @@ + + + + + + + + value1-english + value2-english + + + value3-english + + value4-english + diff --git a/test/fixtures/formatter_apple.strings b/test/fixtures/formatter_apple.strings new file mode 100644 index 0000000..de00eb0 --- /dev/null +++ b/test/fixtures/formatter_apple.strings @@ -0,0 +1,20 @@ +/** + * Apple Strings File + * Generated by Twine <%= Twine::VERSION %> + * Language: en + */ + +/********** Section 1 **********/ + +/* comment key1 */ +"key1" = "value1-english"; + +"key2" = "value2-english"; + + +/********** Section 2 **********/ + +"key3" = "value3-english"; + +/* comment key4 */ +"key4" = "value4-english"; diff --git a/test/fixtures/formatter_gettext.po b/test/fixtures/formatter_gettext.po new file mode 100644 index 0000000..b89adc0 --- /dev/null +++ b/test/fixtures/formatter_gettext.po @@ -0,0 +1,27 @@ +msgid "" +msgstr "" +"Language: en\n" +"X-Generator: Twine <%= Twine::VERSION %>\n" + + +# SECTION: Section 1 +#. "comment key1" +msgctxt "key1" +msgid "value1-english" +msgstr "value1-english" + +msgctxt "key2" +msgid "value2-english" +msgstr "value2-english" + + +# SECTION: Section 2 +msgctxt "key3" +msgid "value3-english" +msgstr "value3-english" + +#. "comment key4" +msgctxt "key4" +msgid "value4-english" +msgstr "value4-english" + diff --git a/test/fixtures/formatter_jquery.json b/test/fixtures/formatter_jquery.json new file mode 100644 index 0000000..b13cf0d --- /dev/null +++ b/test/fixtures/formatter_jquery.json @@ -0,0 +1,7 @@ +{ +"key1":"value1-english", +"key2":"value2-english", + +"key3":"value3-english", +"key4":"value4-english" +} diff --git a/test/fixtures/formatter_tizen.xml b/test/fixtures/formatter_tizen.xml new file mode 100644 index 0000000..889d2c5 --- /dev/null +++ b/test/fixtures/formatter_tizen.xml @@ -0,0 +1,15 @@ + + + + + + + + value1-english + value2-english + + + value3-english + + value4-english + diff --git a/test/fixtures/fr-1.xml b/test/fixtures/fr-1.xml deleted file mode 100644 index b57f5bc..0000000 --- a/test/fixtures/fr-1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - key1-french - key2-french - key3-french - diff --git a/test/fixtures/gettext_multiline.po b/test/fixtures/gettext_multiline.po new file mode 100644 index 0000000..29342fd --- /dev/null +++ b/test/fixtures/gettext_multiline.po @@ -0,0 +1,10 @@ +msgid "" +msgstr "" +"Language: en\n" +"X-Generator: Twine\n" + +msgctxt "key1" +msgid "key1" +msgstr "multi" +"line\n" +"string" diff --git a/test/fixtures/strings-1.txt b/test/fixtures/strings-1.txt deleted file mode 100644 index 85017ef..0000000 --- a/test/fixtures/strings-1.txt +++ /dev/null @@ -1,17 +0,0 @@ -[[My Strings]] - [key1] - en = key1-english - tags = tag1 - comment = This is a comment - es = key1-spanish - fr = key1-french - [key2] - en = key2-english - tags = tag2 - fr = key2-french - [key3] - en = key3-english - tags = tag1,tag2 - es = key3-spanish - [key4] - en = key4-english diff --git a/test/fixtures/strings-2.txt b/test/fixtures/strings-2.txt deleted file mode 100644 index fcfff0d..0000000 --- a/test/fixtures/strings-2.txt +++ /dev/null @@ -1,5 +0,0 @@ -[[My Strings]] - [key with space ] - en = `string with space ` - tags = tag1 - comment = String ends with space diff --git a/test/fixtures/strings-3.txt b/test/fixtures/strings-3.txt deleted file mode 100644 index 6dc0103..0000000 --- a/test/fixtures/strings-3.txt +++ /dev/null @@ -1,5 +0,0 @@ -[[My Strings]] - [parameterized_string] - en = The %@ brown fox jumps over the %@ dog %d times. - [percentage_string] - en = This product is %d%% off. diff --git a/test/fixtures/strings-4-references.txt b/test/fixtures/strings-4-references.txt deleted file mode 100644 index 7968fb5..0000000 --- a/test/fixtures/strings-4-references.txt +++ /dev/null @@ -1,20 +0,0 @@ -[[General]] - [key1] - en = key1-english - tags = tag1 - comment = This is a comment - es = key1-spanish - fr = key1-french - -[[My Strings]] - [key2] - ref = key1 - [key3] - ref = key1 - fr = key3-french - [key4] - ref = key1 - comment = Different comment - [key5] - ref = [key1] - tags = tag2 diff --git a/test/fixtures/test-json-line-breaks/consumed.txt b/test/fixtures/test-json-line-breaks/consumed.txt deleted file mode 100644 index 42d826b..0000000 --- a/test/fixtures/test-json-line-breaks/consumed.txt +++ /dev/null @@ -1,5 +0,0 @@ -[[Line Break Strings]] - [line_breaking] - en = This\nstring\ncontains\nline\nbreaks - tags = tag1 - fr = This\nstring\nalso\ncontains\nline\nbreaks diff --git a/test/fixtures/test-json-line-breaks/generated.json b/test/fixtures/test-json-line-breaks/generated.json deleted file mode 100644 index fcb2382..0000000 --- a/test/fixtures/test-json-line-breaks/generated.json +++ /dev/null @@ -1,3 +0,0 @@ -{ -"line_breaking":"This\nstring\ncontains\nline\nbreaks" -} diff --git a/test/fixtures/test-json-line-breaks/line-breaks.json b/test/fixtures/test-json-line-breaks/line-breaks.json deleted file mode 100644 index 989b6e0..0000000 --- a/test/fixtures/test-json-line-breaks/line-breaks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ -"line_breaking":"This\nstring\nalso\ncontains\nline\nbreaks" -} diff --git a/test/fixtures/test-json-line-breaks/line-breaks.txt b/test/fixtures/test-json-line-breaks/line-breaks.txt deleted file mode 100644 index f82d39e..0000000 --- a/test/fixtures/test-json-line-breaks/line-breaks.txt +++ /dev/null @@ -1,4 +0,0 @@ -[[Line Break Strings]] - [line_breaking] - en = This\nstring\ncontains\nline\nbreaks - tags = tag1 diff --git a/test/fixtures/test-output-1.txt b/test/fixtures/test-output-1.txt deleted file mode 100644 index e7000f5..0000000 --- a/test/fixtures/test-output-1.txt +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - key1-french - key2-french - key3-english - key4-english - diff --git a/test/fixtures/test-output-10.txt b/test/fixtures/test-output-10.txt deleted file mode 100644 index bc0e4d4..0000000 --- a/test/fixtures/test-output-10.txt +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - string with space\u0020 - diff --git a/test/fixtures/test-output-11.txt b/test/fixtures/test-output-11.txt deleted file mode 100644 index d1ec0a6..0000000 --- a/test/fixtures/test-output-11.txt +++ /dev/null @@ -1,9 +0,0 @@ -[[Uncategorized]] - [string_with_spaces] - en = ` string with spaces ` - -[[My Strings]] - [key with space ] - en = `string with space ` - tags = tag1 - comment = String ends with space diff --git a/test/fixtures/test-output-12.txt b/test/fixtures/test-output-12.txt deleted file mode 100644 index 8449225..0000000 --- a/test/fixtures/test-output-12.txt +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - key1-french - key2-french - key3-english - key4-english - diff --git a/test/fixtures/test-output-13.txt b/test/fixtures/test-output-13.txt deleted file mode 100644 index 210ae1d..0000000 --- a/test/fixtures/test-output-13.txt +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - key1-french - key2-french - diff --git a/test/fixtures/test-output-14-references.txt b/test/fixtures/test-output-14-references.txt deleted file mode 100644 index 73e6ded..0000000 --- a/test/fixtures/test-output-14-references.txt +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - key1-french - - - - key1-french - - key3-french - - key1-french - diff --git a/test/fixtures/test-output-14.txt b/test/fixtures/test-output-14.txt deleted file mode 100644 index 3e1f3ee..0000000 --- a/test/fixtures/test-output-14.txt +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - key3-english - key4-english - diff --git a/test/fixtures/test-output-2.txt b/test/fixtures/test-output-2.txt deleted file mode 100644 index 8f211e8..0000000 --- a/test/fixtures/test-output-2.txt +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Apple Strings File - * Generated by Twine <%= Twine::VERSION %> - * Language: en - */ - -/********** My Strings **********/ - -/* This is a comment */ -"key1" = "key1-english"; - -"key3" = "key3-english"; diff --git a/test/fixtures/test-output-3.txt b/test/fixtures/test-output-3.txt deleted file mode 100644 index 8db9d00..0000000 --- a/test/fixtures/test-output-3.txt +++ /dev/null @@ -1,18 +0,0 @@ -[[My Strings]] - [key1] - en = key1-english - tags = tag1 - comment = This is a comment - es = key1-spanish - fr = key1-french - [key2] - en = key2-english - tags = tag2 - fr = key2-french - [key3] - en = key3-english - tags = tag1,tag2 - es = key3-spanish - fr = key3-french - [key4] - en = key4-english diff --git a/test/fixtures/test-output-4.txt b/test/fixtures/test-output-4.txt deleted file mode 100644 index 435fad7..0000000 --- a/test/fixtures/test-output-4.txt +++ /dev/null @@ -1,21 +0,0 @@ -[[Uncategorized]] - [key5] - en = A new string - -[[My Strings]] - [key1] - en = key1-english - tags = tag1 - comment = This is a comment - es = key1-spanish - fr = key1-french - [key2] - en = key2-english - tags = tag2 - fr = key2-french - [key3] - en = key3-english - tags = tag1,tag2 - es = key3-spanish - [key4] - en = key4-english diff --git a/test/fixtures/test-output-5.txt b/test/fixtures/test-output-5.txt deleted file mode 100644 index 5f5a01d..0000000 --- a/test/fixtures/test-output-5.txt +++ /dev/null @@ -1,4 +0,0 @@ -{ -"key1":"key1-english", -"key3":"key3-english" -} diff --git a/test/fixtures/test-output-6.txt b/test/fixtures/test-output-6.txt deleted file mode 100644 index d622fc8..0000000 --- a/test/fixtures/test-output-6.txt +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Apple Strings File - * Generated by Twine <%= Twine::VERSION %> - * Language: en - */ - -/********** My Strings **********/ - -/* String ends with space */ -"key with space " = "string with space "; diff --git a/test/fixtures/test-output-7.txt b/test/fixtures/test-output-7.txt deleted file mode 100644 index c2991bb..0000000 --- a/test/fixtures/test-output-7.txt +++ /dev/null @@ -1,16 +0,0 @@ -msgid "" -msgstr "" -"Language: en\n" -"X-Generator: Twine <%= Twine::VERSION %>\n" - - -# SECTION: My Strings -#. "This is a comment" -msgctxt "key1" -msgid "key1-english" -msgstr "key1-english" - -msgctxt "key3" -msgid "key3-english" -msgstr "key3-english" - diff --git a/test/fixtures/test-output-8.txt b/test/fixtures/test-output-8.txt deleted file mode 100644 index 1c630a2..0000000 --- a/test/fixtures/test-output-8.txt +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - The %1$s brown fox jumps over the %2$s dog %3$d times. - This product is %d%% off. - diff --git a/test/fixtures/test-output-9.txt b/test/fixtures/test-output-9.txt deleted file mode 100644 index c351f43..0000000 --- a/test/fixtures/test-output-9.txt +++ /dev/null @@ -1,21 +0,0 @@ -[[Uncategorized]] - [key5] - en = A new string - -[[My Strings]] - [key1] - en = key1-english - tags = tag1 - comment = This is a comment - es = key1-spanish - fr = key1-french - [key2] - en = key2-english - tags = tag2 - fr = key2-french - [key3] - en = key3-english - tags = tag1,tag2 - es = key3-spanish - [key4] - en = A multiline string\ncan occur diff --git a/test/fixtures/twine_accent_values.txt b/test/fixtures/twine_accent_values.txt new file mode 100644 index 0000000..90a9cb6 --- /dev/null +++ b/test/fixtures/twine_accent_values.txt @@ -0,0 +1,13 @@ +[[Section]] + [value_with_leading_accent] + en = `value + [value_with_trailing_accent] + en = value` + [value_with_leading_space] + en = ` value` + [value_with_trailing_space] + en = `value ` + [value_wrapped_by_spaces] + en = ` value ` + [value_wrapped_by_accents] + en = ``value`` diff --git a/test/references/fixtures/different_comment.xml b/test/references/fixtures/different_comment.xml deleted file mode 100644 index 7679dac..0000000 --- a/test/references/fixtures/different_comment.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - key2-english - diff --git a/test/references/fixtures/different_value.xml b/test/references/fixtures/different_value.xml deleted file mode 100644 index 24a91e4..0000000 --- a/test/references/fixtures/different_value.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - key2-english - diff --git a/test/references/fixtures/empty.xml b/test/references/fixtures/empty.xml deleted file mode 100644 index bca9c58..0000000 --- a/test/references/fixtures/empty.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/test/references/fixtures/same_comment.xml b/test/references/fixtures/same_comment.xml deleted file mode 100644 index 683d32d..0000000 --- a/test/references/fixtures/same_comment.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - key2-english - diff --git a/test/references/fixtures/same_value.xml b/test/references/fixtures/same_value.xml deleted file mode 100644 index b8c20b4..0000000 --- a/test/references/fixtures/same_value.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - key1-english - diff --git a/test/references/fixtures/twine_comment_reference.txt b/test/references/fixtures/twine_comment_reference.txt deleted file mode 100644 index eb20cd6..0000000 --- a/test/references/fixtures/twine_comment_reference.txt +++ /dev/null @@ -1,7 +0,0 @@ -[[General]] - [key1] - en = key1-english - comment = Simple comment - [key2] - en = key2-english - ref = key1 diff --git a/test/references/fixtures/twine_tag_reference.txt b/test/references/fixtures/twine_tag_reference.txt deleted file mode 100644 index 0278de2..0000000 --- a/test/references/fixtures/twine_tag_reference.txt +++ /dev/null @@ -1,7 +0,0 @@ -[[General]] - [key1] - en = key1-english - tags = tag1 - [key2] - en = key2-english - ref = key1 diff --git a/test/references/fixtures/twine_updated_comment.txt b/test/references/fixtures/twine_updated_comment.txt deleted file mode 100644 index 33229ee..0000000 --- a/test/references/fixtures/twine_updated_comment.txt +++ /dev/null @@ -1,8 +0,0 @@ -[[General]] - [key1] - en = key1-english - comment = Simple comment - [key2] - en = key2-english - ref = key1 - comment = Different comment diff --git a/test/references/fixtures/twine_updated_value.txt b/test/references/fixtures/twine_updated_value.txt deleted file mode 100644 index a07c4d3..0000000 --- a/test/references/fixtures/twine_updated_value.txt +++ /dev/null @@ -1,6 +0,0 @@ -[[General]] - [key1] - en = key1-english - [key2] - en = key2-english - ref = key1 diff --git a/test/references/fixtures/twine_value_reference.txt b/test/references/fixtures/twine_value_reference.txt deleted file mode 100644 index 531fee4..0000000 --- a/test/references/fixtures/twine_value_reference.txt +++ /dev/null @@ -1,5 +0,0 @@ -[[General]] - [key1] - en = key1-english - [key2] - ref = key1 diff --git a/test/references/references_test.rb b/test/references/references_test.rb deleted file mode 100644 index 9a1d158..0000000 --- a/test/references/references_test.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'twine_test_case' - -class ReferencesTest < TwineTestCase - def fixture_path - 'references/fixtures' - end - - def test_consumption_preserves_references - input = 'twine_value_reference.txt' - execute "consume-string-file #{f input} #{f 'empty.xml'} -l en" - assert_equal content(input), output_content - end - - def test_consumption_does_not_add_unchanged_translation - input = 'twine_value_reference.txt' - execute "consume-string-file #{f input} #{f 'same_value.xml'} -l en" - assert_equal content(input), output_content - end - - def test_consumption_adds_changed_translation - execute "consume-string-file #{f 'twine_value_reference.txt'} #{f 'different_value.xml'} -l en" - assert_equal content('twine_updated_value.txt'), output_content - end - - def test_consuption_does_not_add_comment - input = 'twine_comment_reference.txt' - execute "consume-string-file #{f input} #{f 'empty.xml'} -l en" - assert_equal content(input), output_content - end - - def test_consumption_does_not_add_unchanged_comment - input = 'twine_comment_reference.txt' - execute "consume-string-file #{f input} #{f 'same_comment.xml'} -l en -c" - assert_equal content(input), output_content - end - - def test_consumption_adds_changed_comment - execute "consume-string-file #{f 'twine_comment_reference.txt'} #{f 'different_comment.xml'} -l en -c" - assert_equal content('twine_updated_comment.txt'), output_content - end - - def test_consumption_does_not_add_tags - input = 'twine_tag_reference.txt' - execute "consume-string-file #{f input} #{f 'empty.xml'} -l en -c" - assert_equal content(input), output_content - end -end diff --git a/test/test_abstract_formatter.rb b/test/test_abstract_formatter.rb new file mode 100644 index 0000000..6e7cc52 --- /dev/null +++ b/test/test_abstract_formatter.rb @@ -0,0 +1,130 @@ +require 'twine_test_case' + +class TestAbstractFormatter < TwineTestCase + class SetTranslation < TwineTestCase + def setup + super + + @strings = build_twine_file 'en', 'fr' do + add_section 'Section' do + add_row key1: 'value1-english' + add_row key2: { en: 'value2-english', fr: 'value2-french' } + end + end + + @formatter = Twine::Formatters::Abstract.new(@strings, {}) + end + + def test_set_translation_updates_existing_value + @formatter.set_translation_for_key 'key1', 'en', 'value1-english-updated' + + assert_equal 'value1-english-updated', @strings.strings_map['key1'].translations['en'] + end + + def test_set_translation_does_not_alter_other_language + @formatter.set_translation_for_key 'key2', 'en', 'value2-english-updated' + + assert_equal 'value2-french', @strings.strings_map['key2'].translations['fr'] + end + + def test_set_translation_adds_translation_to_existing_key + @formatter.set_translation_for_key 'key1', 'fr', 'value1-french' + + assert_equal 'value1-french', @strings.strings_map['key1'].translations['fr'] + end + + def test_set_translation_does_not_add_new_key + @formatter.set_translation_for_key 'new-key', 'en', 'new-key-english' + + assert_nil @strings.strings_map['new-key'] + end + + def test_set_translation_consume_all_adds_new_key + formatter = Twine::Formatters::Abstract.new(@strings, { consume_all: true }) + formatter.set_translation_for_key 'new-key', 'en', 'new-key-english' + + assert_equal 'new-key-english', @strings.strings_map['new-key'].translations['en'] + end + + def test_set_translation_consume_all_adds_tags + random_tag = SecureRandom.uuid + formatter = Twine::Formatters::Abstract.new(@strings, { consume_all: true, tags: [random_tag] }) + formatter.set_translation_for_key 'new-key', 'en', 'new-key-english' + + assert_equal [random_tag], @strings.strings_map['new-key'].tags + end + + def test_set_translation_adds_new_keys_to_category_uncategoriezed + formatter = Twine::Formatters::Abstract.new(@strings, { consume_all: true }) + formatter.set_translation_for_key 'new-key', 'en', 'new-key-english' + + assert_equal 'Uncategorized', @strings.sections[0].name + assert_equal 'new-key', @strings.sections[0].rows[0].key + end + end + + class ValueReference < TwineTestCase + def setup + super + + @strings = build_twine_file 'en', 'fr' do + add_section 'Section' do + add_row refkey: 'ref-value' + add_row key: :refkey + end + end + + @formatter = Twine::Formatters::Abstract.new(@strings, {}) + end + + def test_set_translation_does_not_add_unchanged_translation + @formatter.set_translation_for_key 'key', 'en', 'ref-value' + + assert_nil @strings.strings_map['key'].translations['en'] + end + + def test_set_translation_adds_changed_translation + @formatter.set_translation_for_key 'key', 'en', 'changed value' + + assert_equal 'changed value', @strings.strings_map['key'].translations['en'] + end + end + + class SetComment < TwineTestCase + def test_set_comment_for_key_does_not_update_comment + skip 'not supported by current implementation - see #97' + end + + def test_set_comment_for_key_updates_comment_with_update_comments + skip 'not supported by current implementation - see #97' + end + end + + class CommentReference < TwineTestCase + def setup + super + + @strings = build_twine_file 'en', 'fr' do + add_section 'Section' do + add_row refkey: 'ref-value', comment: 'reference comment' + add_row key: 'value', ref: :refkey + end + end + + @formatter = Twine::Formatters::Abstract.new(@strings, {}) + end + + def test_set_comment_does_not_add_unchanged_comment + @formatter.set_comment_for_key 'key', 'reference comment' + + assert_nil @strings.strings_map['key'].raw_comment + end + + def test_set_comment_adds_changed_comment + @formatter.set_comment_for_key 'key', 'changed comment' + + assert_equal 'changed comment', @strings.strings_map['key'].raw_comment + end + end + +end diff --git a/test/test_consume_string_file.rb b/test/test_consume_string_file.rb new file mode 100644 index 0000000..0c70a23 --- /dev/null +++ b/test/test_consume_string_file.rb @@ -0,0 +1,50 @@ +require 'command_test_case' + +class TestConsumeStringFile < CommandTestCase + def new_runner(language, file) + options = {} + options[:output_path] = File.join(@output_dir, file) if file + options[:input_path] = File.join(@output_dir, file) if file + FileUtils.touch options[:input_path] + options[:languages] = language if language + + Twine::Runner.new(nil, options) + end + + def prepare_mock_read_file_formatter(formatter_class) + formatter = prepare_mock_formatter(formatter_class) + formatter.expects(:read_file) + end + + def test_deducts_android_format_from_output_path + prepare_mock_read_file_formatter Twine::Formatters::Android + + new_runner('fr', 'fr.xml').consume_string_file + end + + def test_deducts_apple_format_from_output_path + prepare_mock_read_file_formatter Twine::Formatters::Apple + + new_runner('fr', 'fr.strings').consume_string_file + end + + def test_deducts_jquery_format_from_output_path + prepare_mock_read_file_formatter Twine::Formatters::JQuery + + new_runner('fr', 'fr.json').consume_string_file + end + + def test_deducts_gettext_format_from_output_path + prepare_mock_read_file_formatter Twine::Formatters::Gettext + + new_runner('fr', 'fr.po').consume_string_file + end + + def test_deducts_language_from_input_path + random_language = @known_languages.sample + formatter = prepare_mock_formatter Twine::Formatters::Android + formatter.expects(:read_file).with(anything, random_language) + + new_runner(nil, "#{random_language}.xml").consume_string_file + end +end diff --git a/test/create_folders_test.rb b/test/test_create_folders.rb similarity index 80% rename from test/create_folders_test.rb rename to test/test_create_folders.rb index d2bfb9a..e023801 100644 --- a/test/create_folders_test.rb +++ b/test/test_create_folders.rb @@ -1,16 +1,15 @@ require 'twine_test_case' -class CreateFoldersTest < TwineTestCase +class TestCreateFolders < TwineTestCase def test_generate_all_fails_if_output_folder_does_not_exist - assert_raise Twine::Error do + assert_raises Twine::Error do execute "generate-all-string-files #{f 'twine_key1_en_es.txt'} #{@output_dir} -f apple" end end def test_generate_all_creates_output_folder - assert_nothing_raised do - execute "generate-all-string-files #{f 'twine_key1_en_es.txt'} #{@output_dir} -f apple --create-folders" - end + # implicitly assert nothing raised + execute "generate-all-string-files #{f 'twine_key1_en_es.txt'} #{@output_dir} -f apple --create-folders" end def test_generate_all_does_not_create_folders diff --git a/test/test_formatters.rb b/test/test_formatters.rb new file mode 100644 index 0000000..f059914 --- /dev/null +++ b/test/test_formatters.rb @@ -0,0 +1,196 @@ +require 'twine_test_case' + +class FormatterTest < TwineTestCase + def setup(formatter_class) + super() + + @twine_file = build_twine_file 'en' do + add_section 'Section 1' do + add_row key1: 'value1-english', comment: 'comment key1' + add_row key2: 'value2-english' + end + + add_section 'Section 2' do + add_row key3: 'value3-english' + add_row key4: 'value4-english', comment: 'comment key4' + end + end + + @strings = Twine::StringsFile.new + @formatter = formatter_class.new @strings, { consume_all: true } + end +end + +class TestAndroidFormatter < FormatterTest + def setup + super Twine::Formatters::Android + end + + def test_read_file_format + @formatter.read_file fixture('formatter_android.xml'), 'en' + + 1.upto(4) do |i| + assert_equal "value#{i}-english", @strings.strings_map["key#{i}"].translations['en'] + end + end + + def test_set_translation_transforms_leading_spaces + @formatter.set_translation_for_key 'key1', 'en', "\u0020value" + assert_equal ' value', @strings.strings_map['key1'].translations['en'] + end + + def test_set_translation_transforms_trailing_spaces + @formatter.set_translation_for_key 'key1', 'en', "value\u0020\u0020" + assert_equal 'value ', @strings.strings_map['key1'].translations['en'] + end + + def test_write_file_output_format + formatter = Twine::Formatters::Android.new @twine_file, {} + formatter.write_file @output_path, 'en' + assert_equal content('formatter_android.xml'), output_content + end + + def test_format_key_with_space + assert_equal 'key ', @formatter.format_key('key ') + end + + def test_format_value_with_leading_space + assert_equal "\\u0020value", @formatter.format_value(' value') + end + + def test_format_value_with_trailing_space + assert_equal "value\\u0020", @formatter.format_value('value ') + end + + def test_format_value_escapes_single_quotes + skip 'not working with ruby 2.0' + # http://stackoverflow.com/questions/18735608/cgiescapehtml-is-escaping-single-quote + assert_equal "not \\'so\\' easy", @formatter.format_value("not 'so' easy") + end + + def test_format_value_transforms_string_placeholder + assert_equal '%s', @formatter.format_value('%@') + end + + def test_format_value_transforms_ordered_string_placeholder + assert_equal '%1s', @formatter.format_value('%1@') + end + + def test_format_value_transforming_ordered_placeholders_maintains_order + assert_equal '%2s %1d', @formatter.format_value('%2@ %1d') + end + + def test_format_value_does_not_alter_double_percent + assert_equal '%%d%%', @formatter.format_value('%%d%%') + end + +end + +class TestAppleFormatter < FormatterTest + def setup + super Twine::Formatters::Apple + end + + def test_read_file_format + @formatter.read_file fixture('formatter_apple.strings'), 'en' + + 1.upto(4) do |i| + assert_equal "value#{i}-english", @strings.strings_map["key#{i}"].translations['en'] + end + end + + def test_write_file_output_format + formatter = Twine::Formatters::Apple.new @twine_file, {} + formatter.write_file @output_path, 'en' + assert_equal content('formatter_apple.strings'), output_content + end + + def test_format_key_with_space + assert_equal 'key ', @formatter.format_key('key ') + end + + def test_format_value_with_leading_space + assert_equal ' value', @formatter.format_value(' value') + end + + def test_format_value_with_trailing_space + assert_equal 'value ', @formatter.format_value('value ') + end +end + +class TestJQueryFormatter < FormatterTest + + def setup + super Twine::Formatters::JQuery + end + + def test_read_file_format + @formatter.read_file fixture('formatter_jquery.json'), 'en' + + 1.upto(4) do |i| + assert_equal "value#{i}-english", @strings.strings_map["key#{i}"].translations['en'] + end + end + + def test_write_file_output_format + formatter = Twine::Formatters::JQuery.new @twine_file, {} + formatter.write_file @output_path, 'en' + assert_equal content('formatter_jquery.json'), output_content + end + + def test_format_value_with_newline + skip 'this test will only work once the JQuery formatter is modularized' + # assert_equal "value\nwith\nline\nbreaks", @formatter.format_value("value\nwith\nline\nbreaks") + end +end + +class TestGettextFormatter < FormatterTest + + def setup + super Twine::Formatters::Gettext + end + + def test_read_file_format + @formatter.read_file fixture('formatter_gettext.po'), 'en' + + 1.upto(4) do |i| + assert_equal "value#{i}-english", @strings.strings_map["key#{i}"].translations['en'] + end + end + + def test_read_file_with_multiple_line_value + @formatter.read_file fixture('gettext_multiline.po'), 'en' + + assert_equal 'multiline\nstring', @strings.strings_map['key1'].translations['en'] + end + + def test_write_file_output_format + formatter = Twine::Formatters::Gettext.new @twine_file, {} + formatter.write_file @output_path, 'en' + assert_equal content('formatter_gettext.po'), output_content + end + +end + +class TestTizenFormatter < FormatterTest + + def setup + super Twine::Formatters::Tizen + end + + def test_read_file_format + skip 'the current implementation of Tizen formatter does not support read_file' + @formatter.read_file fixture('formatter_tizen.xml'), 'en' + + 1.upto(4) do |i| + assert_equal "value#{i}-english", @strings.strings_map["key#{i}"].translations['en'] + end + end + + def test_write_file_output_format + formatter = Twine::Formatters::Tizen.new @twine_file, {} + formatter.write_file @output_path, 'en' + assert_equal content('formatter_tizen.xml'), output_content + end + +end diff --git a/test/test_generate_string_file.rb b/test/test_generate_string_file.rb new file mode 100644 index 0000000..466869e --- /dev/null +++ b/test/test_generate_string_file.rb @@ -0,0 +1,48 @@ +require 'command_test_case' + +class TestGenerateStringFile < CommandTestCase + def new_runner(language, file) + options = {} + options[:output_path] = File.join(@output_dir, file) if file + options[:languages] = language if language + + Twine::Runner.new(nil, options) + end + + def prepare_mock_write_file_formatter(formatter_class) + formatter = prepare_mock_formatter(formatter_class) + formatter.expects(:write_file) + end + + def test_deducts_android_format_from_output_path + prepare_mock_write_file_formatter Twine::Formatters::Android + + new_runner('fr', 'fr.xml').generate_string_file + end + + def test_deducts_apple_format_from_output_path + prepare_mock_write_file_formatter Twine::Formatters::Apple + + new_runner('fr', 'fr.strings').generate_string_file + end + + def test_deducts_jquery_format_from_output_path + prepare_mock_write_file_formatter Twine::Formatters::JQuery + + new_runner('fr', 'fr.json').generate_string_file + end + + def test_deducts_gettext_format_from_output_path + prepare_mock_write_file_formatter Twine::Formatters::Gettext + + new_runner('fr', 'fr.po').generate_string_file + end + + def test_deducts_language_from_output_path + random_language = @known_languages.sample + formatter = prepare_mock_formatter Twine::Formatters::Android + formatter.expects(:write_file).with(anything, random_language) + + new_runner(nil, "#{random_language}.xml").generate_string_file + end +end diff --git a/test/test_output_processor.rb b/test/test_output_processor.rb new file mode 100644 index 0000000..1e2958b --- /dev/null +++ b/test/test_output_processor.rb @@ -0,0 +1,85 @@ +require 'twine_test_case' + +class TestOutputProcessor < TwineTestCase + def setup + super + + @strings = build_twine_file 'en', 'fr' do + add_section 'Section' do + add_row key1: 'value1', tags: ['tag1'] + add_row key2: 'value2', tags: ['tag1', 'tag2'] + add_row key3: 'value3', tags: ['tag2'] + add_row key4: { en: 'value4-en', fr: 'value4-fr' } + end + end + end + + def test_includes_all_keys_by_default + processor = Twine::Processors::OutputProcessor.new(@strings, {}) + result = processor.process('en') + + assert_equal %w(key1 key2 key3 key4), result.strings_map.keys.sort + end + + def test_filter_by_tag + processor = Twine::Processors::OutputProcessor.new(@strings, { tags: ['tag1'] }) + result = processor.process('en') + + assert_equal %w(key1 key2), result.strings_map.keys.sort + end + + def test_filter_by_multiple_tags + processor = Twine::Processors::OutputProcessor.new(@strings, { tags: ['tag1', 'tag2'] }) + result = processor.process('en') + + assert_equal %w(key1 key2 key3), result.strings_map.keys.sort + end + + def test_filter_untagged + processor = Twine::Processors::OutputProcessor.new(@strings, { tags: ['tag1'], untagged: true }) + result = processor.process('en') + + assert_equal %w(key1 key2 key4), result.strings_map.keys.sort + end + + def test_include_translated + processor = Twine::Processors::OutputProcessor.new(@strings, { include: 'translated' }) + result = processor.process('fr') + + assert_equal %w(key4), result.strings_map.keys.sort + end + + def test_include_untranslated + processor = Twine::Processors::OutputProcessor.new(@strings, { include: 'untranslated' }) + result = processor.process('fr') + + assert_equal %w(key1 key2 key3), result.strings_map.keys.sort + end + + class TranslationFallback < TwineTestCase + def setup + super + + @strings = build_twine_file 'en', 'fr', 'de' do + add_section 'Section' do + add_row key1: { en: 'value1-en', fr: 'value1-fr' } + end + end + end + + def test_fallback_to_default_language + processor = Twine::Processors::OutputProcessor.new(@strings, {}) + result = processor.process('de') + + assert_equal 'value1-en', result.strings_map['key1'].translations['de'] + end + + def test_fallback_to_developer_language + processor = Twine::Processors::OutputProcessor.new(@strings, {developer_language: 'fr'}) + result = processor.process('de') + + assert_equal 'value1-fr', result.strings_map['key1'].translations['de'] + end + end + +end diff --git a/test/test_strings_file.rb b/test/test_strings_file.rb new file mode 100644 index 0000000..ee27140 --- /dev/null +++ b/test/test_strings_file.rb @@ -0,0 +1,58 @@ +require 'twine_test_case' + +class TestStringsFile < TwineTestCase + class Reading < TwineTestCase + def setup + super + + @strings = Twine::StringsFile.new + @strings.read fixture('twine_accent_values.txt') + end + + def test_reading_keeps_leading_accent + assert_equal '`value', @strings.strings_map['value_with_leading_accent'].translations['en'] + end + + def test_reading_keeps_trailing_accent + assert_equal 'value`', @strings.strings_map['value_with_trailing_accent'].translations['en'] + end + + def test_reading_keeps_leading_space + assert_equal ' value', @strings.strings_map['value_with_leading_space'].translations['en'] + end + + def test_reading_keeps_trailing_space + assert_equal 'value ', @strings.strings_map['value_with_trailing_space'].translations['en'] + end + + def test_reading_keeps_wrapping_spaces + assert_equal ' value ', @strings.strings_map['value_wrapped_by_spaces'].translations['en'] + end + + def test_reading_keeps_wrapping_accents + assert_equal '`value`', @strings.strings_map['value_wrapped_by_accents'].translations['en'] + end + end + + class Writing < TwineTestCase + + def test_accent_wrapping + @strings = build_twine_file 'en' do + add_section 'Section' do + add_row value_with_leading_accent: '`value' + add_row value_with_trailing_accent: 'value`' + add_row value_with_leading_space: ' value' + add_row value_with_trailing_space: 'value ' + add_row value_wrapped_by_spaces: ' value ' + add_row value_wrapped_by_accents: '`value`' + end + end + + @strings.write @output_path + + assert_equal content('twine_accent_values.txt'), output_content + end + + end + +end diff --git a/test/test_strings_row.rb b/test/test_strings_row.rb new file mode 100644 index 0000000..b477483 --- /dev/null +++ b/test/test_strings_row.rb @@ -0,0 +1,47 @@ +require 'twine_test_case' + +class TestStringsRow < TwineTestCase + def setup + super + + @reference = Twine::StringsRow.new 'reference-key' + @reference.comment = 'reference comment' + @reference.tags = ['ref1'] + @reference.translations['en'] = 'ref-value' + + @row = Twine::StringsRow.new 'key' + @row.reference_key = @reference.key + @row.reference = @reference + end + + def test_reference_comment_used + assert_equal 'reference comment', @row.comment + end + + def test_reference_comment_override + @row.comment = 'row comment' + + assert_equal 'row comment', @row.comment + end + + def test_reference_tags_used + assert @row.matches_tags?(['ref1'], false) + end + + def test_reference_tags_override + @row.tags = ['tag1'] + + refute @row.matches_tags?(['ref1'], false) + assert @row.matches_tags?(['tag1'], false) + end + + def test_reference_translation_used + assert_equal 'ref-value', @row.translated_string_for_lang('en') + end + + def test_reference_translation_override + @row.translations['en'] = 'value' + + assert_equal 'value', @row.translated_string_for_lang('en') + end +end diff --git a/test/twine_file_dsl.rb b/test/twine_file_dsl.rb new file mode 100644 index 0000000..ebb4544 --- /dev/null +++ b/test/twine_file_dsl.rb @@ -0,0 +1,46 @@ +module TwineFileDSL + def build_twine_file(*languages) + @currently_built_twine_file = Twine::StringsFile.new + @currently_built_twine_file.language_codes.concat languages + yield + result = @currently_built_twine_file + @currently_built_twine_file = nil + return result + end + + def add_section(name) + return unless @currently_built_twine_file + @currently_built_twine_file_section = Twine::StringsSection.new name + @currently_built_twine_file.sections << @currently_built_twine_file_section + yield + @currently_built_twine_file_section = nil + end + + def add_row(parameters) + return unless @currently_built_twine_file + return unless @currently_built_twine_file_section + + # this relies on Ruby 1.9 preserving the order of hash elements + key, value = parameters.first + row = Twine::StringsRow.new(key.to_s) + if value.is_a? Hash + value.each do |language, translation| + row.translations[language.to_s] = translation + end + elsif !value.is_a? Symbol + language = @currently_built_twine_file.language_codes.first + row.translations[language] = value + end + + row.comment = parameters[:comment] if parameters[:comment] + row.tags = parameters[:tags] if parameters[:tags] + if parameters[:ref] || value.is_a?(Symbol) + reference_key = (parameters[:ref] || value).to_s + row.reference_key = reference_key + row.reference = @currently_built_twine_file.strings_map[reference_key] + end + + @currently_built_twine_file_section.rows << row + @currently_built_twine_file.strings_map[row.key] = row + end +end diff --git a/test/twine_test.rb b/test/twine_test.rb deleted file mode 100644 index 5522644..0000000 --- a/test/twine_test.rb +++ /dev/null @@ -1,158 +0,0 @@ -require 'erb' -require 'rubygems' -require 'test/unit' -require 'twine' - -class TwineTest < Test::Unit::TestCase - def test_generate_string_file_1 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'fr.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path})) - assert_equal(ERB.new(File.read('test/fixtures/test-output-1.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_2 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.strings') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-2.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_3 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.json') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-5.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_4 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.strings') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-2.txt #{output_path} -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-6.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_5 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.po') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-7.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_6 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-3.txt #{output_path})) - assert_equal(ERB.new(File.read('test/fixtures/test-output-8.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_7 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-2.txt #{output_path} -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-10.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_8 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'fr.xml') - Twine::Runner.run(%W(generate-string-file --format tizen test/fixtures/strings-1.txt #{output_path})) - assert_equal(ERB.new(File.read('test/fixtures/test-output-12.txt')).result, File.read(output_path)) - end - end - - def test_include_translated - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'fr.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} --include translated)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-13.txt')).result, File.read(output_path)) - end - end - - def test_consume_string_file_1 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/fr-1.xml -o #{output_path} -l fr)) - assert_equal(File.read('test/fixtures/test-output-3.txt'), File.read(output_path)) - end - end - - def test_consume_string_file_2 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-1.strings -o #{output_path} -l en -a)) - assert_equal(File.read('test/fixtures/test-output-4.txt'), File.read(output_path)) - end - end - - def test_consume_string_file_3 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-1.json -o #{output_path} -l en -a)) - assert_equal(File.read('test/fixtures/test-output-4.txt'), File.read(output_path)) - end - end - - def test_consume_string_file_4 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-1.po -o #{output_path} -l en -a)) - assert_equal(File.read('test/fixtures/test-output-4.txt'), File.read(output_path)) - end - end - - def test_consume_string_file_5 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-1.txt test/fixtures/en-2.po -o #{output_path} -l en -a)) - assert_equal(File.read('test/fixtures/test-output-9.txt'), File.read(output_path)) - end - end - - def test_consume_string_file_6 - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/strings-2.txt test/fixtures/en-3.xml -o #{output_path} -l en -a)) - assert_equal(File.read('test/fixtures/test-output-11.txt'), File.read(output_path)) - end - end - - def test_json_line_breaks_consume - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'strings.txt') - Twine::Runner.run(%W(consume-string-file test/fixtures/test-json-line-breaks/line-breaks.txt test/fixtures/test-json-line-breaks/line-breaks.json -l fr -o #{output_path})) - assert_equal(File.read('test/fixtures/test-json-line-breaks/consumed.txt'), File.read(output_path)) - end - end - - def test_json_line_breaks_generate - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'en.json') - Twine::Runner.run(%W(generate-string-file test/fixtures/test-json-line-breaks/line-breaks.txt #{output_path})) - assert_equal(File.read('test/fixtures/test-json-line-breaks/generated.json'), File.read(output_path)) - end - end - - def test_generate_string_file_14_include_untranslated - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'include_untranslated.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-1.txt #{output_path} --include untranslated -l fr)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-14.txt')).result, File.read(output_path)) - end - end - - def test_generate_string_file_14_references - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'references.xml') - Twine::Runner.run(%W(generate-string-file test/fixtures/strings-4-references.txt #{output_path} -l fr -t tag1)) - assert_equal(ERB.new(File.read('test/fixtures/test-output-14-references.txt')).result, File.read(output_path)) - end - end -end diff --git a/test/twine_test_case.rb b/test/twine_test_case.rb index 05bf7b0..3bace86 100644 --- a/test/twine_test_case.rb +++ b/test/twine_test_case.rb @@ -1,10 +1,13 @@ require 'erb' -require 'rubygems' -require 'test/unit' +require 'minitest/autorun' +require "mocha/mini_test" require 'securerandom' require 'twine' +require 'twine_file_dsl' -class TwineTestCase < Test::Unit::TestCase +class TwineTestCase < Minitest::Test + include TwineFileDSL + def setup super @output_dir = Dir.mktmpdir @@ -16,10 +19,6 @@ class TwineTestCase < Test::Unit::TestCase super end - def fixture_path - 'fixtures' - end - def output_content File.read @output_path end @@ -30,11 +29,11 @@ class TwineTestCase < Test::Unit::TestCase end def fixture(filename) - File.join __dir__, fixture_path, filename + File.join __dir__, 'fixtures', filename end alias :f :fixture def content(filename) - File.read fixture(filename) + ERB.new(File.read fixture(filename)).result end end diff --git a/twine.gemspec b/twine.gemspec index bd3ccc3..54e178b 100644 --- a/twine.gemspec +++ b/twine.gemspec @@ -15,12 +15,14 @@ Gem::Specification.new do |s| s.files += Dir.glob("lib/**/*") s.files += Dir.glob("bin/**/*") s.files += Dir.glob("test/**/*") - s.test_file = 'test/twine_test.rb' + s.test_files = Dir.glob("test/test_*") s.required_ruby_version = ">= 1.8.7" s.add_runtime_dependency('rubyzip', "~> 0.9.5") s.add_runtime_dependency('safe_yaml', "~> 1.0.3") s.add_development_dependency('rake', "~> 0.9.2") + s.add_development_dependency('minitest', "> 5.5") + s.add_development_dependency('mocha', ">= 1.1") s.executables = %w( twine ) s.description = <