Skip to content

Commit aed140a

Browse files
mnadareskimnadareski
committed
Be smarter with using statements in tests
1 parent 5b93df9 commit aed140a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+380
-326
lines changed

‎SabreTools.Serialization.Test/Deserializers/AACSTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using System.Linq;
3+
using SabreTools.Serialization.Deserializers;
34
using Xunit;
45

56
namespace SabreTools.Serialization.Test.Deserializers
@@ -11,7 +12,7 @@ public void NullArray_Null()
1112
{
1213
byte[]? data = null;
1314
int offset = 0;
14-
var deserializer = new Serialization.Deserializers.AACS();
15+
var deserializer = new AACS();
1516

1617
var actual = deserializer.Deserialize(data, offset);
1718
Assert.Null(actual);
@@ -22,7 +23,7 @@ public void EmptyArray_Null()
2223
{
2324
byte[]? data = [];
2425
int offset = 0;
25-
var deserializer = new Serialization.Deserializers.AACS();
26+
var deserializer = new AACS();
2627

2728
var actual = deserializer.Deserialize(data, offset);
2829
Assert.Null(actual);
@@ -33,7 +34,7 @@ public void InvalidArray_Null()
3334
{
3435
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3536
int offset = 0;
36-
var deserializer = new Serialization.Deserializers.AACS();
37+
var deserializer = new AACS();
3738

3839
var actual = deserializer.Deserialize(data, offset);
3940
Assert.Null(actual);
@@ -43,7 +44,7 @@ public void InvalidArray_Null()
4344
public void NullStream_Null()
4445
{
4546
Stream? data = null;
46-
var deserializer = new Serialization.Deserializers.AACS();
47+
var deserializer = new AACS();
4748

4849
var actual = deserializer.Deserialize(data);
4950
Assert.Null(actual);
@@ -53,7 +54,7 @@ public void NullStream_Null()
5354
public void EmptyStream_Null()
5455
{
5556
Stream? data = new MemoryStream([]);
56-
var deserializer = new Serialization.Deserializers.AACS();
57+
var deserializer = new AACS();
5758

5859
var actual = deserializer.Deserialize(data);
5960
Assert.Null(actual);
@@ -63,7 +64,7 @@ public void EmptyStream_Null()
6364
public void InvalidStream_Null()
6465
{
6566
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
66-
var deserializer = new Serialization.Deserializers.AACS();
67+
var deserializer = new AACS();
6768

6869
var actual = deserializer.Deserialize(data);
6970
Assert.Null(actual);

‎SabreTools.Serialization.Test/Deserializers/ArchiveDotOrgTests.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using SabreTools.Serialization.Deserializers;
45
using Xunit;
56

67
namespace SabreTools.Serialization.Test.Deserializers
@@ -12,7 +13,7 @@ public void NullArray_Null()
1213
{
1314
byte[]? data = null;
1415
int offset = 0;
15-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
16+
var deserializer = new ArchiveDotOrg();
1617

1718
var actual = deserializer.Deserialize(data, offset);
1819
Assert.Null(actual);
@@ -23,7 +24,7 @@ public void EmptyArray_Null()
2324
{
2425
byte[]? data = [];
2526
int offset = 0;
26-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
27+
var deserializer = new ArchiveDotOrg();
2728

2829
var actual = deserializer.Deserialize(data, offset);
2930
Assert.Null(actual);
@@ -34,7 +35,7 @@ public void InvalidArray_Null()
3435
{
3536
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3637
int offset = 0;
37-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
38+
var deserializer = new ArchiveDotOrg();
3839

3940
var actual = deserializer.Deserialize(data, offset);
4041
Assert.Null(actual);
@@ -44,7 +45,7 @@ public void InvalidArray_Null()
4445
public void NullStream_Null()
4546
{
4647
Stream? data = null;
47-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
48+
var deserializer = new ArchiveDotOrg();
4849

4950
var actual = deserializer.Deserialize(data);
5051
Assert.Null(actual);
@@ -54,7 +55,7 @@ public void NullStream_Null()
5455
public void EmptyStream_Null()
5556
{
5657
Stream? data = new MemoryStream([]);
57-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
58+
var deserializer = new ArchiveDotOrg();
5859

5960
var actual = deserializer.Deserialize(data);
6061
Assert.Null(actual);
@@ -64,7 +65,7 @@ public void EmptyStream_Null()
6465
public void InvalidStream_Null()
6566
{
6667
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
67-
var deserializer = new Serialization.Deserializers.ArchiveDotOrg();
68+
var deserializer = new ArchiveDotOrg();
6869

6970
var actual = deserializer.Deserialize(data);
7071
Assert.Null(actual);
@@ -82,7 +83,7 @@ public void ValidFile_NonNull(string path, long count)
8283
string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path);
8384

8485
// Deserialize the file
85-
var dat = Serialization.Deserializers.ArchiveDotOrg.DeserializeFile(filename);
86+
var dat = ArchiveDotOrg.DeserializeFile(filename);
8687

8788
// Validate the values
8889
Assert.NotNull(dat?.File);

‎SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using SabreTools.Serialization.Deserializers;
45
using Xunit;
56

67
namespace SabreTools.Serialization.Test.Deserializers
@@ -12,7 +13,7 @@ public void NullArray_Null()
1213
{
1314
byte[]? data = null;
1415
int offset = 0;
15-
var deserializer = new Serialization.Deserializers.AttractMode();
16+
var deserializer = new AttractMode();
1617

1718
var actual = deserializer.Deserialize(data, offset);
1819
Assert.Null(actual);
@@ -23,7 +24,7 @@ public void EmptyArray_Null()
2324
{
2425
byte[]? data = [];
2526
int offset = 0;
26-
var deserializer = new Serialization.Deserializers.AttractMode();
27+
var deserializer = new AttractMode();
2728

2829
var actual = deserializer.Deserialize(data, offset);
2930
Assert.Null(actual);
@@ -34,7 +35,7 @@ public void InvalidArray_Null()
3435
{
3536
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3637
int offset = 0;
37-
var deserializer = new Serialization.Deserializers.AttractMode();
38+
var deserializer = new AttractMode();
3839

3940
var actual = deserializer.Deserialize(data, offset);
4041
Assert.Null(actual);
@@ -44,7 +45,7 @@ public void InvalidArray_Null()
4445
public void NullStream_Null()
4546
{
4647
Stream? data = null;
47-
var deserializer = new Serialization.Deserializers.AttractMode();
48+
var deserializer = new AttractMode();
4849

4950
var actual = deserializer.Deserialize(data);
5051
Assert.Null(actual);
@@ -54,7 +55,7 @@ public void NullStream_Null()
5455
public void EmptyStream_Null()
5556
{
5657
Stream? data = new MemoryStream([]);
57-
var deserializer = new Serialization.Deserializers.AttractMode();
58+
var deserializer = new AttractMode();
5859

5960
var actual = deserializer.Deserialize(data);
6061
Assert.Null(actual);
@@ -64,7 +65,7 @@ public void EmptyStream_Null()
6465
public void InvalidStream_Null()
6566
{
6667
var data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
67-
var deserializer = new Serialization.Deserializers.AttractMode();
68+
var deserializer = new AttractMode();
6869

6970
var actual = deserializer.Deserialize(data);
7071
Assert.Null(actual);
@@ -78,7 +79,7 @@ public void ValidFile_NonNull(string path, long count)
7879
string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path);
7980

8081
// Deserialize the file
81-
var dat = Serialization.Deserializers.AttractMode.DeserializeFile(filename);
82+
var dat = AttractMode.DeserializeFile(filename);
8283

8384
// Validate texpected: he values
8485
Assert.NotNull(dat?.Row);

‎SabreTools.Serialization.Test/Deserializers/BDPlusTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using System.Linq;
3+
using SabreTools.Serialization.Deserializers;
34
using Xunit;
45

56
namespace SabreTools.Serialization.Test.Deserializers
@@ -11,7 +12,7 @@ public void NullArray_Null()
1112
{
1213
byte[]? data = null;
1314
int offset = 0;
14-
var deserializer = new Serialization.Deserializers.BDPlus();
15+
var deserializer = new BDPlus();
1516

1617
var actual = deserializer.Deserialize(data, offset);
1718
Assert.Null(actual);
@@ -22,7 +23,7 @@ public void EmptyArray_Null()
2223
{
2324
byte[]? data = [];
2425
int offset = 0;
25-
var deserializer = new Serialization.Deserializers.BDPlus();
26+
var deserializer = new BDPlus();
2627

2728
var actual = deserializer.Deserialize(data, offset);
2829
Assert.Null(actual);
@@ -33,7 +34,7 @@ public void InvalidArray_Null()
3334
{
3435
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3536
int offset = 0;
36-
var deserializer = new Serialization.Deserializers.BDPlus();
37+
var deserializer = new BDPlus();
3738

3839
var actual = deserializer.Deserialize(data, offset);
3940
Assert.Null(actual);
@@ -43,7 +44,7 @@ public void InvalidArray_Null()
4344
public void NullStream_Null()
4445
{
4546
Stream? data = null;
46-
var deserializer = new Serialization.Deserializers.BDPlus();
47+
var deserializer = new BDPlus();
4748

4849
var actual = deserializer.Deserialize(data);
4950
Assert.Null(actual);
@@ -53,7 +54,7 @@ public void NullStream_Null()
5354
public void EmptyStream_Null()
5455
{
5556
Stream? data = new MemoryStream([]);
56-
var deserializer = new Serialization.Deserializers.BDPlus();
57+
var deserializer = new BDPlus();
5758

5859
var actual = deserializer.Deserialize(data);
5960
Assert.Null(actual);
@@ -63,7 +64,7 @@ public void EmptyStream_Null()
6364
public void InvalidStream_Null()
6465
{
6566
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
66-
var deserializer = new Serialization.Deserializers.BDPlus();
67+
var deserializer = new BDPlus();
6768

6869
var actual = deserializer.Deserialize(data);
6970
Assert.Null(actual);

‎SabreTools.Serialization.Test/Deserializers/BFPKTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using System.Linq;
3+
using SabreTools.Serialization.Deserializers;
34
using Xunit;
45

56
namespace SabreTools.Serialization.Test.Deserializers
@@ -11,7 +12,7 @@ public void NullArray_Null()
1112
{
1213
byte[]? data = null;
1314
int offset = 0;
14-
var deserializer = new Serialization.Deserializers.BFPK();
15+
var deserializer = new BFPK();
1516

1617
var actual = deserializer.Deserialize(data, offset);
1718
Assert.Null(actual);
@@ -22,7 +23,7 @@ public void EmptyArray_Null()
2223
{
2324
byte[]? data = [];
2425
int offset = 0;
25-
var deserializer = new Serialization.Deserializers.BFPK();
26+
var deserializer = new BFPK();
2627

2728
var actual = deserializer.Deserialize(data, offset);
2829
Assert.Null(actual);
@@ -33,7 +34,7 @@ public void InvalidArray_Null()
3334
{
3435
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3536
int offset = 0;
36-
var deserializer = new Serialization.Deserializers.BFPK();
37+
var deserializer = new BFPK();
3738

3839
var actual = deserializer.Deserialize(data, offset);
3940
Assert.Null(actual);
@@ -43,7 +44,7 @@ public void InvalidArray_Null()
4344
public void NullStream_Null()
4445
{
4546
Stream? data = null;
46-
var deserializer = new Serialization.Deserializers.BFPK();
47+
var deserializer = new BFPK();
4748

4849
var actual = deserializer.Deserialize(data);
4950
Assert.Null(actual);
@@ -53,7 +54,7 @@ public void NullStream_Null()
5354
public void EmptyStream_Null()
5455
{
5556
Stream? data = new MemoryStream([]);
56-
var deserializer = new Serialization.Deserializers.BFPK();
57+
var deserializer = new BFPK();
5758

5859
var actual = deserializer.Deserialize(data);
5960
Assert.Null(actual);
@@ -63,7 +64,7 @@ public void EmptyStream_Null()
6364
public void InvalidStream_Null()
6465
{
6566
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
66-
var deserializer = new Serialization.Deserializers.BFPK();
67+
var deserializer = new BFPK();
6768

6869
var actual = deserializer.Deserialize(data);
6970
Assert.Null(actual);

‎SabreTools.Serialization.Test/Deserializers/BSPTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using System.Linq;
3+
using SabreTools.Serialization.Deserializers;
34
using Xunit;
45

56
namespace SabreTools.Serialization.Test.Deserializers
@@ -11,7 +12,7 @@ public void NullArray_Null()
1112
{
1213
byte[]? data = null;
1314
int offset = 0;
14-
var deserializer = new Serialization.Deserializers.BSP();
15+
var deserializer = new BSP();
1516

1617
var actual = deserializer.Deserialize(data, offset);
1718
Assert.Null(actual);
@@ -22,7 +23,7 @@ public void EmptyArray_Null()
2223
{
2324
byte[]? data = [];
2425
int offset = 0;
25-
var deserializer = new Serialization.Deserializers.BSP();
26+
var deserializer = new BSP();
2627

2728
var actual = deserializer.Deserialize(data, offset);
2829
Assert.Null(actual);
@@ -33,7 +34,7 @@ public void InvalidArray_Null()
3334
{
3435
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
3536
int offset = 0;
36-
var deserializer = new Serialization.Deserializers.BSP();
37+
var deserializer = new BSP();
3738

3839
var actual = deserializer.Deserialize(data, offset);
3940
Assert.Null(actual);
@@ -43,7 +44,7 @@ public void InvalidArray_Null()
4344
public void NullStream_Null()
4445
{
4546
Stream? data = null;
46-
var deserializer = new Serialization.Deserializers.BSP();
47+
var deserializer = new BSP();
4748

4849
var actual = deserializer.Deserialize(data);
4950
Assert.Null(actual);
@@ -53,7 +54,7 @@ public void NullStream_Null()
5354
public void EmptyStream_Null()
5455
{
5556
Stream? data = new MemoryStream([]);
56-
var deserializer = new Serialization.Deserializers.BSP();
57+
var deserializer = new BSP();
5758

5859
var actual = deserializer.Deserialize(data);
5960
Assert.Null(actual);
@@ -63,7 +64,7 @@ public void EmptyStream_Null()
6364
public void InvalidStream_Null()
6465
{
6566
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
66-
var deserializer = new Serialization.Deserializers.BSP();
67+
var deserializer = new BSP();
6768

6869
var actual = deserializer.Deserialize(data);
6970
Assert.Null(actual);

0 commit comments

Comments
 (0)