Skip to content

Commit

Permalink
make Cidr#toString output a valid cidr range consisting of prefix/bits
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnhoekstra committed Oct 17, 2023
1 parent 1f9c0a1 commit 7cf0c6b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion shared/src/main/scala/com/comcast/ip4s/Cidr.scala
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ final class Cidr[+A <: IpAddress] private (val address: A, val prefixBits: Int)
a => a >= start && a <= end
}

override def toString: String = s"$address/$prefixBits"
override def toString: String = s"$prefix/$prefixBits"
override def hashCode: Int = MurmurHash3.productHash((prefix, prefixBits), productPrefix.hashCode)
override def equals(other: Any): Boolean =
other match {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ class CidrTest extends BaseTestSuite {
}

property("toString prints prefix") {
forAll { (cidr: Cidr[IpAddress]) => assert(cidr.toString.contains(cidr.prefix.toString)) }
forAll { (cidr: Cidr[IpAddress]) => assert(cidr.toString.contains(cidr.prefix.toString)) }
}

property("ranges that include the same elements are equal") {
forAll { (cidr: Cidr[IpAddress]) =>
forAll { (cidr: Cidr[IpAddress]) =>
val first = Cidr(cidr.prefix, cidr.prefixBits)
val last = Cidr(cidr.last, cidr.prefixBits)
assertEquals(first, last)
Expand Down

0 comments on commit 7cf0c6b

Please sign in to comment.