Skip to content

Begin and End property setter should re-create Operator instance. #69

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

Closed
sudoudaisuke wants to merge 2 commits into from
Closed

Begin and End property setter should re-create Operator instance. #69

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
baa5d2c
Update IPAddressRangeTest.cs
sudoudaisuke Feb 22, 2021
071403f
Update IPAddressRange.cs
sudoudaisuke Feb 22, 2021
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
24 changes: 24 additions & 0 deletions IPAddressRange.Test/IPAddressRangeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,30 @@ public void CtorTest_MaskLength()
range.Contains(range.Begin).Is(true);
}

[TestMethod]
public void CtorTest_IPv4_BeginEndAddresses()
{
var range = new IPAddressRange(
begin: IPAddress.Parse("192.168.0.0"),
end: IPAddress.Parse("192.168.0.255"));

range.Contains(IPAddress.Parse("192.168.0.10")).Is(true);
range.Contains(IPAddress.Parse("192.169.0.10")).Is(false);
}

[TestMethod]
public void CtorTest_IPv4_BeginEndAddresses_ObjectInitializer()
{
var range = new IPAddressRange
{
Begin = IPAddress.Parse("192.168.0.0"),
End = IPAddress.Parse("192.168.0.255")
};

range.Contains(IPAddress.Parse("192.168.0.10")).Is(true);
range.Contains(IPAddress.Parse("192.169.0.10")).Is(false);
}

[TestMethod]
public void CtorTest_IPv6_BeginEndAddresses()
{
Expand Down
23 changes: 21 additions & 2 deletions IPAddressRange/IPAddressRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,28 @@ public class IPAddressRange : IEnumerable<IPAddress>, IReadOnlyDictionary<string
// Pattern 4. Bit mask range: "192.168.0.0/255.255.255.0"
private static Regex m4_regex = new Regex(@"^(?<adr>([\d.]+)|([\da-f:]+(:[\d.]+)?(%\w+)?))[ \t]*/[ \t]*(?<bitmask>[\da-f\.:]+)$", RegexOptions.IgnoreCase | RegexOptions.Compiled);

public IPAddress Begin { get; set; }
private IPAddress BeginValue;
public IPAddress Begin
{
get => BeginValue;
set
{
if (BeginValue == value) return;
BeginValue = value;
if (Operator != null) Operator = RangeOperatorFactory.Create(this);
}
}

public IPAddress End { get; set; }
private IPAddress EndValue;
public IPAddress End {
get => EndValue;
set
{
if (EndValue == value) return;
EndValue = value;
if (Operator != null) Operator = RangeOperatorFactory.Create(this);
}
}

private IRangeOperator Operator { get; set; }

Expand Down