X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=94de1234c4ae9616f7b9d351a5b9a0f6ba434bc7;hb=a23ed449c784cdf81501c696bec10b1fbaeefc5f;hp=d6bb66106fa92b947172101d870ba2142283806c;hpb=efe82ac98887fb6326f2ba0bce0cb4b179959d3b;p=hath.git diff --git a/src/Cidr.hs b/src/Cidr.hs index d6bb661..94de123 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -2,11 +2,16 @@ 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) import Test.HUnit +import Test.QuickCheck import IPv4Address import ListUtils @@ -25,6 +30,15 @@ instance Show Cidr where show cidr = (show (ipv4address cidr)) ++ "/" ++ (show (maskbits cidr)) +instance Arbitrary Cidr where + arbitrary = do + ipv4 <- arbitrary :: Gen IPv4Address + mask <- arbitrary :: Gen Maskbits + return (Cidr ipv4 mask) + + coarbitrary _ = variant 0 + + -- Two CIDR ranges are equivalent if they have the same network bits -- and the masks are the same. equivalent :: Cidr -> Cidr -> Bool @@ -113,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 @@ -248,6 +262,24 @@ test_adjacent4 = cidr2 = cidr_from_string "10.1.2.0/24" +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) + where + cidr1 = cidr_from_string "10.0.0.0/8" + cidr2 = cidr_from_string "10.1.0.0/16" + cidr3 = cidr_from_string "10.1.1.0/24" + expected_cidrs = [cidr1] + test_cidrs = [cidr1, cidr2, cidr3] + + +test_combine_contained2 :: Test +test_combine_contained2 = + TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1]) + where + cidr1 = cidr_from_string "192.168.1.0/24" + + cidr_tests :: [Test] cidr_tests = [ test_equality1, test_contains1, @@ -257,5 +289,20 @@ cidr_tests = [ test_equality1, test_adjacent1, test_adjacent2, test_adjacent3, - test_adjacent4 + test_adjacent4, + test_combine_contained1, + test_combine_contained2 ] + + +-- 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))