X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=98c42c7e6bdab38a0f2d1da47c142aba445c7182;hb=c5ea6135a25e8c9e108c34ebb0d0cbb4b4af1e6d;hp=7bb3ac2c41229b286f67f39a8ce58c24274171b7;hpb=6257f1c59c5c9663f8d95996c1c35362417def71;p=hath.git

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 7bb3ac2..98c42c7 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -2,7 +2,11 @@ module Cidr
 ( Cidr(..),
   cidr_from_string,
   cidr_tests,
-  combine_all
+  combine_all,
+  contains,
+  contains_proper,
+  prop_all_cidrs_contain_themselves,
+  prop_contains_proper_intransitive
 ) where
 
 import Data.List (nubBy)
@@ -123,7 +127,7 @@ contains (Cidr addr1 mbits1) (Cidr addr2 mbits2)
 
 contains_proper :: Cidr -> Cidr -> Bool
 contains_proper cidr1 cidr2 =
-    (cidr1 `contains` cidr2) && (not (cidr1 == cidr2))
+    (cidr1 `contains` cidr2) && (not (cidr2 `contains` cidr1))
 
 
 -- A CIDR range is redundant (with respect to the given list) if
@@ -260,7 +264,7 @@ test_adjacent4 =
 
 test_combine_contained1 :: Test
 test_combine_contained1 =
-    TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_all test_cidrs)
+    TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_contained test_cidrs)
     where
       cidr1 = cidr_from_string "10.0.0.0/8"
       cidr2 = cidr_from_string "10.1.0.0/16"
@@ -271,9 +275,32 @@ test_combine_contained1 =
 
 test_combine_contained2 :: Test
 test_combine_contained2 =
-    TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1])
+    TestCase $ assertEqual "192.168.3.0/23 does not contain 192.168.1.0/24" [cidr1, cidr2] (combine_contained [cidr1, cidr2])
     where
-      cidr1 = cidr_from_string "192.168.1.0/24"
+      cidr1 = cidr_from_string "192.168.3.0/23"
+      cidr2 = cidr_from_string "192.168.1.0/24"
+
+
+test_combine_all1 :: Test
+test_combine_all1 =
+    TestCase $ assertEqual "10.0.0.0/24 is adjacent to 10.0.1.0/24 and 10.0.3.0/23 contains 10.0.2.0/24" expected_cidrs (combine_all test_cidrs)
+    where
+      cidr1 = cidr_from_string "10.0.0.0/24"
+      cidr2 = cidr_from_string "10.0.1.0/24"
+      cidr3 = cidr_from_string "10.0.2.0/24"
+      cidr4 = cidr_from_string "10.0.3.0/23"
+      cidr5 = cidr_from_string "10.0.0.0/23"
+      expected_cidrs = [cidr4, cidr5]
+      test_cidrs = [cidr1, cidr2, cidr3, cidr4]
+
+
+test_combine_all2 :: Test
+test_combine_all2 =
+    TestCase $ assertEqual "127.0.0.1/32 combines with itself recursively" expected_cidrs (combine_all test_cidrs)
+    where
+      cidr1 = cidr_from_string "127.0.0.1/32"
+      expected_cidrs = [cidr1]
+      test_cidrs = [cidr1, cidr1, cidr1, cidr1, cidr1]
 
 
 cidr_tests :: [Test]
@@ -287,5 +314,20 @@ cidr_tests = [ test_equality1,
                test_adjacent3,
                test_adjacent4,
                test_combine_contained1,
-               test_combine_contained2
+               test_combine_contained2,
+               test_combine_all1,
+               test_combine_all2
              ]
+
+
+-- QuickCheck Tests
+prop_all_cidrs_contain_themselves :: Cidr -> Bool
+prop_all_cidrs_contain_themselves cidr1 = cidr1 `contains` cidr1
+
+
+-- If cidr1 properly contains cidr2, then by definition cidr2
+-- does not properly contain cidr1.
+prop_contains_proper_intransitive :: Cidr -> Cidr -> Property
+prop_contains_proper_intransitive cidr1 cidr2 =
+    (cidr1 `contains_proper` cidr2) ==>
+      (not (cidr2 `contains_proper` cidr1))