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

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
external/corefx/src/System.IO.Compression/tests/DeflateStreamTests.cs vendored
View File

@@ -131,12 +131,12 @@ namespace System.IO.Compression.Tests
{
var ms = new MemoryStream();
ms.Dispose();
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var deflate = new DeflateStream(ms, CompressionMode.Decompress);
});
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var deflate = new DeflateStream(ms, CompressionMode.Compress);
});
@@ -148,7 +148,7 @@ namespace System.IO.Compression.Tests
var ms = new LocalMemoryStream();
ms.SetCanWrite(false);
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var gzip = new DeflateStream(ms, CompressionMode.Compress);
});
@@ -160,7 +160,7 @@ namespace System.IO.Compression.Tests
var ms = new LocalMemoryStream();
ms.SetCanRead(false);
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var gzip = new DeflateStream(ms, CompressionMode.Decompress);
});
@@ -262,10 +262,10 @@ namespace System.IO.Compression.Tests
Assert.Throws<ArgumentNullException>(() => new DeflateStream(null, CompressionMode.Decompress, false));
Assert.Throws<ArgumentNullException>(() => new DeflateStream(null, CompressionMode.Compress, true));
Assert.Throws<ArgumentException>(() => new DeflateStream(new MemoryStream(), (CompressionMode)42));
Assert.Throws<ArgumentException>(() => new DeflateStream(new MemoryStream(), (CompressionMode)43, true));
AssertExtensions.Throws<ArgumentException>("mode", () => new DeflateStream(new MemoryStream(), (CompressionMode)42));
AssertExtensions.Throws<ArgumentException>("mode", () => new DeflateStream(new MemoryStream(), (CompressionMode)43, true));
Assert.Throws<ArgumentException>(() => new DeflateStream(new MemoryStream(new byte[1], writable: false), CompressionLevel.Optimal));
AssertExtensions.Throws<ArgumentException>("stream", () => new DeflateStream(new MemoryStream(new byte[1], writable: false), CompressionLevel.Optimal));
}
[Fact]
@@ -364,8 +364,8 @@ namespace System.IO.Compression.Tests
Assert.Throws<ArgumentNullException>(() => ds.Write(null, 0, 0));
Assert.Throws<ArgumentOutOfRangeException>(() => ds.Write(new byte[1], -1, 0));
Assert.Throws<ArgumentOutOfRangeException>(() => ds.Write(new byte[1], 0, -1));
Assert.Throws<ArgumentException>(() => ds.Write(new byte[1], 0, 2));
Assert.Throws<ArgumentException>(() => ds.Write(new byte[1], 1, 1));
AssertExtensions.Throws<ArgumentException>(null, () => ds.Write(new byte[1], 0, 2));
AssertExtensions.Throws<ArgumentException>(null, () => ds.Write(new byte[1], 1, 1));
Assert.Throws<InvalidOperationException>(() => ds.Read(new byte[1], 0, 1));
ds.Write(new byte[1], 0, 0);
}
@@ -374,8 +374,8 @@ namespace System.IO.Compression.Tests
Assert.Throws<ArgumentNullException>(() => { ds.WriteAsync(null, 0, 0); });
Assert.Throws<ArgumentOutOfRangeException>(() => { ds.WriteAsync(new byte[1], -1, 0); });
Assert.Throws<ArgumentOutOfRangeException>(() => { ds.WriteAsync(new byte[1], 0, -1); });
Assert.Throws<ArgumentException>(() => { ds.WriteAsync(new byte[1], 0, 2); });
Assert.Throws<ArgumentException>(() => { ds.WriteAsync(new byte[1], 1, 1); });
AssertExtensions.Throws<ArgumentException>(null, () => { ds.WriteAsync(new byte[1], 0, 2); });
AssertExtensions.Throws<ArgumentException>(null, () => { ds.WriteAsync(new byte[1], 1, 1); });
Assert.Throws<InvalidOperationException>(() => { ds.Read(new byte[1], 0, 1); });
}
@@ -384,8 +384,8 @@ namespace System.IO.Compression.Tests
Assert.Throws<ArgumentNullException>(() => ds.Read(null, 0, 0));
Assert.Throws<ArgumentOutOfRangeException>(() => ds.Read(new byte[1], -1, 0));
Assert.Throws<ArgumentOutOfRangeException>(() => ds.Read(new byte[1], 0, -1));
Assert.Throws<ArgumentException>(() => ds.Read(new byte[1], 0, 2));
Assert.Throws<ArgumentException>(() => ds.Read(new byte[1], 1, 1));
AssertExtensions.Throws<ArgumentException>(null, () => ds.Read(new byte[1], 0, 2));
AssertExtensions.Throws<ArgumentException>(null, () => ds.Read(new byte[1], 1, 1));
Assert.Throws<InvalidOperationException>(() => ds.Write(new byte[1], 0, 1));
var data = new byte[1] { 42 };
@@ -397,8 +397,8 @@ namespace System.IO.Compression.Tests
Assert.Throws<ArgumentNullException>(() => { ds.ReadAsync(null, 0, 0); });
Assert.Throws<ArgumentOutOfRangeException>(() => { ds.ReadAsync(new byte[1], -1, 0); });
Assert.Throws<ArgumentOutOfRangeException>(() => { ds.ReadAsync(new byte[1], 0, -1); });
Assert.Throws<ArgumentException>(() => { ds.ReadAsync(new byte[1], 0, 2); });
Assert.Throws<ArgumentException>(() => { ds.ReadAsync(new byte[1], 1, 1); });
AssertExtensions.Throws<ArgumentException>(null, () => { ds.ReadAsync(new byte[1], 0, 2); });
AssertExtensions.Throws<ArgumentException>(null, () => { ds.ReadAsync(new byte[1], 1, 1); });
Assert.Throws<InvalidOperationException>(() => { ds.Write(new byte[1], 0, 1); });
}
}

8
external/corefx/src/System.IO.Compression/tests/GZipStreamTests.cs vendored
View File

@@ -177,12 +177,12 @@ namespace System.IO.Compression.Tests
{
var ms = new MemoryStream();
ms.Dispose();
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var deflate = new GZipStream(ms, CompressionMode.Decompress);
});
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var deflate = new GZipStream(ms, CompressionMode.Compress);
});
@@ -194,7 +194,7 @@ namespace System.IO.Compression.Tests
var ms = new LocalMemoryStream();
ms.SetCanWrite(false);
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var gzip = new GZipStream(ms, CompressionMode.Compress);
});
@@ -206,7 +206,7 @@ namespace System.IO.Compression.Tests
var ms = new LocalMemoryStream();
ms.SetCanRead(false);
Assert.Throws<ArgumentException>(() =>
AssertExtensions.Throws<ArgumentException>("stream", () =>
{
var gzip = new GZipStream(ms, CompressionMode.Decompress);
});

8
external/corefx/src/System.IO.Compression/tests/Performance/Perf.DeflateStream.cs vendored
View File

@@ -97,7 +97,9 @@ namespace System.IO.Compression.Tests
NormalData = 4
}
[Benchmark]
private const int Iter = 1000;
[Benchmark(InnerIterationCount = Iter)]
[InlineData(CompressionType.CryptoRandom)]
[InlineData(CompressionType.RepeatedSegments)]
[InlineData(CompressionType.NormalData)]
@@ -105,14 +107,14 @@ namespace System.IO.Compression.Tests
{
string testFilePath = CreateCompressedFile(type);
int _bufferSize = 1024;
int retCount = -1;
var bytes = new byte[_bufferSize];
using (MemoryStream gzStream = await LocalMemoryStream.readAppFileAsync(testFilePath))
using (MemoryStream strippedMs = StripHeaderAndFooter.Strip(gzStream))
foreach (var iteration in Benchmark.Iterations)
using (iteration.StartMeasurement())
for (int i = 0; i < 10000; i++)
for (int i = 0; i < Benchmark.InnerIterationCount; i++)
{
int retCount = -1;
using (DeflateStream zip = new DeflateStream(strippedMs, CompressionMode.Decompress, leaveOpen: true))
{
while (retCount != 0)

6
external/corefx/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj vendored
View File

@@ -24,9 +24,6 @@
<Compile Include="ZipArchive\zip_UpdateTests.cs" />
<Compile Include="Utilities\StripHeaderAndFooter.cs" />
<Compile Include="Utilities\WrappedStream.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\IO\PathFeatures.cs">
<Link>Common\System\IO\PathFeatures.cs</Link>
</Compile>
@@ -42,9 +39,6 @@
<Compile Include="$(CommonTestPath)\System\IO\Compression\StreamHelpers.cs">
<Link>Common\System\IO\Compression\StreamHelpers.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\IO\FileCleanupTestBase.cs">
<Link>Common\System\IO\FileCleanupTestBase.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\IO\TempFile.cs">
<Link>Common\System\IO\TempFile.cs</Link>
</Compile>

2
external/corefx/src/System.IO.Compression/tests/ZipArchive/zip_InvalidParametersAndStrangeFiles.cs vendored
View File

@@ -40,7 +40,7 @@ namespace System.IO.Compression.Tests
ZipArchiveEntry entry = archive.GetEntry("first.txt");
//null/empty string
Assert.Throws<ArgumentException>(() => archive.CreateEntry("")); //"Should throw on empty entry name"
AssertExtensions.Throws<ArgumentException>("entryName", () => archive.CreateEntry("")); //"Should throw on empty entry name"
Assert.Throws<ArgumentNullException>(() => archive.CreateEntry(null)); //"should throw on null entry name"
}
}