Merge pull request #111 from sebastianludwig/command_test_case_cleanup

Cleaned up CommandTestCase.

lib/twine/runner.rb

@@ -7,10 +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 = nil)
-      @options = options || {}
+    def initialize(args, options = {}, strings = StringsFile.new)
       @args = args
-      @strings = StringsFile.new
+      @options = options
+      @strings = strings
     end
 
     def self.run(args)
@@ -20,13 +20,8 @@ module Twine
     def run
       # Parse all CLI arguments.
       CLI::parse_args(@args, @options)
-      read_strings_data
-      execute_command
-    end
-
-    def read_strings_data
-      @strings = StringsFile.new
       @strings.read @options[:strings_file]
+      execute_command
     end
 
     def write_strings_data(path)

test/command_test_case.rb

@@ -1,19 +1,14 @@
 require 'twine_test_case'
 
 class CommandTestCase < TwineTestCase
+  KNOWN_LANGUAGES = %w(en fr de es)
+
   def prepare_mock_formatter(formatter_class)
-    formatter = formatter_class.new(@mock_strings, {})
+    strings = Twine::StringsFile.new
+    strings.language_codes.concat KNOWN_LANGUAGES
+
+    formatter = formatter_class.new(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

test/fixtures/twine_key1_en_es.txt

@@ -1,4 +0,0 @@
-[[My Strings]]
-  [key1]
-    en = key1-english
-    es = key1-spanish

test/test_consume_string_file.rb

@@ -8,7 +8,10 @@ class TestConsumeStringFile < CommandTestCase
     FileUtils.touch options[:input_path]
     options[:languages] = language if language
 
-    Twine::Runner.new(nil, options)
+    @strings = Twine::StringsFile.new
+    @strings.language_codes.concat KNOWN_LANGUAGES
+
+    Twine::Runner.new(nil, options, @strings)
   end
 
   def prepare_mock_read_file_formatter(formatter_class)
@@ -41,7 +44,7 @@ class TestConsumeStringFile < CommandTestCase
   end
 
   def test_deducts_language_from_input_path
-    random_language = @known_languages.sample
+    random_language = KNOWN_LANGUAGES.sample
     formatter = prepare_mock_formatter Twine::Formatters::Android
     formatter.expects(:read_file).with(anything, random_language)
 

test/test_create_folders.rb

@@ -1,26 +0,0 @@
-require 'twine_test_case'
-
-class TestCreateFolders < TwineTestCase
-  def test_generate_all_fails_if_output_folder_does_not_exist
-    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
-    # 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
-    Dir.mkdir File.join @output_dir, 'en.lproj'
-    execute "generate-all-string-files #{f 'twine_key1_en_es.txt'} #{@output_dir} -f apple"
-    assert !File.exists?(File.join(@output_dir, 'es.lproj')), "language folder should not be created"
-  end
-
-  def test_generate_all_creates_folders
-    execute "generate-all-string-files #{f 'twine_key1_en_es.txt'} #{@output_dir} -f apple --create-folders"
-    assert File.exists?(File.join(@output_dir, 'en.lproj')), "language folder 'en.lproj' should be created"
-    assert File.exists?(File.join(@output_dir, 'es.lproj')), "language folder 'es.lproj' should be created"
-  end
-end

test/test_generate_all_string_files.rb

@@ -0,0 +1,44 @@
+require 'command_test_case'
+
+class TestGenerateAllStringFiles < CommandTestCase
+  class TestCreateFolders < CommandTestCase
+    def new_runner(create_folders)
+      options = {}
+      options[:output_path] = @output_dir
+      options[:format] = 'apple'
+      options[:create_folders] = create_folders
+
+      @twine_file = build_twine_file 'en', 'es' do
+        add_section 'Section' do
+          add_row key: 'value'
+        end
+      end
+
+      Twine::Runner.new(nil, options, @twine_file)
+    end
+
+    def test_fails_if_output_folder_does_not_exist
+      assert_raises Twine::Error do
+        new_runner(false).generate_all_string_files
+      end
+    end
+
+    def test_creates_output_folder
+      FileUtils.remove_entry_secure @output_dir
+      new_runner(true).generate_all_string_files
+      assert File.exists? @output_dir
+    end
+
+    def test_does_not_create_language_folders_by_default
+      Dir.mkdir File.join @output_dir, 'en.lproj'
+      new_runner(false).generate_all_string_files
+      refute File.exists?(File.join(@output_dir, 'es.lproj')), "language folder should not be created"
+    end
+
+    def test_creates_language_folders
+      new_runner(true).generate_all_string_files
+      assert File.exists?(File.join(@output_dir, 'en.lproj')), "language folder 'en.lproj' should be created"
+      assert File.exists?(File.join(@output_dir, 'es.lproj')), "language folder 'es.lproj' should be created"
+    end
+  end
+end

test/test_generate_string_file.rb

@@ -6,7 +6,10 @@ class TestGenerateStringFile < CommandTestCase
     options[:output_path] = File.join(@output_dir, file) if file
     options[:languages] = language if language
 
-    Twine::Runner.new(nil, options)
+    @strings = Twine::StringsFile.new
+    @strings.language_codes.concat KNOWN_LANGUAGES
+
+    Twine::Runner.new(nil, options, @strings)
   end
 
   def prepare_mock_write_file_formatter(formatter_class)
@@ -39,7 +42,7 @@ class TestGenerateStringFile < CommandTestCase
   end
 
   def test_deducts_language_from_output_path
-    random_language = @known_languages.sample
+    random_language = KNOWN_LANGUAGES.sample
     formatter = prepare_mock_formatter Twine::Formatters::Android
     formatter.expects(:write_file).with(anything, random_language)
 

test/twine_test_case.rb

@@ -15,7 +15,7 @@ class TwineTestCase < Minitest::Test
   end
 
   def teardown
-    FileUtils.remove_entry_secure @output_dir
+    FileUtils.remove_entry_secure @output_dir if File.exists? @output_dir
     super
   end