Skip to content

Commit a12a2ef

Browse files
siegfriedpammersiegfriedpammer
committed
Fix all warnings
1 parent 31363f8 commit a12a2ef

File tree

4 files changed

+93
-91
lines changed

4 files changed

+93
-91
lines changed

‎src/ICSharpCode.SharpZipLib/Checksum/BZip2Crc.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ namespace ICSharpCode.SharpZipLib.Checksum
3232
public sealed class BZip2Crc : IChecksum
3333
{
3434
#region Instance Fields
35-
readonly static uint crcInit = 0xFFFFFFFF;
36-
readonly static uint crcXor = 0x00000000;
35+
const uint crcInit = 0xFFFFFFFF;
36+
//const uint crcXor = 0x00000000;
3737

3838
readonly static uint[] crcTable = {
3939
0X00000000, 0X04C11DB7, 0X09823B6E, 0X0D4326D9,

‎test/ICSharpCode.SharpZipLib.Tests/BZip2/Bzip2Tests.cs

+25-25
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using ICSharpCode.SharpZipLib.BZip2;
44
using ICSharpCode.SharpZipLib.Tests.TestSupport;
55
using NUnit.Framework;
6+
using System.Threading;
67

78
namespace ICSharpCode.SharpZipLib.Tests.BZip2
89
{
@@ -77,45 +78,44 @@ public void CreateEmptyArchive()
7778
}
7879
}
7980

80-
readonly BZip2OutputStream outStream_;
81+
BZip2OutputStream outStream_;
8182
BZip2InputStream inStream_;
8283
WindowedStream window_;
8384
long readTarget_;
8485
long writeTarget_;
8586

86-
// TODO: Fix this
87-
//[Test]
88-
//[Category("BZip2")]
89-
//public void Performance()
90-
//{
91-
// window_ = new WindowedStream(0x150000);
92-
93-
// outStream_ = new BZip2OutputStream(window_, 1);
87+
[Test]
88+
[Category("BZip2")]
89+
[Ignore("TODO : Fix this")]
90+
public void Performance()
91+
{
92+
window_ = new WindowedStream(0x150000);
9493

95-
// const long Target = 0x10000000;
96-
// readTarget_ = writeTarget_ = Target;
94+
outStream_ = new BZip2OutputStream(window_, 1);
9795

98-
// Thread reader = new Thread(Reader);
99-
// reader.Name = "Reader";
96+
const long Target = 0x10000000;
97+
readTarget_ = writeTarget_ = Target;
10098

101-
// Thread writer = new Thread(Writer);
102-
// writer.Name = "Writer";
99+
Thread reader = new Thread(Reader);
100+
reader.Name = "Reader";
103101

104-
// DateTime startTime = DateTime.Now;
105-
// writer.Start();
102+
Thread writer = new Thread(Writer);
103+
writer.Name = "Writer";
106104

107-
// inStream_ = new BZip2InputStream(window_);
105+
DateTime startTime = DateTime.Now;
106+
writer.Start();
108107

109-
// reader.Start();
108+
inStream_ = new BZip2InputStream(window_);
110109

111-
// Assert.IsTrue(writer.Join(TimeSpan.FromMinutes(5.0D)));
112-
// Assert.IsTrue(reader.Join(TimeSpan.FromMinutes(5.0D)));
110+
reader.Start();
113111

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

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

120120
void Reader()
121121
{

‎test/ICSharpCode.SharpZipLib.Tests/GZip/GZipTests.cs

+25-24
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using ICSharpCode.SharpZipLib.GZip;
44
using ICSharpCode.SharpZipLib.Tests.TestSupport;
55
using NUnit.Framework;
6+
using System.Threading;
67

78
namespace ICSharpCode.SharpZipLib.Tests.GZip
89
{
@@ -277,37 +278,37 @@ public void TrailingGarbage()
277278
}
278279
}
279280

280-
// TODO: Fix This
281-
//[Test]
282-
//[Category("GZip")]
283-
//[Category("Long Running")]
284-
//public void BigStream()
285-
//{
286-
// window_ = new WindowedStream(0x3ffff);
287-
// outStream_ = new GZipOutputStream(window_);
288-
// inStream_ = new GZipInputStream(window_);
281+
[Test]
282+
[Category("GZip")]
283+
[Category("Long Running")]
284+
[Ignore("TODO : Fix this")]
285+
public void BigStream()
286+
{
287+
window_ = new WindowedStream(0x3ffff);
288+
outStream_ = new GZipOutputStream(window_);
289+
inStream_ = new GZipInputStream(window_);
289290

290-
// long target = 0x10000000;
291-
// readTarget_ = writeTarget_ = target;
291+
long target = 0x10000000;
292+
readTarget_ = writeTarget_ = target;
292293

293-
// Thread reader = new Thread(Reader);
294-
// reader.Name = "Reader";
295-
// reader.Start();
294+
Thread reader = new Thread(Reader);
295+
reader.Name = "Reader";
296+
reader.Start();
296297

297-
// Thread writer = new Thread(Writer);
298-
// writer.Name = "Writer";
298+
Thread writer = new Thread(Writer);
299+
writer.Name = "Writer";
299300

300-
// DateTime startTime = DateTime.Now;
301-
// writer.Start();
301+
DateTime startTime = DateTime.Now;
302+
writer.Start();
302303

303-
// writer.Join();
304-
// reader.Join();
304+
writer.Join();
305+
reader.Join();
305306

306-
// DateTime endTime = DateTime.Now;
307+
DateTime endTime = DateTime.Now;
307308

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

312313
void Reader()
313314
{

‎test/ICSharpCode.SharpZipLib.Tests/Zip/StreamHandling.cs

+41-40
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using ICSharpCode.SharpZipLib.Tests.TestSupport;
44
using ICSharpCode.SharpZipLib.Zip;
55
using NUnit.Framework;
6+
using System.Threading;
67

78
namespace ICSharpCode.SharpZipLib.Tests.Zip
89
{
@@ -262,58 +263,58 @@ public void BaseClosedAfterFailure()
262263
Assert.IsTrue(ms.IsClosed, "Underlying stream should be closed");
263264
}
264265

265-
// TODO: Fix This
266-
//[Test]
267-
//[Category("Zip")]
268-
//public void WriteThroughput()
269-
//{
270-
// outStream_ = new ZipOutputStream(new NullStream());
266+
[Test]
267+
[Category("Zip")]
268+
[Ignore("TODO : Fix this")]
269+
public void WriteThroughput()
270+
{
271+
outStream_ = new ZipOutputStream(new NullStream());
271272

272-
// DateTime startTime = DateTime.Now;
273+
DateTime startTime = DateTime.Now;
273274

274-
// long target = 0x10000000;
275+
long target = 0x10000000;
275276

276-
// writeTarget_ = target;
277-
// outStream_.PutNextEntry(new ZipEntry("0"));
278-
// WriteTargetBytes();
277+
writeTarget_ = target;
278+
outStream_.PutNextEntry(new ZipEntry("0"));
279+
WriteTargetBytes();
279280

280-
// outStream_.Close();
281+
outStream_.Close();
281282

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

287-
// TODO: Fix This
288-
//[Test]
289-
//[Category("Zip")]
290-
//[Category("Long Running")]
291-
//public void SingleLargeEntry()
292-
//{
293-
// window_ = new WindowedStream(0x10000);
294-
// outStream_ = new ZipOutputStream(window_);
295-
// inStream_ = new ZipInputStream(window_);
288+
[Test]
289+
[Category("Zip")]
290+
[Category("Long Running")]
291+
[Ignore("TODO : Fix this")]
292+
public void SingleLargeEntry()
293+
{
294+
window_ = new WindowedStream(0x10000);
295+
outStream_ = new ZipOutputStream(window_);
296+
inStream_ = new ZipInputStream(window_);
296297

297-
// long target = 0x10000000;
298-
// readTarget_ = writeTarget_ = target;
298+
long target = 0x10000000;
299+
readTarget_ = writeTarget_ = target;
299300

300-
// Thread reader = new Thread(Reader);
301-
// reader.Name = "Reader";
301+
Thread reader = new Thread(Reader);
302+
reader.Name = "Reader";
302303

303-
// Thread writer = new Thread(Writer);
304-
// writer.Name = "Writer";
304+
Thread writer = new Thread(Writer);
305+
writer.Name = "Writer";
305306

306-
// DateTime startTime = DateTime.Now;
307-
// reader.Start();
308-
// writer.Start();
307+
DateTime startTime = DateTime.Now;
308+
reader.Start();
309+
writer.Start();
309310

310-
// writer.Join();
311-
// reader.Join();
311+
writer.Join();
312+
reader.Join();
312313

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

318319
void Reader()
319320
{

0 commit comments

Comments
 (0)