Skip to content

Commit

Permalink
Fix all warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@siegfriedpammer
siegfriedpammer committed Aug 17, 2017
1 parent 31363f8 commit a12a2ef
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 91 deletions.
4 changes: 2 additions & 2 deletions src/ICSharpCode.SharpZipLib/Checksum/BZip2Crc.cs
View file
Expand Up @@ -32,8 +32,8 @@ namespace ICSharpCode.SharpZipLib.Checksum
public sealed class BZip2Crc : IChecksum
{
#region Instance Fields
readonly static uint crcInit = 0xFFFFFFFF;
readonly static uint crcXor = 0x00000000;
const uint crcInit = 0xFFFFFFFF;
//const uint crcXor = 0x00000000;

readonly static uint[] crcTable = {
0X00000000, 0X04C11DB7, 0X09823B6E, 0X0D4326D9,
Expand Down
50 changes: 25 additions & 25 deletions test/ICSharpCode.SharpZipLib.Tests/BZip2/Bzip2Tests.cs
View file
Expand Up @@ -3,6 +3,7 @@
using ICSharpCode.SharpZipLib.BZip2;
using ICSharpCode.SharpZipLib.Tests.TestSupport;
using NUnit.Framework;
using System.Threading;

namespace ICSharpCode.SharpZipLib.Tests.BZip2
{
Expand Down Expand Up @@ -77,45 +78,44 @@ public void CreateEmptyArchive()
}
}

readonly BZip2OutputStream outStream_;
BZip2OutputStream outStream_;
BZip2InputStream inStream_;
WindowedStream window_;
long readTarget_;
long writeTarget_;

// TODO: Fix this
//[Test]
//[Category("BZip2")]
//public void Performance()
//{
// window_ = new WindowedStream(0x150000);

// outStream_ = new BZip2OutputStream(window_, 1);
[Test]
[Category("BZip2")]
[Ignore("TODO : Fix this")]
public void Performance()
{
window_ = new WindowedStream(0x150000);

// const long Target = 0x10000000;
// readTarget_ = writeTarget_ = Target;
outStream_ = new BZip2OutputStream(window_, 1);

// Thread reader = new Thread(Reader);
// reader.Name = "Reader";
const long Target = 0x10000000;
readTarget_ = writeTarget_ = Target;

// Thread writer = new Thread(Writer);
// writer.Name = "Writer";
Thread reader = new Thread(Reader);
reader.Name = "Reader";

// DateTime startTime = DateTime.Now;
// writer.Start();
Thread writer = new Thread(Writer);
writer.Name = "Writer";

// inStream_ = new BZip2InputStream(window_);
DateTime startTime = DateTime.Now;
writer.Start();

// reader.Start();
inStream_ = new BZip2InputStream(window_);

// Assert.IsTrue(writer.Join(TimeSpan.FromMinutes(5.0D)));
// Assert.IsTrue(reader.Join(TimeSpan.FromMinutes(5.0D)));
reader.Start();

// DateTime endTime = DateTime.Now;
// TimeSpan span = endTime - startTime;
// Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (Target / 1024) / span.TotalSeconds);
Assert.IsTrue(writer.Join(TimeSpan.FromMinutes(5.0D)));
Assert.IsTrue(reader.Join(TimeSpan.FromMinutes(5.0D)));

//}
DateTime endTime = DateTime.Now;
TimeSpan span = endTime - startTime;
Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (Target / 1024) / span.TotalSeconds);
}

void Reader()
{
Expand Down
49 changes: 25 additions & 24 deletions test/ICSharpCode.SharpZipLib.Tests/GZip/GZipTests.cs
View file
Expand Up @@ -3,6 +3,7 @@
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tests.TestSupport;
using NUnit.Framework;
using System.Threading;

namespace ICSharpCode.SharpZipLib.Tests.GZip
{
Expand Down Expand Up @@ -277,37 +278,37 @@ public void TrailingGarbage()
}
}

// TODO: Fix This
//[Test]
//[Category("GZip")]
//[Category("Long Running")]
//public void BigStream()
//{
// window_ = new WindowedStream(0x3ffff);
// outStream_ = new GZipOutputStream(window_);
// inStream_ = new GZipInputStream(window_);
[Test]
[Category("GZip")]
[Category("Long Running")]
[Ignore("TODO : Fix this")]
public void BigStream()
{
window_ = new WindowedStream(0x3ffff);
outStream_ = new GZipOutputStream(window_);
inStream_ = new GZipInputStream(window_);

// long target = 0x10000000;
// readTarget_ = writeTarget_ = target;
long target = 0x10000000;
readTarget_ = writeTarget_ = target;

// Thread reader = new Thread(Reader);
// reader.Name = "Reader";
// reader.Start();
Thread reader = new Thread(Reader);
reader.Name = "Reader";
reader.Start();

// Thread writer = new Thread(Writer);
// writer.Name = "Writer";
Thread writer = new Thread(Writer);
writer.Name = "Writer";

// DateTime startTime = DateTime.Now;
// writer.Start();
DateTime startTime = DateTime.Now;
writer.Start();

// writer.Join();
// reader.Join();
writer.Join();
reader.Join();

// DateTime endTime = DateTime.Now;
DateTime endTime = DateTime.Now;

// TimeSpan span = endTime - startTime;
// Console.WriteLine("Time {0} processes {1} KB/Sec", span, (target / 1024) / span.TotalSeconds);
//}
TimeSpan span = endTime - startTime;
Console.WriteLine("Time {0} processes {1} KB/Sec", span, (target / 1024) / span.TotalSeconds);
}

void Reader()
{
Expand Down
81 changes: 41 additions & 40 deletions test/ICSharpCode.SharpZipLib.Tests/Zip/StreamHandling.cs
View file
Expand Up @@ -3,6 +3,7 @@
using ICSharpCode.SharpZipLib.Tests.TestSupport;
using ICSharpCode.SharpZipLib.Zip;
using NUnit.Framework;
using System.Threading;

namespace ICSharpCode.SharpZipLib.Tests.Zip
{
Expand Down Expand Up @@ -262,58 +263,58 @@ public void BaseClosedAfterFailure()
Assert.IsTrue(ms.IsClosed, "Underlying stream should be closed");
}

// TODO: Fix This
//[Test]
//[Category("Zip")]
//public void WriteThroughput()
//{
// outStream_ = new ZipOutputStream(new NullStream());
[Test]
[Category("Zip")]
[Ignore("TODO : Fix this")]
public void WriteThroughput()
{
outStream_ = new ZipOutputStream(new NullStream());

// DateTime startTime = DateTime.Now;
DateTime startTime = DateTime.Now;

// long target = 0x10000000;
long target = 0x10000000;

// writeTarget_ = target;
// outStream_.PutNextEntry(new ZipEntry("0"));
// WriteTargetBytes();
writeTarget_ = target;
outStream_.PutNextEntry(new ZipEntry("0"));
WriteTargetBytes();

// outStream_.Close();
outStream_.Close();

// DateTime endTime = DateTime.Now;
// TimeSpan span = endTime - startTime;
// Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (target / 1024.0) / span.TotalSeconds);
//}
DateTime endTime = DateTime.Now;
TimeSpan span = endTime - startTime;
Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (target / 1024.0) / span.TotalSeconds);
}

// TODO: Fix This
//[Test]
//[Category("Zip")]
//[Category("Long Running")]
//public void SingleLargeEntry()
//{
// window_ = new WindowedStream(0x10000);
// outStream_ = new ZipOutputStream(window_);
// inStream_ = new ZipInputStream(window_);
[Test]
[Category("Zip")]
[Category("Long Running")]
[Ignore("TODO : Fix this")]
public void SingleLargeEntry()
{
window_ = new WindowedStream(0x10000);
outStream_ = new ZipOutputStream(window_);
inStream_ = new ZipInputStream(window_);

// long target = 0x10000000;
// readTarget_ = writeTarget_ = target;
long target = 0x10000000;
readTarget_ = writeTarget_ = target;

// Thread reader = new Thread(Reader);
// reader.Name = "Reader";
Thread reader = new Thread(Reader);
reader.Name = "Reader";

// Thread writer = new Thread(Writer);
// writer.Name = "Writer";
Thread writer = new Thread(Writer);
writer.Name = "Writer";

// DateTime startTime = DateTime.Now;
// reader.Start();
// writer.Start();
DateTime startTime = DateTime.Now;
reader.Start();
writer.Start();

// writer.Join();
// reader.Join();
writer.Join();
reader.Join();

// DateTime endTime = DateTime.Now;
// TimeSpan span = endTime - startTime;
// Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (target / 1024.0) / span.TotalSeconds);
//}
DateTime endTime = DateTime.Now;
TimeSpan span = endTime - startTime;
Console.WriteLine("Time {0} throughput {1} KB/Sec", span, (target / 1024.0) / span.TotalSeconds);
}

void Reader()
{
Expand Down

0 comments on commit a12a2ef

Please sign in to comment.