diff options
| author | Xu Cheng | 2016-03-20 14:12:15 +0800 |
|---|---|---|
| committer | Xu Cheng | 2016-03-20 14:55:58 +0800 |
| commit | 28b4923dad7a421f6f6d2598a5661a147268a4c7 (patch) | |
| tree | bafb2a93ab9d2e6ed59e87efd01b9abc492ed399 /Library | |
| parent | bd7e8543b3fba04a914f8f8c583652d6970d51db (diff) | |
| download | brew-28b4923dad7a421f6f6d2598a5661a147268a4c7.tar.bz2 | |
fix tests for deprecating SHA1
Closes Homebrew/homebrew#50272.
Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/test/test_checksum.rb | 10 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_checksum_verification.rb | 16 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_formula.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_formula_spec_selection.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_resource.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_software_spec.rb | 16 |
6 files changed, 17 insertions, 35 deletions
diff --git a/Library/Homebrew/test/test_checksum.rb b/Library/Homebrew/test/test_checksum.rb index 72ddb81a3..4073e7ebf 100644 --- a/Library/Homebrew/test/test_checksum.rb +++ b/Library/Homebrew/test/test_checksum.rb @@ -3,16 +3,16 @@ require "checksum" class ChecksumTests < Homebrew::TestCase def test_empty? - assert_empty Checksum.new(:sha1, "") + assert_empty Checksum.new(:sha256, "") end def test_equality - a = Checksum.new(:sha1, TEST_SHA1) - b = Checksum.new(:sha1, TEST_SHA1) + a = Checksum.new(:sha256, TEST_SHA256) + b = Checksum.new(:sha256, TEST_SHA256) assert_equal a, b - a = Checksum.new(:sha1, TEST_SHA1) - b = Checksum.new(:sha1, TEST_SHA1.reverse) + a = Checksum.new(:sha256, TEST_SHA256) + b = Checksum.new(:sha256, TEST_SHA256.reverse) refute_equal a, b a = Checksum.new(:sha1, TEST_SHA1) diff --git a/Library/Homebrew/test/test_checksum_verification.rb b/Library/Homebrew/test/test_checksum_verification.rb index 87d0fb536..e25d08b83 100644 --- a/Library/Homebrew/test/test_checksum_verification.rb +++ b/Library/Homebrew/test/test_checksum_verification.rb @@ -21,22 +21,6 @@ class ChecksumVerificationTests < Homebrew::TestCase @_f.clear_cache end - def test_good_sha1 - formula do - sha1 TESTBALL_SHA1 - end - - assert_checksum_good - end - - def test_bad_sha1 - formula do - sha1 "7ea8a98acb8f918df723c2ae73fe67d5664bfd7e" - end - - assert_checksum_bad - end - def test_good_sha256 formula do sha256 TESTBALL_SHA256 diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb index 312b8245d..07571e78f 100644 --- a/Library/Homebrew/test/test_formula.rb +++ b/Library/Homebrew/test/test_formula.rb @@ -159,7 +159,7 @@ class FormulaTests < Homebrew::TestCase homepage "http://example.com" url "http://example.com/test-0.1.tbz" mirror "http://example.org/test-0.1.tbz" - sha1 TEST_SHA1 + sha256 TEST_SHA256 head "http://example.com/test.git", :tag => "foo" diff --git a/Library/Homebrew/test/test_formula_spec_selection.rb b/Library/Homebrew/test/test_formula_spec_selection.rb index 4cfcd504c..85bd9bef1 100644 --- a/Library/Homebrew/test/test_formula_spec_selection.rb +++ b/Library/Homebrew/test/test_formula_spec_selection.rb @@ -38,7 +38,7 @@ class FormulaSpecSelectionTests < Homebrew::TestCase def test_incomplete_spec_not_selected f = formula { - sha1 TEST_SHA1 + sha256 TEST_SHA256 version "1.0" head "foo" } @@ -48,7 +48,7 @@ class FormulaSpecSelectionTests < Homebrew::TestCase def test_incomplete_stable_not_set f = formula { - sha1 TEST_SHA1 + sha256 TEST_SHA256 devel { url "foo-1.1a" } head "foo" } diff --git a/Library/Homebrew/test/test_resource.rb b/Library/Homebrew/test/test_resource.rb index 55845eac3..9f0b1ca98 100644 --- a/Library/Homebrew/test/test_resource.rb +++ b/Library/Homebrew/test/test_resource.rb @@ -94,8 +94,6 @@ class ResourceTests < Homebrew::TestCase def test_checksum_setters assert_nil @resource.checksum - @resource.sha1(TEST_SHA1) - assert_equal Checksum.new(:sha1, TEST_SHA1), @resource.checksum @resource.sha256(TEST_SHA256) assert_equal Checksum.new(:sha256, TEST_SHA256), @resource.checksum end @@ -120,7 +118,7 @@ class ResourceTests < Homebrew::TestCase def test_verify_download_integrity_mismatch fn = stub(:file? => true) - checksum = @resource.sha1(TEST_SHA1) + checksum = @resource.sha256(TEST_SHA256) fn.expects(:verify_checksum).with(checksum). raises(ChecksumMismatchError.new(fn, checksum, Object.new)) diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb index 71eb3762f..e7533aa0f 100644 --- a/Library/Homebrew/test/test_software_spec.rb +++ b/Library/Homebrew/test/test_software_spec.rb @@ -155,19 +155,19 @@ class BottleSpecificationTests < Homebrew::TestCase def test_checksum_setters checksums = { - :snow_leopard_32 => "deadbeef"*5, - :snow_leopard => "faceb00c"*5, - :lion => "baadf00d"*5, - :mountain_lion => "8badf00d"*5 + :snow_leopard_32 => "deadbeef"*8, + :snow_leopard => "faceb00c"*8, + :lion => "baadf00d"*8, + :mountain_lion => "8badf00d"*8 } - checksums.each_pair do |cat, sha1| - @spec.sha1(sha1 => cat) + checksums.each_pair do |cat, digest| + @spec.sha256(digest => cat) end - checksums.each_pair do |cat, sha1| + checksums.each_pair do |cat, digest| checksum, = @spec.checksum_for(cat) - assert_equal Checksum.new(:sha1, sha1), checksum + assert_equal Checksum.new(:sha256, digest), checksum end end |
