fix tests for deprecating SHA1

Closes Homebrew/homebrew#50272.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2016-03-20 14:12:15 +08:00
parent bd7e8543b3
commit 28b4923dad
6 changed files with 17 additions and 35 deletions

View File

@ -3,16 +3,16 @@ require "checksum"
class ChecksumTests < Homebrew::TestCase class ChecksumTests < Homebrew::TestCase
def test_empty? def test_empty?
assert_empty Checksum.new(:sha1, "") assert_empty Checksum.new(:sha256, "")
end end
def test_equality def test_equality
a = Checksum.new(:sha1, TEST_SHA1) a = Checksum.new(:sha256, TEST_SHA256)
b = Checksum.new(:sha1, TEST_SHA1) b = Checksum.new(:sha256, TEST_SHA256)
assert_equal a, b assert_equal a, b
a = Checksum.new(:sha1, TEST_SHA1) a = Checksum.new(:sha256, TEST_SHA256)
b = Checksum.new(:sha1, TEST_SHA1.reverse) b = Checksum.new(:sha256, TEST_SHA256.reverse)
refute_equal a, b refute_equal a, b
a = Checksum.new(:sha1, TEST_SHA1) a = Checksum.new(:sha1, TEST_SHA1)

View File

@ -21,22 +21,6 @@ class ChecksumVerificationTests < Homebrew::TestCase
@_f.clear_cache @_f.clear_cache
end 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 def test_good_sha256
formula do formula do
sha256 TESTBALL_SHA256 sha256 TESTBALL_SHA256

View File

@ -159,7 +159,7 @@ class FormulaTests < Homebrew::TestCase
homepage "http://example.com" homepage "http://example.com"
url "http://example.com/test-0.1.tbz" url "http://example.com/test-0.1.tbz"
mirror "http://example.org/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" head "http://example.com/test.git", :tag => "foo"

View File

@ -38,7 +38,7 @@ class FormulaSpecSelectionTests < Homebrew::TestCase
def test_incomplete_spec_not_selected def test_incomplete_spec_not_selected
f = formula { f = formula {
sha1 TEST_SHA1 sha256 TEST_SHA256
version "1.0" version "1.0"
head "foo" head "foo"
} }
@ -48,7 +48,7 @@ class FormulaSpecSelectionTests < Homebrew::TestCase
def test_incomplete_stable_not_set def test_incomplete_stable_not_set
f = formula { f = formula {
sha1 TEST_SHA1 sha256 TEST_SHA256
devel { url "foo-1.1a" } devel { url "foo-1.1a" }
head "foo" head "foo"
} }

View File

@ -94,8 +94,6 @@ class ResourceTests < Homebrew::TestCase
def test_checksum_setters def test_checksum_setters
assert_nil @resource.checksum assert_nil @resource.checksum
@resource.sha1(TEST_SHA1)
assert_equal Checksum.new(:sha1, TEST_SHA1), @resource.checksum
@resource.sha256(TEST_SHA256) @resource.sha256(TEST_SHA256)
assert_equal Checksum.new(:sha256, TEST_SHA256), @resource.checksum assert_equal Checksum.new(:sha256, TEST_SHA256), @resource.checksum
end end
@ -120,7 +118,7 @@ class ResourceTests < Homebrew::TestCase
def test_verify_download_integrity_mismatch def test_verify_download_integrity_mismatch
fn = stub(:file? => true) fn = stub(:file? => true)
checksum = @resource.sha1(TEST_SHA1) checksum = @resource.sha256(TEST_SHA256)
fn.expects(:verify_checksum).with(checksum). fn.expects(:verify_checksum).with(checksum).
raises(ChecksumMismatchError.new(fn, checksum, Object.new)) raises(ChecksumMismatchError.new(fn, checksum, Object.new))

View File

@ -155,19 +155,19 @@ class BottleSpecificationTests < Homebrew::TestCase
def test_checksum_setters def test_checksum_setters
checksums = { checksums = {
:snow_leopard_32 => "deadbeef"*5, :snow_leopard_32 => "deadbeef"*8,
:snow_leopard => "faceb00c"*5, :snow_leopard => "faceb00c"*8,
:lion => "baadf00d"*5, :lion => "baadf00d"*8,
:mountain_lion => "8badf00d"*5 :mountain_lion => "8badf00d"*8
} }
checksums.each_pair do |cat, sha1| checksums.each_pair do |cat, digest|
@spec.sha1(sha1 => cat) @spec.sha256(digest => cat)
end end
checksums.each_pair do |cat, sha1| checksums.each_pair do |cat, digest|
checksum, = @spec.checksum_for(cat) checksum, = @spec.checksum_for(cat)
assert_equal Checksum.new(:sha1, sha1), checksum assert_equal Checksum.new(:sha256, digest), checksum
end end
end end