mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.8.0

Browse Source 
Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
Jo Shields
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mcs/class/System.IO.Compression/Test/System.IO.Compression/ZipTest.cs
View File

@@ -58,6 +58,8 @@ namespace MonoTests.System.IO.Compression
var nullEntry = archive.GetEntry("nonexisting");
Assert.IsNull(nullEntry);
}
File.Delete ("test.zip");
}
[Test]
@@ -75,6 +77,8 @@ namespace MonoTests.System.IO.Compression
Assert.Fail();
}
File.Delete ("test.zip");
}
[Test]
@@ -90,6 +94,8 @@ namespace MonoTests.System.IO.Compression
var nullEntry = archive.GetEntry("nonexisting");
Assert.IsNull(nullEntry);
}
File.Delete ("test.zip");
}
[Test]
@@ -104,6 +110,8 @@ namespace MonoTests.System.IO.Compression
var foo = entry.Open();
}
File.Delete ("test.zip");
}
[Test]
@@ -125,6 +133,8 @@ namespace MonoTests.System.IO.Compression
var entry = archive.GetEntry("foo.txt");
Assert.IsNull(entry);
}
File.Delete ("delete.zip");
}
[Test]
@@ -146,6 +156,8 @@ namespace MonoTests.System.IO.Compression
var entry = archive.GetEntry("foo.txt");
Assert.IsNull(entry);
}
File.Delete ("delete.zip");
}
[Test]
@@ -157,6 +169,8 @@ namespace MonoTests.System.IO.Compression
var entry = archive.CreateEntry("foo.txt");
using (var stream = entry.Open())
{
using (var streamWriter = new StreamWriter(stream))
streamWriter.Write("foo");
}
}
@@ -165,7 +179,14 @@ namespace MonoTests.System.IO.Compression
{
var entry = archive.GetEntry("foo.txt");
Assert.IsNotNull(entry);
var streamReader = new StreamReader(entry.Open());
var text = streamReader.ReadToEnd();
Assert.AreEqual("foo", text);
}
File.Delete ("create.zip");
}
[Test]
@@ -184,6 +205,8 @@ namespace MonoTests.System.IO.Compression
Assert.AreEqual("foobar/bar.txt", entries[3].FullName);
Assert.AreEqual("foobar/foo.txt", entries[4].FullName);
}
File.Delete ("test.zip");
}
[Test]
@@ -202,6 +225,8 @@ namespace MonoTests.System.IO.Compression
Assert.AreEqual("foobar/bar.txt", entries[3].FullName);
Assert.AreEqual("foobar/foo.txt", entries[4].FullName);
}
File.Delete ("test.zip");
}
[Test]
@@ -219,6 +244,8 @@ namespace MonoTests.System.IO.Compression
Assert.Fail();
}
File.Delete ("test.zip");
}
}
}

10
mcs/class/System.IO.Compression/ZipArchiveEntry.cs
View File

@@ -112,15 +112,9 @@ namespace System.IO.Compression
if (Archive.Mode == ZipArchiveMode.Create && openStream != null)
throw new IOException("The archive for this entry was opened with the Create mode, and this entry has already been written to.");
var memoryStream = new MemoryStream();
openStream = memoryStream;
openStream = entry.OpenEntryStream();
if (Archive.Mode == ZipArchiveMode.Read || Archive.Mode == ZipArchiveMode.Update)
entry.WriteTo(memoryStream);
memoryStream.Seek(0, SeekOrigin.Begin);
return memoryStream;
return openStream;
}
}
}