Skip to content

Commit c8609e7

Browse files
patrick-dmxcpatrick-dmxc
committed
Refactor some ToString Methodes
Bump v0.0.4
1 parent 984d34d commit c8609e7

File tree

11 files changed

+59
-4
lines changed

11 files changed

+59
-4
lines changed

Diff for: ‎WellKnownDataTypes-Tests/Light/ArtNet/Address_Tests.cs

+8
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ public void TestAddress()
4646
Assert.That(new Address(16).Equals(null), Is.False);
4747
Assert.That(new Address(16), Is.Not.EqualTo(null));
4848
Assert.That(new Address(16).ToString(), Is.Not.Empty);
49+
Assert.That(new Address(1).ToString, Is.EqualTo("1"));
50+
Assert.That(new Address(2).ToString, Is.EqualTo("2"));
51+
Assert.That(new Address(1).ToStringDetailed(), Is.EqualTo("Address: 1(0x01) | Subnet: 0(0x0), Universe: 1(0x1)"));
52+
Assert.That(new Address(2).ToStringDetailed(), Is.EqualTo("Address: 2(0x02) | Subnet: 0(0x0), Universe: 2(0x2)"));
53+
Assert.That(new Address(15).ToStringDetailed(), Is.EqualTo("Address: 15(0x0f) | Subnet: 0(0x0), Universe: 15(0xf)"));
54+
Assert.That(new Address(16).ToStringDetailed(), Is.EqualTo("Address: 16(0x10) | Subnet: 1(0x1), Universe: 0(0x0)"));
55+
Assert.That(new Address(255).ToStringDetailed(), Is.EqualTo("Address: 255(0xff) | Subnet: 15(0xf), Universe: 15(0xf)"));
56+
Assert.That(new Address(0xdd).ToStringDetailed(), Is.EqualTo("Address: 221(0xdd) | Subnet: 13(0xd), Universe: 13(0xd)"));
4957
});
5058

5159
HashSet<Address> addresses = new HashSet<Address>();

Diff for: ‎WellKnownDataTypes-Tests/Light/ArtNet/Net_Tests.cs

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public void TestNet()
4646
Assert.That(new Net(1).Equals((object)(Net)1), Is.True);
4747
Assert.That(new Net(1).Equals((Net)1), Is.True);
4848
Assert.That(new Net(1).Equals((Net)2), Is.False);
49+
Assert.That(new Net(1).ToString, Is.EqualTo("1"));
50+
Assert.That(new Net(2).ToString, Is.EqualTo("2"));
51+
Assert.That(new Net(1).ToStringDetailed(), Is.EqualTo("Net: 1(0x01)"));
52+
Assert.That(new Net(2).ToStringDetailed(), Is.EqualTo("Net: 2(0x02)"));
53+
Assert.That(new Net(15).ToStringDetailed(), Is.EqualTo("Net: 15(0x0f)"));
54+
Assert.That(new Net(16).ToStringDetailed(), Is.EqualTo("Net: 16(0x10)"));
4955
});
5056
}
5157

Diff for: ‎WellKnownDataTypes-Tests/Light/ArtNet/PortAddress_Tests.cs

+9
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ public void TestPortAddress()
5050
Assert.That(new PortAddress(1).Equals((object)(PortAddress)1), Is.True);
5151
Assert.That(new PortAddress(1).Equals((PortAddress)1), Is.True);
5252
Assert.That(new PortAddress(1).Equals((PortAddress)2), Is.False);
53+
Assert.That(new PortAddress(1).ToString, Is.EqualTo("1"));
54+
Assert.That(new PortAddress(2).ToString, Is.EqualTo("2"));
55+
Assert.That(new PortAddress(1).ToStringDetailed(), Is.EqualTo("PortAddress: 1(0x0001) | Net: 0(0x00), Subnet: 0(0x0), Universe: 1(0x1)"));
56+
Assert.That(new PortAddress(2).ToStringDetailed(), Is.EqualTo("PortAddress: 2(0x0002) | Net: 0(0x00), Subnet: 0(0x0), Universe: 2(0x2)"));
57+
Assert.That(new PortAddress(15).ToStringDetailed(), Is.EqualTo("PortAddress: 15(0x000f) | Net: 0(0x00), Subnet: 0(0x0), Universe: 15(0xf)"));
58+
Assert.That(new PortAddress(16).ToStringDetailed(), Is.EqualTo("PortAddress: 16(0x0010) | Net: 0(0x00), Subnet: 1(0x1), Universe: 0(0x0)"));
59+
Assert.That(new PortAddress(255).ToStringDetailed(), Is.EqualTo("PortAddress: 255(0x00ff) | Net: 0(0x00), Subnet: 15(0xf), Universe: 15(0xf)"));
60+
Assert.That(new PortAddress(0xdd).ToStringDetailed(), Is.EqualTo("PortAddress: 221(0x00dd) | Net: 0(0x00), Subnet: 13(0xd), Universe: 13(0xd)"));
61+
Assert.That(new PortAddress(0x7ddd).ToStringDetailed(), Is.EqualTo("PortAddress: 32221(0x7ddd) | Net: 125(0x7d), Subnet: 13(0xd), Universe: 13(0xd)"));
5362
});
5463
}
5564

Diff for: ‎WellKnownDataTypes-Tests/Light/ArtNet/Subnet_Tests.cs

+6
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ public void TestSubnet()
4848
Assert.That(new Subnet(1).Equals((Subnet)1), Is.True);
4949
Assert.That(new Subnet(1).Equals((Subnet)2), Is.False);
5050
Assert.That(new Subnet(0).Equals(Subnet.Default), Is.True);
51+
Assert.That(new Subnet(1).ToString, Is.EqualTo("1"));
52+
Assert.That(new Subnet(2).ToString, Is.EqualTo("2"));
53+
Assert.That(new Subnet(1).ToStringDetailed(), Is.EqualTo("Subnet: 1(0x1)"));
54+
Assert.That(new Subnet(2).ToStringDetailed(), Is.EqualTo("Subnet: 2(0x2)"));
55+
Assert.That(new Subnet(15).ToStringDetailed(), Is.EqualTo("Subnet: 15(0xf)"));
56+
Assert.Throws(typeof(ArgumentException), () => new Subnet(16).ToStringDetailed());
5157
});
5258
}
5359
[Test]

Diff for: ‎WellKnownDataTypes-Tests/Light/ArtNet/Universe_Tests.cs

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ public void TestUniverse()
4747
Assert.That(new Universe(1).Equals((Universe)1), Is.True);
4848
Assert.That(new Universe(1).Equals((Universe)2), Is.False);
4949
Assert.That(new Universe(0).Equals(Universe.Default), Is.True);
50+
Assert.That(new Universe(1).ToString, Is.EqualTo("1"));
51+
Assert.That(new Universe(2).ToString, Is.EqualTo("2"));
52+
Assert.That(new Universe(1).ToStringDetailed(), Is.EqualTo("Universe: 1(0x1)"));
53+
Assert.That(new Universe(2).ToStringDetailed(), Is.EqualTo("Universe: 2(0x2)"));
54+
Assert.That(new Universe(15).ToStringDetailed(), Is.EqualTo("Universe: 15(0xf)"));
55+
Assert.Throws(typeof(ArgumentException), () => new Universe(16).ToStringDetailed());
5056
});
5157
}
5258
[Test]

Diff for: ‎WellKnownDataTypes/Light/ArtNet/Address.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ public override int GetHashCode()
5757
}
5858
public override string ToString()
5959
{
60-
return $"{Combined}(0x{Combined:x2}) / Subnet: {Subnet}(0x{Subnet:x1}), Universe: {Universe}(0x{Universe:x1})";
60+
return Combined.ToString();
61+
}
62+
public string ToStringDetailed()
63+
{
64+
return $"Address: {Combined}(0x{Combined:x2}) | {Subnet.ToStringDetailed()}, {Universe.ToStringDetailed()}";
6165
}
6266

6367
public static bool operator ==(in Address a, in Address b)

Diff for: ‎WellKnownDataTypes/Light/ArtNet/Net.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ public override int GetHashCode()
4242
}
4343
public override string ToString()
4444
{
45-
return $"Net: {Value}(0x{Value:x})";
45+
return Value.ToString();
46+
}
47+
public string ToStringDetailed()
48+
{
49+
return $"Net: {Value}(0x{Value:x2})";
4650
}
4751

4852
public static bool operator ==(in Net a, in Net b)

Diff for: ‎WellKnownDataTypes/Light/ArtNet/PortAddress.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ public override int GetHashCode()
8080
}
8181
public override string ToString()
8282
{
83-
return $"{Combined}(0x{Combined:x4}) / {Net}, {Subnet}, {Universe}";
83+
return Combined.ToString();
84+
}
85+
public string ToStringDetailed()
86+
{
87+
return $"PortAddress: {Combined}(0x{Combined:x4}) | {Net.ToStringDetailed()}, {Subnet.ToStringDetailed()}, {Universe.ToStringDetailed()}";
8488
}
8589

8690
public static bool operator ==(in PortAddress a, in PortAddress b)

Diff for: ‎WellKnownDataTypes/Light/ArtNet/Subnet.cs

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ public override int GetHashCode()
4242
return hashCode;
4343
}
4444
public override string ToString()
45+
{
46+
return Value.ToString();
47+
}
48+
public string ToStringDetailed()
4549
{
4650
return $"Subnet: {Value}(0x{Value:x1})";
4751
}

Diff for: ‎WellKnownDataTypes/Light/ArtNet/Universe.cs

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ public override int GetHashCode()
4242
return hashCode;
4343
}
4444
public override string ToString()
45+
{
46+
return Value.ToString();
47+
}
48+
public string ToStringDetailed()
4549
{
4650
return $"Universe: {Value}(0x{Value:x1})";
4751
}

Diff for: ‎WellKnownDataTypes/WellKnownDataTypes.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
44
<PackageLicenseFile>LICENSE</PackageLicenseFile>
5-
<Version>0.0.3</Version>
5+
<Version>0.0.4</Version>
66
<RepositoryUrl>https://github.com/DMXControl/WellKnownDataTypes</RepositoryUrl>
77
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
88
<PackageReadmeFile>README.md</PackageReadmeFile>

0 commit comments

Comments
 (0)