Vít Ondruch
9 years ago
parent
f694393fab
commit
4a2f930f70
@ -1,34 +0,0 @@
|
||||
From c0bd31bca02b7e0cd984683c2826fadd2fb55d29 Mon Sep 17 00:00:00 2001
|
||||
From: Josef Stribny <jstribny@redhat.com>
|
||||
Date: Thu, 2 Apr 2015 15:41:46 +0200
|
||||
Subject: [PATCH] Do not depend on Rails git repo layout
|
||||
|
||||
---
|
||||
activesupport/test/dependencies_test.rb | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
|
||||
index 96e9bd1..8e59d10 100644
|
||||
--- a/activesupport/test/dependencies_test.rb
|
||||
+++ b/activesupport/test/dependencies_test.rb
|
||||
@@ -162,7 +162,7 @@ class DependenciesTest < ActiveSupport::TestCase
|
||||
def test_ensures_the_expected_constant_is_defined
|
||||
with_autoloading_fixtures do
|
||||
e = assert_raise(LoadError) { Typo }
|
||||
- assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message
|
||||
+ assert_match %r{Unable to autoload constant Typo, expected .*/test/autoloading_fixtures/typo.rb to define it}, e.message
|
||||
end
|
||||
end
|
||||
|
||||
@@ -180,7 +180,7 @@ class DependenciesTest < ActiveSupport::TestCase
|
||||
assert_equal 1, TypO
|
||||
|
||||
e = assert_raise(LoadError) { Typo }
|
||||
- assert_match %r{Unable to autoload constant Typo, expected .*activesupport/test/autoloading_fixtures/typo.rb to define it}, e.message
|
||||
+ assert_match %r{Unable to autoload constant Typo, expected .*/test/autoloading_fixtures/typo.rb to define it}, e.message
|
||||
end
|
||||
end
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- test/abstract_unit.rb.orig 2011-01-10 16:57:45.486962914 -0500
|
||||
+++ test/abstract_unit.rb 2011-01-10 16:57:52.306963241 -0500
|
||||
@@ -2,7 +2,7 @@ ORIG_ARGV = ARGV.dup
|
||||
|
||||
begin
|
||||
old, $VERBOSE = $VERBOSE, nil
|
||||
- require File.expand_path('../../../load_paths', __FILE__)
|
||||
+ require 'rubygems'
|
||||
ensure
|
||||
$VERBOSE = old
|
||||
end
|
||||
@ -0,0 +1,136 @@
|
||||
From 7d7c2d13ba896dd8b58fe91d2fe0c4fc588069ca Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Mon, 4 Jul 2016 13:11:44 +0200
|
||||
Subject: [PATCH 1/2] DRY Downloader.
|
||||
|
||||
---
|
||||
activesupport/test/multibyte_conformance_test.rb | 18 ------------------
|
||||
.../test/multibyte_grapheme_break_conformance_test.rb | 19 ++-----------------
|
||||
.../test/multibyte_normalization_conformance_test.rb | 18 ------------------
|
||||
activesupport/test/multibyte_test_helpers.rb | 18 ++++++++++++++++++
|
||||
4 files changed, 20 insertions(+), 53 deletions(-)
|
||||
|
||||
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
|
||||
index 9fca47a..709c63a 100644
|
||||
--- a/activesupport/test/multibyte_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_conformance_test.rb
|
||||
@@ -6,24 +6,6 @@
|
||||
require 'tmpdir'
|
||||
|
||||
class MultibyteConformanceTest < ActiveSupport::TestCase
|
||||
- class Downloader
|
||||
- def self.download(from, to)
|
||||
- unless File.exist?(to)
|
||||
- unless File.exist?(File.dirname(to))
|
||||
- system "mkdir -p #{File.dirname(to)}"
|
||||
- end
|
||||
- open(from) do |source|
|
||||
- File.open(to, 'w') do |target|
|
||||
- source.each_line do |l|
|
||||
- target.write l
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- true
|
||||
- end
|
||||
- end
|
||||
-
|
||||
include MultibyteTestHelpers
|
||||
|
||||
UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
|
||||
diff --git a/activesupport/test/multibyte_grapheme_break_conformance_test.rb b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
index 6e2f02a..45e1976 100644
|
||||
--- a/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
@@ -1,29 +1,14 @@
|
||||
# encoding: utf-8
|
||||
|
||||
require 'abstract_unit'
|
||||
+require 'multibyte_test_helpers'
|
||||
|
||||
require 'fileutils'
|
||||
require 'open-uri'
|
||||
require 'tmpdir'
|
||||
|
||||
class MultibyteGraphemeBreakConformanceTest < ActiveSupport::TestCase
|
||||
- class Downloader
|
||||
- def self.download(from, to)
|
||||
- unless File.exist?(to)
|
||||
- $stderr.puts "Downloading #{from} to #{to}"
|
||||
- unless File.exist?(File.dirname(to))
|
||||
- system "mkdir -p #{File.dirname(to)}"
|
||||
- end
|
||||
- open(from) do |source|
|
||||
- File.open(to, 'w') do |target|
|
||||
- source.each_line do |l|
|
||||
- target.write l
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
+ include MultibyteTestHelpers
|
||||
|
||||
TEST_DATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd/auxiliary"
|
||||
TEST_DATA_FILE = '/GraphemeBreakTest.txt'
|
||||
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
index 0d31c95..ad2e651 100644
|
||||
--- a/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
@@ -8,24 +8,6 @@
|
||||
require 'tmpdir'
|
||||
|
||||
class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
|
||||
- class Downloader
|
||||
- def self.download(from, to)
|
||||
- unless File.exist?(to)
|
||||
- $stderr.puts "Downloading #{from} to #{to}"
|
||||
- unless File.exist?(File.dirname(to))
|
||||
- system "mkdir -p #{File.dirname(to)}"
|
||||
- end
|
||||
- open(from) do |source|
|
||||
- File.open(to, 'w') do |target|
|
||||
- source.each_line do |l|
|
||||
- target.write l
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
- end
|
||||
-
|
||||
include MultibyteTestHelpers
|
||||
|
||||
UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
|
||||
diff --git a/activesupport/test/multibyte_test_helpers.rb b/activesupport/test/multibyte_test_helpers.rb
|
||||
index 58cf548..709586e 100644
|
||||
--- a/activesupport/test/multibyte_test_helpers.rb
|
||||
+++ b/activesupport/test/multibyte_test_helpers.rb
|
||||
@@ -1,4 +1,22 @@
|
||||
module MultibyteTestHelpers
|
||||
+ class Downloader
|
||||
+ def self.download(from, to)
|
||||
+ unless File.exist?(to)
|
||||
+ unless File.exist?(File.dirname(to))
|
||||
+ system "mkdir -p #{File.dirname(to)}"
|
||||
+ end
|
||||
+ open(from) do |source|
|
||||
+ File.open(to, 'w') do |target|
|
||||
+ source.each_line do |l|
|
||||
+ target.write l
|
||||
+ end
|
||||
+ end
|
||||
+ end
|
||||
+ end
|
||||
+ true
|
||||
+ end
|
||||
+ end
|
||||
+
|
||||
UNICODE_STRING = 'こにちわ'.freeze
|
||||
ASCII_STRING = 'ohayo'.freeze
|
||||
BYTE_STRING = "\270\236\010\210\245".force_encoding("ASCII-8BIT").freeze
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 6119a9524ba07031771ed80b79798cc27263979c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Fri, 1 Jul 2016 15:29:54 +0200
|
||||
Subject: [PATCH] Do not depend on Rails git repository layout in ActiveSupport
|
||||
tests.
|
||||
|
||||
---
|
||||
activesupport/test/testing/file_fixtures_test.rb | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/activesupport/test/testing/file_fixtures_test.rb b/activesupport/test/testing/file_fixtures_test.rb
|
||||
index 91b8a90..3587c1a 100644
|
||||
--- a/activesupport/test/testing/file_fixtures_test.rb
|
||||
+++ b/activesupport/test/testing/file_fixtures_test.rb
|
||||
@@ -6,7 +6,7 @@ class FileFixturesTest < ActiveSupport::TestCase
|
||||
test "#file_fixture returns Pathname to file fixture" do
|
||||
path = file_fixture("sample.txt")
|
||||
assert_kind_of Pathname, path
|
||||
- assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s
|
||||
+ assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s
|
||||
end
|
||||
|
||||
test "raises an exception when the fixture file does not exist" do
|
||||
@@ -23,6 +23,6 @@ class FileFixturesPathnameDirectoryTest < ActiveSupport::TestCase
|
||||
test "#file_fixture_path returns Pathname to file fixture" do
|
||||
path = file_fixture("sample.txt")
|
||||
assert_kind_of Pathname, path
|
||||
- assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s
|
||||
+ assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s
|
||||
end
|
||||
end
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
From c245ca30f248367e07d5d831195b12c93a1e3137 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Mon, 4 Jul 2016 13:36:30 +0200
|
||||
Subject: [PATCH] Skip the test if test data download fails.
|
||||
|
||||
---
|
||||
activesupport/test/multibyte_conformance_test.rb | 2 --
|
||||
.../test/multibyte_grapheme_break_conformance_test.rb | 13 +++++++------
|
||||
.../test/multibyte_normalization_conformance_test.rb | 9 +++++----
|
||||
activesupport/test/multibyte_test_helpers.rb | 4 ++++
|
||||
4 files changed, 16 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
|
||||
index 709c63a..c10133a 100644
|
||||
--- a/activesupport/test/multibyte_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_conformance_test.rb
|
||||
@@ -8,9 +8,7 @@
|
||||
class MultibyteConformanceTest < ActiveSupport::TestCase
|
||||
include MultibyteTestHelpers
|
||||
|
||||
- UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
|
||||
UNIDATA_FILE = '/NormalizationTest.txt'
|
||||
- CACHE_DIR = "#{Dir.tmpdir}/cache/unicode_conformance"
|
||||
FileUtils.mkdir_p(CACHE_DIR)
|
||||
RUN_P = begin
|
||||
Downloader.download(UNIDATA_URL + UNIDATA_FILE, CACHE_DIR + UNIDATA_FILE)
|
||||
diff --git a/activesupport/test/multibyte_grapheme_break_conformance_test.rb b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
index 45e1976..61943b1 100644
|
||||
--- a/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
|
||||
@@ -10,13 +10,14 @@
|
||||
class MultibyteGraphemeBreakConformanceTest < ActiveSupport::TestCase
|
||||
include MultibyteTestHelpers
|
||||
|
||||
- TEST_DATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd/auxiliary"
|
||||
- TEST_DATA_FILE = '/GraphemeBreakTest.txt'
|
||||
- CACHE_DIR = "#{Dir.tmpdir}/cache/unicode_conformance"
|
||||
+ UNIDATA_FILE = '/auxiliary/GraphemeBreakTest.txt'
|
||||
+ RUN_P = begin
|
||||
+ Downloader.download(UNIDATA_URL + UNIDATA_FILE, CACHE_DIR + UNIDATA_FILE)
|
||||
+ rescue
|
||||
+ end
|
||||
|
||||
def setup
|
||||
- FileUtils.mkdir_p(CACHE_DIR)
|
||||
- Downloader.download(TEST_DATA_URL + TEST_DATA_FILE, CACHE_DIR + TEST_DATA_FILE)
|
||||
+ skip "Unable to download test data" unless RUN_P
|
||||
end
|
||||
|
||||
def test_breaks
|
||||
@@ -31,7 +32,7 @@ def test_breaks
|
||||
def each_line_of_break_tests(&block)
|
||||
lines = 0
|
||||
max_test_lines = 0 # Don't limit below 21, because that's the header of the testfile
|
||||
- File.open(File.join(CACHE_DIR, TEST_DATA_FILE), 'r') do | f |
|
||||
+ File.open(File.join(CACHE_DIR, UNIDATA_FILE), 'r') do | f |
|
||||
until f.eof? || (max_test_lines > 21 and lines > max_test_lines)
|
||||
lines += 1
|
||||
line = f.gets.chomp!
|
||||
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
index ad2e651..77ed0ce 100644
|
||||
--- a/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
+++ b/activesupport/test/multibyte_normalization_conformance_test.rb
|
||||
@@ -10,14 +10,15 @@
|
||||
class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
|
||||
include MultibyteTestHelpers
|
||||
|
||||
- UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
|
||||
UNIDATA_FILE = '/NormalizationTest.txt'
|
||||
- CACHE_DIR = "#{Dir.tmpdir}/cache/unicode_conformance"
|
||||
+ RUN_P = begin
|
||||
+ Downloader.download(UNIDATA_URL + UNIDATA_FILE, CACHE_DIR + UNIDATA_FILE)
|
||||
+ rescue
|
||||
+ end
|
||||
|
||||
def setup
|
||||
- FileUtils.mkdir_p(CACHE_DIR)
|
||||
- Downloader.download(UNIDATA_URL + UNIDATA_FILE, CACHE_DIR + UNIDATA_FILE)
|
||||
@proxy = ActiveSupport::Multibyte::Chars
|
||||
+ skip "Unable to download test data" unless RUN_P
|
||||
end
|
||||
|
||||
def test_normalizations_C
|
||||
diff --git a/activesupport/test/multibyte_test_helpers.rb b/activesupport/test/multibyte_test_helpers.rb
|
||||
index 709586e..0ada8bc 100644
|
||||
--- a/activesupport/test/multibyte_test_helpers.rb
|
||||
+++ b/activesupport/test/multibyte_test_helpers.rb
|
||||
@@ -17,6 +17,10 @@ def self.download(from, to)
|
||||
end
|
||||
end
|
||||
|
||||
+ UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::Unicode::UNICODE_VERSION}/ucd"
|
||||
+ CACHE_DIR = "#{Dir.tmpdir}/cache/unicode_conformance"
|
||||
+ FileUtils.mkdir_p(CACHE_DIR)
|
||||
+
|
||||
UNICODE_STRING = 'こにちわ'.freeze
|
||||
ASCII_STRING = 'ohayo'.freeze
|
||||
BYTE_STRING = "\270\236\010\210\245".force_encoding("ASCII-8BIT").freeze
|
||||
--
|
||||
2.9.0
|
||||
|
||||
Loading…
Reference in new issue