Skip to content

Fixing null checks in equality operators #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Fixing null checks in equality operators #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a4b886
Fixing null checks in equality operators
CoryCharlton Jan 28, 2024
308dc9d
Skipping tests during CI
CoryCharlton Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Tests/IPAddressTests/IPAddressTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,18 +307,26 @@ public void Equality_Tests()
{
var privateAddress = IPAddress.Parse("192.168.0.1");
var publicAddress = IPAddress.Parse("1.1.1.1");
IPAddress defaultAddress = default;
IPAddress nullAddress = null;

// Is
Assert.IsTrue(nullAddress is null, "nullAddress is null");

// Equal
Assert.AreEqual(privateAddress, IPAddress.Parse("192.168.0.1"));
Assert.AreEqual(publicAddress, IPAddress.Parse("1.1.1.1"));
Assert.IsTrue(privateAddress == new IPAddress(new byte[] { 192, 168, 0, 1 }), "192.168.0.1 == 192.168.0.1");
Assert.IsTrue(publicAddress == new IPAddress(new byte[] { 1, 1, 1, 1 }), "1.1.1.1 == 1.1.1.1");
Assert.IsTrue(defaultAddress == default, "default == default");
Assert.IsTrue(nullAddress == null, "nullAddress == null");

// Not Equal
Assert.AreNotEqual(privateAddress, IPAddress.Parse("1.1.1.1"));
Assert.AreNotEqual(publicAddress, IPAddress.Parse("192.168.0.1"));
Assert.IsTrue(privateAddress != new IPAddress(new byte[] { 192, 168, 0, 2 }), "192.168.0.1 == 192.168.0.2");
Assert.IsTrue(publicAddress != new IPAddress(new byte[] { 1, 1, 1, 2 }), "1.1.1.1 == 1.1.1.2");
Assert.IsTrue((IPAddress) null != privateAddress, "(IPAddress) null != privateAddress");
}
}
}
10 changes: 9 additions & 1 deletion nanoFramework.System.Net/IPAddress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,15 @@ public IPAddress(byte[] address)
/// <param name="a">The <see cref="IPAddress"/> to compare with <paramref name="b"/>.</param>
/// <param name="b">The <see cref="IPAddress"/> to compare with <paramref name="a"/>.</param>
/// <returns><see langword="true"/> if <paramref name="b"/> is equal to <paramref name="a"/>; otherwise, <see langword="false"/>.</returns>
public static bool operator ==(IPAddress a, IPAddress b) => a is not null && a.Equals(b);
public static bool operator ==(IPAddress a, IPAddress b)
{
if (a is null && b is null)
{
return true;
}

return a is not null && a.Equals(b);
}

/// <summary>
/// Indicates whether two <see cref="IPAddress"/> objects are not equal.
Expand Down