From 8430f78a834a85ca58cf1b445380679da6b9fc4e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 17 Apr 2017 09:52:29 -0400 Subject: [PATCH] Ensure sane ordering of CIDRs with equal masks with a new property. --- src/Cidr.hs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Cidr.hs b/src/Cidr.hs index af9c9e8..007e94b 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -307,7 +307,8 @@ cidr_properties = prop_normalize_preserves_equality, prop_ord_instance_antisymmetric, prop_ord_instance_reflexive, - prop_ord_instance_transitive ] + prop_ord_instance_transitive, + prop_ord_uses_addr_when_masks_equal ] -- HUnit Tests @@ -593,3 +594,18 @@ prop_ord_instance_antisymmetric = prop :: Cidr -> Cidr -> Property prop cidr1 cidr2 = (cidr1 <= cidr2 && cidr2 <= cidr1) ==> cidr1 == cidr2 + + +-- When comparing two CIDRs with the same mask, the comparison +-- should be numeric (i.e. whatever the IPv4Address does). +-- Of course, we have to normalize first. +prop_ord_uses_addr_when_masks_equal :: TestTree +prop_ord_uses_addr_when_masks_equal = + testProperty "The CIDR order is the IPv4Address order for equal masks" prop + where + prop :: Cidr -> Cidr -> Property + prop cidr1 cidr2 = + (mask1 == mask2) ==> (cidr1 <= cidr2) == (addr1 <= addr2) + where + (Cidr addr1 mask1) = normalize cidr1 + (Cidr addr2 mask2) = normalize cidr2 -- 2.43.2