Did away with ZipStreamableFile.
This commit is contained in:
parent
0f4d6a149a
commit
91642caed6
|
|
@ -1500,16 +1500,6 @@ module Zip
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class ZipStreamableFile < ZipEntry
|
|
||||||
def initialize(zipfile, entry, srcPath = nil, permissionInt = nil)
|
|
||||||
super(zipfile, entry)
|
|
||||||
|
|
||||||
@ftype = :file
|
|
||||||
entry.get_extra_attributes_from_path(srcPath) if (srcPath)
|
|
||||||
@unix_perms = permissionInt if (permissionInt)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class ZipStreamableDirectory < ZipEntry
|
class ZipStreamableDirectory < ZipEntry
|
||||||
def initialize(zipfile, entry, srcPath = nil, permissionInt = nil)
|
def initialize(zipfile, entry, srcPath = nil, permissionInt = nil)
|
||||||
super(zipfile, entry)
|
super(zipfile, entry)
|
||||||
|
|
|
||||||
|
|
@ -94,8 +94,6 @@ class ZipEntryTest < Test::Unit::TestCase
|
||||||
|
|
||||||
assert(entry7 != "hello")
|
assert(entry7 != "hello")
|
||||||
assert(entry7 != 12)
|
assert(entry7 != 12)
|
||||||
|
|
||||||
assert(entry7 != ZipStreamableFile.new(entry7, "aPath"))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_compare
|
def test_compare
|
||||||
|
|
@ -1502,25 +1500,6 @@ class ZipFileExtractDirectoryTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class ZipStreamableFileTest < Test::Unit::TestCase
|
|
||||||
def test_equality
|
|
||||||
zipEntry1 = ZipEntry.new("zf.zip", "entryname1", "comment")
|
|
||||||
zipEntry2 = ZipEntry.new("zf.zip", "entryname2", "comment")
|
|
||||||
|
|
||||||
zipStreamableFile1 = ZipStreamableFile.new(zipEntry1, "path")
|
|
||||||
zipStreamableFile2 = ZipStreamableFile.new(zipEntry1, "path")
|
|
||||||
zipStreamableFile3 = ZipStreamableFile.new(zipEntry1, "anotherPath")
|
|
||||||
zipStreamableFile4 = ZipStreamableFile.new(zipEntry2, "path")
|
|
||||||
|
|
||||||
assert_equal(zipStreamableFile1, zipStreamableFile1)
|
|
||||||
assert_equal(zipStreamableFile1, zipStreamableFile2)
|
|
||||||
assert(zipStreamableFile1 != zipStreamableFile3)
|
|
||||||
assert(zipStreamableFile1 != zipStreamableFile4)
|
|
||||||
assert(zipStreamableFile1 != zipEntry1)
|
|
||||||
assert(zipStreamableFile1 != "hej")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class ZipExtraFieldTest < Test::Unit::TestCase
|
class ZipExtraFieldTest < Test::Unit::TestCase
|
||||||
def test_new
|
def test_new
|
||||||
extra_pure = ZipExtraField.new("")
|
extra_pure = ZipExtraField.new("")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue