X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FCidr.hs;h=af9c9e8ba55a6c9aaaa5190baf4800599a1623cc;hb=a8c2d85d8611f7f56eaa0c3406ec423d68f81f96;hp=e353406d9eaa7303d6ba437d99d79083ffa1f586;hpb=8a3ca8823d4e8b8adbf3060ec056aafaf9813ded;p=hath.git

diff --git a/src/Cidr.hs b/src/Cidr.hs
index e353406..af9c9e8 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -23,12 +23,13 @@ import Data.List (nub)
 import Data.List.Split (splitOneOf)
 import Data.Maybe (catMaybes, mapMaybe)
 
-import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty ( TestTree, localOption, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Test.Tasty.QuickCheck (
   Arbitrary( arbitrary ),
   Gen,
   Property,
+  QuickCheckTests( QuickCheckTests ),
   (==>),
   testProperty )
 import Text.Read (readMaybe)
@@ -303,7 +304,10 @@ cidr_properties =
       prop_all_cidrs_contain_themselves,
       prop_contains_proper_antisymmetric,
       prop_normalize_idempotent,
-      prop_normalize_preserves_equality ]
+      prop_normalize_preserves_equality,
+      prop_ord_instance_antisymmetric,
+      prop_ord_instance_reflexive,
+      prop_ord_instance_transitive ]
 
 
 -- HUnit Tests
@@ -548,7 +552,7 @@ prop_contains_proper_antisymmetric =
 -- Running "normalize" a second time shouldn't do anything.
 prop_normalize_idempotent :: TestTree
 prop_normalize_idempotent =
-  testProperty "The CIDR \"normalize\" function is idempotent " prop
+  testProperty "The CIDR \"normalize\" function is idempotent" prop
   where
     prop :: Cidr -> Bool
     prop cidr = (normalize cidr) == (normalize (normalize cidr))
@@ -556,7 +560,36 @@ prop_normalize_idempotent =
 -- Normalization should not affect equality of two CIDRs.
 prop_normalize_preserves_equality :: TestTree
 prop_normalize_preserves_equality =
-  testProperty "The CIDR \"normalize\" function preserves equality " prop
+  testProperty "The CIDR \"normalize\" function preserves equality" prop
   where
     prop :: Cidr -> Cidr -> Bool
     prop cidr1 cidr2 = (cidr1 == cidr2) == (normalize cidr1 == normalize cidr2)
+
+
+prop_ord_instance_reflexive :: TestTree
+prop_ord_instance_reflexive =
+  testProperty "The CIDR order is reflexive" prop
+  where
+    prop :: Cidr -> Bool
+    prop cidr = cidr <= cidr
+
+
+prop_ord_instance_transitive :: TestTree
+prop_ord_instance_transitive =
+  testProperty "The CIDR order is transitive" prop
+  where
+    prop :: Cidr -> Cidr -> Cidr -> Property
+    prop cidr1 cidr2 cidr3 =
+      (cidr1 <= cidr2 && cidr2 <= cidr3) ==> cidr1 <= cidr3
+
+-- This is how Eq is currently implemented, but it is useful to have
+-- around in case that changes. Try fewer instances of this than usual
+-- because it's a rare condition.
+prop_ord_instance_antisymmetric :: TestTree
+prop_ord_instance_antisymmetric =
+  localOption (QuickCheckTests 500) $
+    testProperty "The CIDR order is antisymmetric" prop
+  where
+    prop :: Cidr -> Cidr -> Property
+    prop cidr1 cidr2 =
+      (cidr1 <= cidr2 && cidr2 <= cidr1) ==> cidr1 == cidr2