ranguba/epub-searcher at c6d1306 [master] test: extract common codes as methods (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2014-09-25 23:23:01 +0900 (Thu, 25 Sep 2014)

  New Revision: c6d1306c9c8bd32655110d24bff11075df76e6b2
  https://github.com/ranguba/epub-searcher/commit/c6d1306c9c8bd32655110d24bff11075df76e6b2

  Message:
    test: extract common codes as methods

  Modified files:
    test/epub-searcher/database_test.rb
    test/epub-searcher/epub_document_test.rb
    test/epub-searcher/remote_database_test.rb
    test/run-test.rb
    test/test.rake
    test/test_config.rb

  Modified: test/epub-searcher/database_test.rb (+3 -3)
===================================================================

--- test/epub-searcher/database_test.rb    2014-09-25 23:06:18 +0900 (fe5b43b)
+++ test/epub-searcher/database_test.rb    2014-09-25 23:23:01 +0900 (32a05fd)
@@ -59,10 +59,10 @@ class TestDatabase < Test::Unit::TestCase
       dumped_text = `#{dump_command}`.gsub(%r|/.+?/test/epub-searcher/fixtures/|) do
         "${PREFIX}/test/epub-searcher/fixtures/"
       end
-      dumped_text.gsub!(/(?:\\r\\n)+/, "\\r\\n")
 
-      expected = File.read(fixture_path('loaded_records_dump_expected.txt')).gsub!(/(?:\\r\\n)+/, "\\r\\n")
-      assert_equal(expected, dumped_text)
+      expected = File.read(fixture_path('loaded_records_dump_expected.txt'))
+      assert_equal(normalize_newline_literal(expected),
+                   normalize_newline_literal(dumped_text))
     end
   end
 

  Modified: test/epub-searcher/epub_document_test.rb (+4 -3)
===================================================================
--- test/epub-searcher/epub_document_test.rb    2014-09-25 23:06:18 +0900 (ba32934)
+++ test/epub-searcher/epub_document_test.rb    2014-09-25 23:23:01 +0900 (7d8d340)
@@ -27,9 +27,10 @@ class TestEPUBDocument < Test::Unit::TestCase
   end
 
   def assert_equal_main_text(expected_file, document)
-    expected_text = File.read(fixture_path(expected_file)).gsub(/(?:\r\n)+/, "\r\n")
-    main_text = document.extract_main_text.gsub(/(?:\r\n)+/, "\r\n")
-    assert_equal(expected_text, main_text)
+    expected_text = File.read(fixture_path(expected_file))
+    main_text = document.extract_main_text
+    assert_equal(normalize_newline(expected_text),
+                 normalize_newline(main_text))
   end
 
   def assert_equal_xhtml_spine(expected, document)

  Modified: test/epub-searcher/remote_database_test.rb (+2 -2)
===================================================================
--- test/epub-searcher/remote_database_test.rb    2014-09-25 23:06:18 +0900 (b5bea38)
+++ test/epub-searcher/remote_database_test.rb    2014-09-25 23:23:01 +0900 (723c531)
@@ -62,13 +62,13 @@ class TestRemoteDatabase < Test::Unit::TestCase
       expected_values = File.read(fixture_path('load_records_params_values_expected.txt'))
       expected = {
         :table => :Books,
-        :values => expected_values.gsub(/(?:(\\r\\n)+)/, "\\r\\n"),
+        :values => normalize_newline_literal(expected_values),
       }
       @database.client.expects(:load).with do |actual_params|
         actual_params[:values].gsub!(%r|"file_path":"/.+?/test/epub-searcher/fixtures/|) do
           "\"file_path\":\"${PREFIX}/test/epub-searcher/fixtures/"
         end
-        actual_params[:values].gsub!(/(?:\\r\\n)+/, "\\r\\n")
+        actual_params[:values] = normalize_newline_literal(actual_params[:values])
         expected == actual_params
       end
 

  Modified: test/run-test.rb (+2 -0)
  Mode: 100644 -> 100755
===================================================================
--- test/run-test.rb    2014-09-25 23:06:18 +0900 (36bf247)
+++ test/run-test.rb    2014-09-25 23:23:01 +0900 (62684e4)
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'test-unit'
 require 'mocha/setup'
 

  Modified: test/test.rake (+3 -12)
===================================================================
--- test/test.rake    2014-09-25 23:06:18 +0900 (9b4fbfd)
+++ test/test.rake    2014-09-25 23:23:01 +0900 (a7b0d5d)
@@ -1,15 +1,6 @@
-require 'rake/testtask'
-
-test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
-
-test_tasks.each do |folder|
-  Rake::TestTask.new("test:#{folder}") do |test|
-    test.pattern = "test/#{folder}/**/*_test.rb"
-    test.verbose = true
-  end
-end
-
 desc "Run application test suite"
-task 'test' => test_tasks.map { |f| "test:#{f}" }
+task 'test' do
+  ruby("test/run-test.rb")
+end
 
 task :default => :test

  Modified: test/test_config.rb (+8 -0)
===================================================================
--- test/test_config.rb    2014-09-25 23:06:18 +0900 (bc3a082)
+++ test/test_config.rb    2014-09-25 23:23:01 +0900 (3a0a926)
@@ -19,4 +19,12 @@ class Test::Unit::TestCase
     @app ||= block_given? ? app.instance_eval(&blk) : app
     @app ||= Padrino.application
   end
+
+  def normalize_newline(text)
+    text.gsub(/(?:\r\n)+/, "\r\n")
+  end
+
+  def normalize_newline_literal(text)
+    text.gsub(/(?:\\r\\n)+/, "\\r\\n")
+  end
 end
-------------- next part --------------
HTML����������������������������...
다운로드 


Groonga - fulltext search engine.

[Groonga-commit] ranguba/epub-searcher at c6d1306 [master] test: extract common codes as methods