mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
General code cleanup and style refactor.
This commit is contained in:
@@ -1,14 +1,11 @@
|
||||
|
||||
|
||||
// ReSharper disable InconsistentNaming
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
using Aaru.Decoders.SecureDigital;
|
||||
using Aaru.Helpers;
|
||||
using FluentAssertions.Execution;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
[TestFixture]
|
||||
public class CID
|
||||
{
|
||||
@@ -67,13 +64,13 @@ public class CID
|
||||
[Test]
|
||||
public void Test()
|
||||
{
|
||||
for(var i = 0; i < cards.Length; i++)
|
||||
for(int i = 0; i < cards.Length; i++)
|
||||
using(new AssertionScope())
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
int count = Marshal.ConvertFromHexAscii(cids[i], out byte[] response);
|
||||
Assert.AreEqual(16, count, $"Size - {cards[i]}");
|
||||
Aaru.Decoders.SecureDigital.CID cid = Decoders.DecodeCID(response);
|
||||
Decoders.SecureDigital.CID cid = Decoders.SecureDigital.Decoders.DecodeCID(response);
|
||||
Assert.IsNotNull(cid, $"Decoded - {cards[i]}");
|
||||
Assert.AreEqual(manufacturers[i], cid.Manufacturer, $"Manufacturer - {cards[i]}");
|
||||
Assert.AreEqual(applications[i], cid.ApplicationID, $"Application ID - {cards[i]}");
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
|
||||
|
||||
// ReSharper disable InconsistentNaming
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
using Aaru.Decoders.SecureDigital;
|
||||
using Aaru.Helpers;
|
||||
using FluentAssertions.Execution;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
[TestFixture]
|
||||
public class CSD
|
||||
{
|
||||
@@ -161,13 +158,13 @@ public class CSD
|
||||
[Test]
|
||||
public void Test()
|
||||
{
|
||||
for(var i = 0; i < cards.Length; i++)
|
||||
for(int i = 0; i < cards.Length; i++)
|
||||
using(new AssertionScope())
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
int count = Marshal.ConvertFromHexAscii(csds[i], out byte[] response);
|
||||
Assert.AreEqual(16, count, $"Size - {cards[i]}");
|
||||
Aaru.Decoders.SecureDigital.CSD csd = Decoders.DecodeCSD(response);
|
||||
Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(response);
|
||||
Assert.IsNotNull(csd, $"Decoded - {cards[i]}");
|
||||
Assert.AreEqual(structure_versions[i], csd.Structure, $"Version - {cards[i]}");
|
||||
Assert.AreEqual(taacs[i], csd.TAAC, $"TAAC - {cards[i]}");
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
|
||||
|
||||
// ReSharper disable InconsistentNaming
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
using Aaru.Decoders.SecureDigital;
|
||||
using Aaru.Helpers;
|
||||
using FluentAssertions.Execution;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Aaru.Tests.Devices.SecureDigital;
|
||||
|
||||
[TestFixture]
|
||||
public class SCR
|
||||
{
|
||||
@@ -139,13 +137,13 @@ public class SCR
|
||||
[Test]
|
||||
public void Test()
|
||||
{
|
||||
for(var i = 0; i < cards.Length; i++)
|
||||
for(int i = 0; i < cards.Length; i++)
|
||||
using(new AssertionScope())
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
int count = Marshal.ConvertFromHexAscii(scrs[i], out byte[] response);
|
||||
Assert.AreEqual(8, count, $"Size - {cards[i]}");
|
||||
Aaru.Decoders.SecureDigital.SCR scr = Decoders.DecodeSCR(response);
|
||||
Decoders.SecureDigital.SCR scr = Decoders.SecureDigital.Decoders.DecodeSCR(response);
|
||||
Assert.IsNotNull(scr, $"Decoded - {cards[i]}");
|
||||
Assert.AreEqual(structure_version[i], scr.Structure, $"Version - {cards[i]}");
|
||||
Assert.AreEqual(specification_version[i], scr.Spec, $"Specification version - {cards[i]}");
|
||||
|
||||
Reference in New Issue
Block a user