From aed140a684ee9de1b0cccf96edba1e0809bd3dff Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 27 Nov 2024 14:25:53 -0500 Subject: [PATCH] Be smarter with using statements in tests --- .../Deserializers/AACSTests.cs | 13 +++++++------ .../Deserializers/ArchiveDotOrgTests.cs | 15 ++++++++------- .../Deserializers/AttractModeTests.cs | 15 ++++++++------- .../Deserializers/BDPlusTests.cs | 13 +++++++------ .../Deserializers/BFPKTests.cs | 13 +++++++------ .../Deserializers/BSPTests.cs | 13 +++++++------ .../Deserializers/CFBTests.cs | 13 +++++++------ .../Deserializers/CHDTests.cs | 13 +++++++------ .../Deserializers/CIATests.cs | 13 +++++++------ .../Deserializers/CatalogTests.cs | 13 +++++++------ .../Deserializers/ClrMameProTests.cs | 15 ++++++++------- .../Deserializers/CueSheetTests.cs | 13 +++++++------ .../Deserializers/DosCenterTests.cs | 15 ++++++++------- .../Deserializers/EverdriveSMDBTests.cs | 15 ++++++++------- .../Deserializers/GCFTests.cs | 13 +++++++------ .../Deserializers/HashfileTests.cs | 15 ++++++++------- .../Deserializers/IRDTests.cs | 13 +++++++------ .../Deserializers/InstallShieldArchiveV3Tests.cs | 13 +++++++------ .../Deserializers/InstallShieldCabinetTests.cs | 13 +++++++------ .../Deserializers/LinearExecutableTests.cs | 13 +++++++------ .../Deserializers/ListromTests.cs | 15 ++++++++------- .../Deserializers/ListxmlTests.cs | 15 ++++++++------- .../Deserializers/LogiqxTests.cs | 15 ++++++++------- .../Deserializers/M1Tests.cs | 13 +++++++------ .../Deserializers/MSDOSTests.cs | 13 +++++++------ .../Deserializers/MicrosoftCabinetTests.cs | 13 +++++++------ .../Deserializers/MoPaQTests.cs | 13 +++++++------ .../Deserializers/N3DSTests.cs | 13 +++++++------ .../Deserializers/NCFTests.cs | 13 +++++++------ .../Deserializers/NewExecutableTests.cs | 13 +++++++------ .../Deserializers/NitroTests.cs | 13 +++++++------ .../Deserializers/OfflineListTests.cs | 15 ++++++++------- .../Deserializers/OpenMSXTests.cs | 15 ++++++++------- .../Deserializers/PAKTests.cs | 13 +++++++------ .../Deserializers/PFFTests.cs | 13 +++++++------ .../Deserializers/PICTests.cs | 13 +++++++------ .../Deserializers/PKZIPTests.cs | 13 +++++++------ .../Deserializers/PlayJAudioTests.cs | 13 +++++++------ .../Deserializers/PlayJPlaylistTests.cs | 13 +++++++------ .../Deserializers/PortableExecutableTests.cs | 13 +++++++------ .../Deserializers/QuantumTests.cs | 13 +++++++------ .../Deserializers/RomCenterTests.cs | 15 ++++++++------- .../Deserializers/SFBTests.cs | 13 +++++++------ .../Deserializers/SFOTests.cs | 13 +++++++------ .../Deserializers/SGATests.cs | 13 +++++++------ .../Deserializers/SeparatedValueTests.cs | 15 ++++++++------- .../Deserializers/SoftwareListTests.cs | 15 ++++++++------- .../Deserializers/VBSPTests.cs | 13 +++++++------ .../Deserializers/VPKTests.cs | 13 +++++++------ .../Deserializers/WAD3Tests.cs | 13 +++++++------ .../Deserializers/XMIDTests.cs | 8 +++++--- .../Deserializers/XZPTests.cs | 13 +++++++------ .../Deserializers/XeMIDTests.cs | 7 ++++--- 53 files changed, 380 insertions(+), 326 deletions(-) diff --git a/SabreTools.Serialization.Test/Deserializers/AACSTests.cs b/SabreTools.Serialization.Test/Deserializers/AACSTests.cs index 6d27c0d6..a19c637a 100644 --- a/SabreTools.Serialization.Test/Deserializers/AACSTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/AACSTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.AACS(); + var deserializer = new AACS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Test/Deserializers/ArchiveDotOrgTests.cs index ee797910..07e9dee6 100644 --- a/SabreTools.Serialization.Test/Deserializers/ArchiveDotOrgTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/ArchiveDotOrgTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.ArchiveDotOrg(); + var deserializer = new ArchiveDotOrg(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -82,7 +83,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.ArchiveDotOrg.DeserializeFile(filename); + var dat = ArchiveDotOrg.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.File); diff --git a/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs b/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs index e4f9606f..f9f2e657 100644 --- a/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/AttractModeTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { var data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.AttractMode(); + var deserializer = new AttractMode(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.AttractMode.DeserializeFile(filename); + var dat = AttractMode.DeserializeFile(filename); // Validate texpected: he values Assert.NotNull(dat?.Row); diff --git a/SabreTools.Serialization.Test/Deserializers/BDPlusTests.cs b/SabreTools.Serialization.Test/Deserializers/BDPlusTests.cs index a9e9dd21..c72f6600 100644 --- a/SabreTools.Serialization.Test/Deserializers/BDPlusTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/BDPlusTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.BDPlus(); + var deserializer = new BDPlus(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/BFPKTests.cs b/SabreTools.Serialization.Test/Deserializers/BFPKTests.cs index e8cf558c..b8072c7c 100644 --- a/SabreTools.Serialization.Test/Deserializers/BFPKTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/BFPKTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.BFPK(); + var deserializer = new BFPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/BSPTests.cs b/SabreTools.Serialization.Test/Deserializers/BSPTests.cs index b6f7d513..4ab07514 100644 --- a/SabreTools.Serialization.Test/Deserializers/BSPTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/BSPTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.BSP(); + var deserializer = new BSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/CFBTests.cs b/SabreTools.Serialization.Test/Deserializers/CFBTests.cs index a49e6b0e..3a826fef 100644 --- a/SabreTools.Serialization.Test/Deserializers/CFBTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/CFBTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.CFB(); + var deserializer = new CFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/CHDTests.cs b/SabreTools.Serialization.Test/Deserializers/CHDTests.cs index cb093716..30461b17 100644 --- a/SabreTools.Serialization.Test/Deserializers/CHDTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/CHDTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.CHD(); + var deserializer = new CHD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/CIATests.cs b/SabreTools.Serialization.Test/Deserializers/CIATests.cs index d05cec6b..2496b970 100644 --- a/SabreTools.Serialization.Test/Deserializers/CIATests.cs +++ b/SabreTools.Serialization.Test/Deserializers/CIATests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.CIA(); + var deserializer = new CIA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/CatalogTests.cs b/SabreTools.Serialization.Test/Deserializers/CatalogTests.cs index 17eac9fe..f5509f53 100644 --- a/SabreTools.Serialization.Test/Deserializers/CatalogTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/CatalogTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Catalog(); + var deserializer = new Catalog(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs b/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs index 56ce8c36..904f0f6b 100644 --- a/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/ClrMameProTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.ClrMamePro(); + var deserializer = new ClrMamePro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -79,7 +80,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.ClrMamePro.DeserializeFile(filename, quotes: true); + var dat = ClrMamePro.DeserializeFile(filename, quotes: true); // Validate the values if (expectHeader) diff --git a/SabreTools.Serialization.Test/Deserializers/CueSheetTests.cs b/SabreTools.Serialization.Test/Deserializers/CueSheetTests.cs index 06ba015f..0f8a8ee0 100644 --- a/SabreTools.Serialization.Test/Deserializers/CueSheetTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/CueSheetTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.CueSheet(); + var deserializer = new CueSheet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs b/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs index cdbdf88f..9779886a 100644 --- a/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.DosCenter(); + var deserializer = new DosCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -79,7 +80,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.DosCenter.DeserializeFile(filename); + var dat = DosCenter.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.DosCenter); diff --git a/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs index bfe905f1..88162ffd 100644 --- a/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/EverdriveSMDBTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.EverdriveSMDB(); + var deserializer = new EverdriveSMDB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.EverdriveSMDB.DeserializeFile(filename); + var dat = EverdriveSMDB.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Row); diff --git a/SabreTools.Serialization.Test/Deserializers/GCFTests.cs b/SabreTools.Serialization.Test/Deserializers/GCFTests.cs index a3e51ad8..2a0488db 100644 --- a/SabreTools.Serialization.Test/Deserializers/GCFTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/GCFTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.GCF(); + var deserializer = new GCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/HashfileTests.cs b/SabreTools.Serialization.Test/Deserializers/HashfileTests.cs index d0453578..a53b60bb 100644 --- a/SabreTools.Serialization.Test/Deserializers/HashfileTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/HashfileTests.cs @@ -2,6 +2,7 @@ using System; using System.IO; using System.Linq; using SabreTools.Hashing; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -13,7 +14,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -24,7 +25,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -35,7 +36,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -45,7 +46,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -55,7 +56,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -65,7 +66,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Hashfile(); + var deserializer = new Hashfile(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -85,7 +86,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.Hashfile.DeserializeFile(filename, hash); + var dat = Hashfile.DeserializeFile(filename, hash); // Validate the values Assert.NotNull(dat); diff --git a/SabreTools.Serialization.Test/Deserializers/IRDTests.cs b/SabreTools.Serialization.Test/Deserializers/IRDTests.cs index d4cb80eb..41ea0523 100644 --- a/SabreTools.Serialization.Test/Deserializers/IRDTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/IRDTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.IRD(); + var deserializer = new IRD(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/InstallShieldArchiveV3Tests.cs b/SabreTools.Serialization.Test/Deserializers/InstallShieldArchiveV3Tests.cs index 540c6e25..bb89660e 100644 --- a/SabreTools.Serialization.Test/Deserializers/InstallShieldArchiveV3Tests.cs +++ b/SabreTools.Serialization.Test/Deserializers/InstallShieldArchiveV3Tests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.InstallShieldArchiveV3(); + var deserializer = new InstallShieldArchiveV3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/InstallShieldCabinetTests.cs b/SabreTools.Serialization.Test/Deserializers/InstallShieldCabinetTests.cs index 240451e3..85f1d396 100644 --- a/SabreTools.Serialization.Test/Deserializers/InstallShieldCabinetTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/InstallShieldCabinetTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.InstallShieldCabinet(); + var deserializer = new InstallShieldCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/LinearExecutableTests.cs b/SabreTools.Serialization.Test/Deserializers/LinearExecutableTests.cs index a089e87c..b4128a16 100644 --- a/SabreTools.Serialization.Test/Deserializers/LinearExecutableTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/LinearExecutableTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.LinearExecutable(); + var deserializer = new LinearExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/ListromTests.cs b/SabreTools.Serialization.Test/Deserializers/ListromTests.cs index f8385ff9..cc46bafc 100644 --- a/SabreTools.Serialization.Test/Deserializers/ListromTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/ListromTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Listrom(); + var deserializer = new Listrom(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.Listrom.DeserializeFile(filename); + var dat = Listrom.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Set); diff --git a/SabreTools.Serialization.Test/Deserializers/ListxmlTests.cs b/SabreTools.Serialization.Test/Deserializers/ListxmlTests.cs index 20699b78..fe2de07a 100644 --- a/SabreTools.Serialization.Test/Deserializers/ListxmlTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/ListxmlTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Listxml(); + var deserializer = new Listxml(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -79,7 +80,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.Listxml.DeserializeFile(filename); + var dat = Listxml.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Game); diff --git a/SabreTools.Serialization.Test/Deserializers/LogiqxTests.cs b/SabreTools.Serialization.Test/Deserializers/LogiqxTests.cs index c33c0a06..66d99d18 100644 --- a/SabreTools.Serialization.Test/Deserializers/LogiqxTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/LogiqxTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Logiqx(); + var deserializer = new Logiqx(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -79,7 +80,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.Logiqx.DeserializeFile(filename); + var dat = Logiqx.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Game); diff --git a/SabreTools.Serialization.Test/Deserializers/M1Tests.cs b/SabreTools.Serialization.Test/Deserializers/M1Tests.cs index a3edcd27..d76b7af1 100644 --- a/SabreTools.Serialization.Test/Deserializers/M1Tests.cs +++ b/SabreTools.Serialization.Test/Deserializers/M1Tests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.M1(); + var deserializer = new M1(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/MSDOSTests.cs b/SabreTools.Serialization.Test/Deserializers/MSDOSTests.cs index 9d737e6d..318e1f31 100644 --- a/SabreTools.Serialization.Test/Deserializers/MSDOSTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/MSDOSTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.MSDOS(); + var deserializer = new MSDOS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/MicrosoftCabinetTests.cs b/SabreTools.Serialization.Test/Deserializers/MicrosoftCabinetTests.cs index c164da95..ca672f56 100644 --- a/SabreTools.Serialization.Test/Deserializers/MicrosoftCabinetTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/MicrosoftCabinetTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.MicrosoftCabinet(); + var deserializer = new MicrosoftCabinet(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/MoPaQTests.cs b/SabreTools.Serialization.Test/Deserializers/MoPaQTests.cs index d2b20e36..280f939a 100644 --- a/SabreTools.Serialization.Test/Deserializers/MoPaQTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/MoPaQTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.MoPaQ(); + var deserializer = new MoPaQ(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/N3DSTests.cs b/SabreTools.Serialization.Test/Deserializers/N3DSTests.cs index 52e9f63e..c6e3f58e 100644 --- a/SabreTools.Serialization.Test/Deserializers/N3DSTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/N3DSTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.N3DS(); + var deserializer = new N3DS(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/NCFTests.cs b/SabreTools.Serialization.Test/Deserializers/NCFTests.cs index ffcbbe50..ffa71a9c 100644 --- a/SabreTools.Serialization.Test/Deserializers/NCFTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/NCFTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.NCF(); + var deserializer = new NCF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/NewExecutableTests.cs b/SabreTools.Serialization.Test/Deserializers/NewExecutableTests.cs index 06f4487a..6e468750 100644 --- a/SabreTools.Serialization.Test/Deserializers/NewExecutableTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/NewExecutableTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.NewExecutable(); + var deserializer = new NewExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/NitroTests.cs b/SabreTools.Serialization.Test/Deserializers/NitroTests.cs index 212a7e8b..d5dfe1c8 100644 --- a/SabreTools.Serialization.Test/Deserializers/NitroTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/NitroTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Nitro(); + var deserializer = new Nitro(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/OfflineListTests.cs b/SabreTools.Serialization.Test/Deserializers/OfflineListTests.cs index a8d8d730..ce138ef0 100644 --- a/SabreTools.Serialization.Test/Deserializers/OfflineListTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/OfflineListTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.OfflineList(); + var deserializer = new OfflineList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.OfflineList.DeserializeFile(filename); + var dat = OfflineList.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Games?.Game); diff --git a/SabreTools.Serialization.Test/Deserializers/OpenMSXTests.cs b/SabreTools.Serialization.Test/Deserializers/OpenMSXTests.cs index 26ede74f..368fbd33 100644 --- a/SabreTools.Serialization.Test/Deserializers/OpenMSXTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/OpenMSXTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.OpenMSX(); + var deserializer = new OpenMSX(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.OpenMSX.DeserializeFile(filename); + var dat = OpenMSX.DeserializeFile(filename); // Validate the values Assert.NotNull(dat); diff --git a/SabreTools.Serialization.Test/Deserializers/PAKTests.cs b/SabreTools.Serialization.Test/Deserializers/PAKTests.cs index 654b0f14..255dc1f4 100644 --- a/SabreTools.Serialization.Test/Deserializers/PAKTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PAKTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PAK(); + var deserializer = new PAK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PFFTests.cs b/SabreTools.Serialization.Test/Deserializers/PFFTests.cs index 95b760e3..79d61c8d 100644 --- a/SabreTools.Serialization.Test/Deserializers/PFFTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PFFTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PFF(); + var deserializer = new PFF(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PICTests.cs b/SabreTools.Serialization.Test/Deserializers/PICTests.cs index d50ba789..687c2eb5 100644 --- a/SabreTools.Serialization.Test/Deserializers/PICTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PICTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PIC(); + var deserializer = new PIC(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PKZIPTests.cs b/SabreTools.Serialization.Test/Deserializers/PKZIPTests.cs index 8fec26ae..09181f6a 100644 --- a/SabreTools.Serialization.Test/Deserializers/PKZIPTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PKZIPTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PKZIP(); + var deserializer = new PKZIP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PlayJAudioTests.cs b/SabreTools.Serialization.Test/Deserializers/PlayJAudioTests.cs index 709ec9de..06b15ee8 100644 --- a/SabreTools.Serialization.Test/Deserializers/PlayJAudioTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PlayJAudioTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PlayJAudio(); + var deserializer = new PlayJAudio(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PlayJPlaylistTests.cs b/SabreTools.Serialization.Test/Deserializers/PlayJPlaylistTests.cs index f67bccd7..a32bfa38 100644 --- a/SabreTools.Serialization.Test/Deserializers/PlayJPlaylistTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PlayJPlaylistTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PlayJPlaylist(); + var deserializer = new PlayJPlaylist(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/PortableExecutableTests.cs b/SabreTools.Serialization.Test/Deserializers/PortableExecutableTests.cs index 58f12d1d..476d6977 100644 --- a/SabreTools.Serialization.Test/Deserializers/PortableExecutableTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/PortableExecutableTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.PortableExecutable(); + var deserializer = new PortableExecutable(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/QuantumTests.cs b/SabreTools.Serialization.Test/Deserializers/QuantumTests.cs index db0b5de9..acfa7b78 100644 --- a/SabreTools.Serialization.Test/Deserializers/QuantumTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/QuantumTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.Quantum(); + var deserializer = new Quantum(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs b/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs index 185a0e4e..0a700a70 100644 --- a/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/RomCenterTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.RomCenter(); + var deserializer = new RomCenter(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -78,7 +79,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.RomCenter.DeserializeFile(filename); + var dat = RomCenter.DeserializeFile(filename); // Validate the values Assert.NotNull(dat?.Games?.Rom); diff --git a/SabreTools.Serialization.Test/Deserializers/SFBTests.cs b/SabreTools.Serialization.Test/Deserializers/SFBTests.cs index 80cb1689..79652837 100644 --- a/SabreTools.Serialization.Test/Deserializers/SFBTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/SFBTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.SFB(); + var deserializer = new SFB(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/SFOTests.cs b/SabreTools.Serialization.Test/Deserializers/SFOTests.cs index 925fa3ba..d3d34588 100644 --- a/SabreTools.Serialization.Test/Deserializers/SFOTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/SFOTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.SFO(); + var deserializer = new SFO(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/SGATests.cs b/SabreTools.Serialization.Test/Deserializers/SGATests.cs index 5cc46534..788a83e5 100644 --- a/SabreTools.Serialization.Test/Deserializers/SGATests.cs +++ b/SabreTools.Serialization.Test/Deserializers/SGATests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.SGA(); + var deserializer = new SGA(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs b/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs index 1c28daf2..af8ceed3 100644 --- a/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/SeparatedValueTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.SeparatedValue(); + var deserializer = new SeparatedValue(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -83,7 +84,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.SeparatedValue.DeserializeFile(filename, delim); + var dat = SeparatedValue.DeserializeFile(filename, delim); // Validate the values Assert.NotNull(dat?.Row); diff --git a/SabreTools.Serialization.Test/Deserializers/SoftwareListTests.cs b/SabreTools.Serialization.Test/Deserializers/SoftwareListTests.cs index 4192a2a4..bf2a3dc7 100644 --- a/SabreTools.Serialization.Test/Deserializers/SoftwareListTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/SoftwareListTests.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -12,7 +13,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -23,7 +24,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -34,7 +35,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -44,7 +45,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -54,7 +55,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -64,7 +65,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.SoftwareList(); + var deserializer = new SoftwareList(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -80,7 +81,7 @@ namespace SabreTools.Serialization.Test.Deserializers string filename = Path.Combine(Environment.CurrentDirectory, "TestData", path); // Deserialize the file - var dat = Serialization.Deserializers.SoftwareList.DeserializeFile(filename); + var dat = SoftwareList.DeserializeFile(filename); // Validate the values Assert.NotNull(dat); diff --git a/SabreTools.Serialization.Test/Deserializers/VBSPTests.cs b/SabreTools.Serialization.Test/Deserializers/VBSPTests.cs index 0c134429..dd4863bb 100644 --- a/SabreTools.Serialization.Test/Deserializers/VBSPTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/VBSPTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.VBSP(); + var deserializer = new VBSP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/VPKTests.cs b/SabreTools.Serialization.Test/Deserializers/VPKTests.cs index 4c2dfdb0..14cddb00 100644 --- a/SabreTools.Serialization.Test/Deserializers/VPKTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/VPKTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.VPK(); + var deserializer = new VPK(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/WAD3Tests.cs b/SabreTools.Serialization.Test/Deserializers/WAD3Tests.cs index 5c52c8c0..bff791ca 100644 --- a/SabreTools.Serialization.Test/Deserializers/WAD3Tests.cs +++ b/SabreTools.Serialization.Test/Deserializers/WAD3Tests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.WAD3(); + var deserializer = new WAD3(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/XMIDTests.cs b/SabreTools.Serialization.Test/Deserializers/XMIDTests.cs index afa942e2..6a4f756e 100644 --- a/SabreTools.Serialization.Test/Deserializers/XMIDTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/XMIDTests.cs @@ -1,3 +1,5 @@ + +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -8,7 +10,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullString_Null() { string? data = null; - var deserializer = new Serialization.Deserializers.XMID(); + var deserializer = new XMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -18,7 +20,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyString_Null() { string? data = string.Empty; - var deserializer = new Serialization.Deserializers.XMID(); + var deserializer = new XMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -28,7 +30,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidString_Null() { string? data = "INVALID"; - var deserializer = new Serialization.Deserializers.XMID(); + var deserializer = new XMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/XZPTests.cs b/SabreTools.Serialization.Test/Deserializers/XZPTests.cs index 278e5ded..ded94dc2 100644 --- a/SabreTools.Serialization.Test/Deserializers/XZPTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/XZPTests.cs @@ -1,5 +1,6 @@ using System.IO; using System.Linq; +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -11,7 +12,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = null; int offset = 0; - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -22,7 +23,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = []; int offset = 0; - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -33,7 +34,7 @@ namespace SabreTools.Serialization.Test.Deserializers { byte[]? data = [.. Enumerable.Repeat(0xFF, 1024)]; int offset = 0; - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data, offset); Assert.Null(actual); @@ -43,7 +44,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullStream_Null() { Stream? data = null; - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -53,7 +54,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyStream_Null() { Stream? data = new MemoryStream([]); - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -63,7 +64,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidStream_Null() { Stream? data = new MemoryStream([.. Enumerable.Repeat(0xFF, 1024)]); - var deserializer = new Serialization.Deserializers.XZP(); + var deserializer = new XZP(); var actual = deserializer.Deserialize(data); Assert.Null(actual); diff --git a/SabreTools.Serialization.Test/Deserializers/XeMIDTests.cs b/SabreTools.Serialization.Test/Deserializers/XeMIDTests.cs index b4683590..acd4dd3a 100644 --- a/SabreTools.Serialization.Test/Deserializers/XeMIDTests.cs +++ b/SabreTools.Serialization.Test/Deserializers/XeMIDTests.cs @@ -1,3 +1,4 @@ +using SabreTools.Serialization.Deserializers; using Xunit; namespace SabreTools.Serialization.Test.Deserializers @@ -8,7 +9,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void NullString_Null() { string? data = null; - var deserializer = new Serialization.Deserializers.XeMID(); + var deserializer = new XeMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -18,7 +19,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void EmptyString_Null() { string? data = string.Empty; - var deserializer = new Serialization.Deserializers.XeMID(); + var deserializer = new XeMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual); @@ -28,7 +29,7 @@ namespace SabreTools.Serialization.Test.Deserializers public void InvalidString_Null() { string? data = "INVALID"; - var deserializer = new Serialization.Deserializers.XeMID(); + var deserializer = new XeMID(); var actual = deserializer.Deserialize(data); Assert.Null(actual);