Skip to content

Commit 88a1d8a

Browse files
committed
RECS0091: Use 'var' keyword
[ci skip]
1 parent c22e759 commit 88a1d8a

8 files changed

Lines changed: 233 additions & 233 deletions

File tree

ICSharpCode.SharpZipLib.Tests/BZip2/Bzip2Tests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ public class BZip2Suite
2323
[Category("BZip2")]
2424
public void BasicRoundTrip()
2525
{
26-
MemoryStream ms = new MemoryStream();
27-
BZip2OutputStream outStream = new BZip2OutputStream(ms);
26+
var ms = new MemoryStream();
27+
var outStream = new BZip2OutputStream(ms);
2828

2929
byte[] buf = new byte[10000];
30-
System.Random rnd = new Random();
30+
var rnd = new Random();
3131
rnd.NextBytes(buf);
3232

3333
outStream.Write(buf, 0, buf.Length);
@@ -63,8 +63,8 @@ public void BasicRoundTrip()
6363
[Category("BZip2")]
6464
public void CreateEmptyArchive()
6565
{
66-
MemoryStream ms = new MemoryStream();
67-
BZip2OutputStream outStream = new BZip2OutputStream(ms);
66+
var ms = new MemoryStream();
67+
var outStream = new BZip2OutputStream(ms);
6868
outStream.Close();
6969
ms = new MemoryStream(ms.GetBuffer());
7070

ICSharpCode.SharpZipLib.Tests/Base/InflaterDeflaterTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ void Inflate(MemoryStream ms, byte[] original, int level, bool zlib)
2222
{
2323
ms.Seek(0, SeekOrigin.Begin);
2424

25-
Inflater inflater = new Inflater(!zlib);
26-
InflaterInputStream inStream = new InflaterInputStream(ms, inflater);
25+
var inflater = new Inflater(!zlib);
26+
var inStream = new InflaterInputStream(ms, inflater);
2727
byte[] buf2 = new byte[original.Length];
2828

2929
int currentIndex = 0;
@@ -61,7 +61,7 @@ void Inflate(MemoryStream ms, byte[] original, int level, bool zlib)
6161
string description = string.Format("Difference at {0} level {1} zlib {2} ", i, level, zlib);
6262
if ( original.Length < 2048 )
6363
{
64-
StringBuilder builder = new StringBuilder(description);
64+
var builder = new StringBuilder(description);
6565
for (int d = 0; d < original.Length; ++d)
6666
{
6767
builder.AppendFormat("{0} ", original[d]);
@@ -79,9 +79,9 @@ void Inflate(MemoryStream ms, byte[] original, int level, bool zlib)
7979

8080
MemoryStream Deflate(byte[] data, int level, bool zlib)
8181
{
82-
MemoryStream memoryStream = new MemoryStream();
82+
var memoryStream = new MemoryStream();
8383

84-
Deflater deflater = new Deflater(level, !zlib);
84+
var deflater = new Deflater(level, !zlib);
8585
using ( DeflaterOutputStream outStream = new DeflaterOutputStream(memoryStream, deflater) )
8686
{
8787
outStream.IsStreamOwner = false;
@@ -95,7 +95,7 @@ MemoryStream Deflate(byte[] data, int level, bool zlib)
9595
void RandomDeflateInflate(int size, int level, bool zlib)
9696
{
9797
byte[] buffer = new byte[size];
98-
System.Random rnd = new Random();
98+
var rnd = new Random();
9999
rnd.NextBytes(buffer);
100100

101101
MemoryStream ms = Deflate(buffer, level, zlib);
@@ -209,8 +209,8 @@ public void CloseDeflatorWithNestedUsing()
209209
[Category("Base")]
210210
public void DeflatorStreamOwnership()
211211
{
212-
TrackedMemoryStream memStream = new TrackedMemoryStream();
213-
DeflaterOutputStream s = new DeflaterOutputStream(memStream);
212+
var memStream = new TrackedMemoryStream();
213+
var s = new DeflaterOutputStream(memStream);
214214

215215
Assert.IsFalse(memStream.IsClosed, "Shouldnt be closed initially");
216216
Assert.IsFalse(memStream.IsDisposed, "Shouldnt be disposed initially");
@@ -238,8 +238,8 @@ public void DeflatorStreamOwnership()
238238
[Category("Base")]
239239
public void InflatorStreamOwnership()
240240
{
241-
TrackedMemoryStream memStream = new TrackedMemoryStream();
242-
InflaterInputStream s = new InflaterInputStream(memStream);
241+
var memStream = new TrackedMemoryStream();
242+
var s = new InflaterInputStream(memStream);
243243

244244
Assert.IsFalse(memStream.IsClosed, "Shouldnt be closed initially");
245245
Assert.IsFalse(memStream.IsDisposed, "Shouldnt be disposed initially");
@@ -295,7 +295,7 @@ public void CloseInflatorWithNestedUsing()
295295
int readCount = textReader.Read(buffer, 0, 5);
296296
Assert.AreEqual(5, readCount);
297297

298-
StringBuilder b = new StringBuilder();
298+
var b = new StringBuilder();
299299
b.Append(buffer);
300300
Assert.AreEqual("Hello", b.ToString());
301301

ICSharpCode.SharpZipLib.Tests/Core/Core.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void FilterQuoting()
3636
[Test]
3737
public void NullFilter()
3838
{
39-
NameFilter nf = new NameFilter(null);
39+
var nf = new NameFilter(null);
4040
Assert.IsTrue(nf.IsIncluded("o78i6bgv5rvu\\kj//&*"));
4141
}
4242

ICSharpCode.SharpZipLib.Tests/GZip/GZipTests.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public class GZipTestSuite
2525
[Category("GZip")]
2626
public void TestGZip()
2727
{
28-
MemoryStream ms = new MemoryStream();
29-
GZipOutputStream outStream = new GZipOutputStream(ms);
28+
var ms = new MemoryStream();
29+
var outStream = new GZipOutputStream(ms);
3030

3131
byte[] buf = new byte[100000];
32-
System.Random rnd = new Random();
32+
var rnd = new Random();
3333
rnd.NextBytes(buf);
3434

3535
outStream.Write(buf, 0, buf.Length);
@@ -38,7 +38,7 @@ public void TestGZip()
3838

3939
ms.Seek(0, SeekOrigin.Begin);
4040

41-
GZipInputStream inStream = new GZipInputStream(ms);
41+
var inStream = new GZipInputStream(ms);
4242
byte[] buf2 = new byte[buf.Length];
4343
int currentIndex = 0;
4444
int count = buf2.Length;
@@ -66,7 +66,7 @@ public void TestGZip()
6666
[Category("GZip")]
6767
public void DelayedHeaderWriteNoData()
6868
{
69-
MemoryStream ms = new MemoryStream();
69+
var ms = new MemoryStream();
7070
Assert.AreEqual(0, ms.Length);
7171

7272
using (GZipOutputStream outStream = new GZipOutputStream(ms)) {
@@ -85,7 +85,7 @@ public void DelayedHeaderWriteNoData()
8585
[Category("GZip")]
8686
public void DelayedHeaderWriteWithData()
8787
{
88-
MemoryStream ms = new MemoryStream();
88+
var ms = new MemoryStream();
8989
Assert.AreEqual(0, ms.Length);
9090
using (GZipOutputStream outStream = new GZipOutputStream(ms)) {
9191
Assert.AreEqual(0, ms.Length);
@@ -104,7 +104,7 @@ public void DelayedHeaderWriteWithData()
104104
[Category("GZip")]
105105
public void ZeroLengthInputStream()
106106
{
107-
GZipInputStream gzi = new GZipInputStream(new MemoryStream());
107+
var gzi = new GZipInputStream(new MemoryStream());
108108
bool exception = false;
109109
try {
110110
gzi.ReadByte();
@@ -120,8 +120,8 @@ public void ZeroLengthInputStream()
120120
[Category("GZip")]
121121
public void OutputStreamOwnership()
122122
{
123-
TrackedMemoryStream memStream = new TrackedMemoryStream();
124-
GZipOutputStream s = new GZipOutputStream(memStream);
123+
var memStream = new TrackedMemoryStream();
124+
var s = new GZipOutputStream(memStream);
125125

126126
Assert.IsFalse(memStream.IsClosed, "Shouldnt be closed initially");
127127
Assert.IsFalse(memStream.IsDisposed, "Shouldnt be disposed initially");
@@ -148,8 +148,8 @@ public void OutputStreamOwnership()
148148
[Category("GZip")]
149149
public void InputStreamOwnership()
150150
{
151-
TrackedMemoryStream memStream = new TrackedMemoryStream();
152-
GZipInputStream s = new GZipInputStream(memStream);
151+
var memStream = new TrackedMemoryStream();
152+
var s = new GZipInputStream(memStream);
153153

154154
Assert.IsFalse(memStream.IsClosed, "Shouldnt be closed initially");
155155
Assert.IsFalse(memStream.IsDisposed, "Shouldnt be disposed initially");
@@ -176,8 +176,8 @@ public void InputStreamOwnership()
176176
[Test]
177177
public void DoubleFooter()
178178
{
179-
TrackedMemoryStream memStream=new TrackedMemoryStream();
180-
GZipOutputStream s=new GZipOutputStream(memStream);
179+
var memStream=new TrackedMemoryStream();
180+
var s=new GZipOutputStream(memStream);
181181
s.Finish();
182182
Int64 length=memStream.Length;
183183
s.Close();
@@ -187,8 +187,8 @@ public void DoubleFooter()
187187
[Test]
188188
public void DoubleClose()
189189
{
190-
TrackedMemoryStream memStream=new TrackedMemoryStream();
191-
GZipOutputStream s=new GZipOutputStream(memStream);
190+
var memStream=new TrackedMemoryStream();
191+
var s=new GZipOutputStream(memStream);
192192
s.Finish();
193193
s.Close();
194194
s.Close();
@@ -203,8 +203,8 @@ public void DoubleClose()
203203
[Test]
204204
public void WriteAfterFinish()
205205
{
206-
TrackedMemoryStream memStream=new TrackedMemoryStream();
207-
GZipOutputStream s=new GZipOutputStream(memStream);
206+
var memStream=new TrackedMemoryStream();
207+
var s=new GZipOutputStream(memStream);
208208
s.Finish();
209209

210210
try
@@ -220,8 +220,8 @@ public void WriteAfterFinish()
220220
[Test]
221221
public void WriteAfterClose()
222222
{
223-
TrackedMemoryStream memStream=new TrackedMemoryStream();
224-
GZipOutputStream s=new GZipOutputStream(memStream);
223+
var memStream=new TrackedMemoryStream();
224+
var s=new GZipOutputStream(memStream);
225225
s.Close();
226226

227227
try

ICSharpCode.SharpZipLib.Tests/Lzw/LzwTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class LzwTestSuite {
4040
[Test]
4141
[Category("LZW")]
4242
public void ZeroLengthInputStream() {
43-
LzwInputStream lis = new LzwInputStream(new MemoryStream());
43+
var lis = new LzwInputStream(new MemoryStream());
4444
bool exception = false;
4545
try {
4646
lis.ReadByte();
@@ -55,8 +55,8 @@ public void ZeroLengthInputStream() {
5555
[Test]
5656
[Category("LZW")]
5757
public void InputStreamOwnership() {
58-
TrackedMemoryStream memStream = new TrackedMemoryStream();
59-
LzwInputStream s = new LzwInputStream(memStream);
58+
var memStream = new TrackedMemoryStream();
59+
var s = new LzwInputStream(memStream);
6060

6161
Assert.IsFalse(memStream.IsClosed, "Shouldnt be closed initially");
6262
Assert.IsFalse(memStream.IsDisposed, "Shouldnt be disposed initially");

0 commit comments

Comments
 (0)