X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=src%2FCidr.hs;h=d6acdcfc9f8237d6e4a9b794c676faac3ae3ceb6;hp=b5b3f744fd56651848387d7e010766bd328adb19;hb=45ac9baca360d0f0dabe4576fb44c1634a50dbf7;hpb=18a81546e7c4ad10574918efb08b2e104e911d73

diff --git a/src/Cidr.hs b/src/Cidr.hs
index b5b3f74..d6acdcf 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -32,11 +32,11 @@ import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.QuickCheck (Arbitrary(..), Gen, Property, (==>))
 import Text.Read (readMaybe)
 
-import qualified Bit as B
-import IPv4Address
-import Maskable
-import Maskbits
-import Octet
+import qualified Bit as B (Bit(..))
+import IPv4Address (IPv4Address(..), most_sig_bit_different)
+import Maskable (Maskable(..))
+import Maskbits (Maskbits(..))
+import Octet (Octet(..))
 
 
 data Cidr = Cidr { ipv4address :: IPv4Address,
@@ -69,7 +69,7 @@ equivalent (Cidr addr1 mbits1) (Cidr addr2 mbits2) =
 --   after the trailing slash.
 maskbits_from_cidr_string :: String -> Maybe Maskbits
 maskbits_from_cidr_string s
-  | length partlist == 2 = maskbits_from_string (partlist !! 1)
+  | length partlist == 2 = readMaybe (partlist !! 1)
   | otherwise = Nothing
     where
       partlist = splitOneOf "/" s
@@ -236,7 +236,7 @@ combine_adjacent :: Cidr -> Cidr -> Maybe Cidr
 combine_adjacent cidr1 cidr2
   | not (adjacent cidr1 cidr2) = Nothing
   | (maskbits cidr1 == Zero) = Nothing
-  | otherwise = Just $ cidr1 { maskbits = decrement (maskbits cidr1) }
+  | otherwise = Just $ cidr1 { maskbits = pred (maskbits cidr1) }
 
 
 
@@ -259,8 +259,57 @@ adjacent cidr1 cidr2
 enumerate :: Cidr -> [IPv4Address]
 enumerate cidr = [(min_host cidr)..(max_host cidr)]
 
+-- Test lists.
+cidr_tests :: Test
+cidr_tests =
+  testGroup "CIDR Tests" [
+    test_enumerate,
+    test_min_host1,
+    test_max_host1,
+    test_equality1,
+    test_contains1,
+    test_contains2,
+    test_contains_proper1,
+    test_contains_proper2,
+    test_adjacent1,
+    test_adjacent2,
+    test_adjacent3,
+    test_adjacent4,
+    test_combine_contained1,
+    test_combine_contained2,
+    test_combine_all1,
+    test_combine_all2,
+    test_combine_all3 ]
+
+cidr_properties :: Test
+cidr_properties =
+  testGroup "CIDR Properties" [
+    testProperty
+      "All CIDRs contain themselves"
+      prop_all_cidrs_contain_themselves,
+
+    testProperty
+      "contains_proper is intransitive"
+      prop_contains_proper_intransitive
+  ]
+
 
 -- HUnit Tests
+test_enumerate :: Test
+test_enumerate =
+  testCase desc $ assertEqual desc expected actual
+  where
+    desc = "192.168.0.240/30 is enumerated correctly"
+    oct1 = toEnum 192
+    oct2 = toEnum 168
+    oct3 = minBound
+    mk_ip = IPv4Address oct1 oct2 oct3
+    addr1 = mk_ip $ toEnum 240
+    addr2 = mk_ip $ toEnum 241
+    addr3 = mk_ip $ toEnum 242
+    addr4 = mk_ip $ toEnum 243
+    expected = [addr1, addr2, addr3, addr4]
+    actual = enumerate $ fromJust $ cidr_from_string "192.168.0.240/30"
 
 test_min_host1 :: Test
 test_min_host1 =
@@ -480,27 +529,6 @@ test_combine_all3 =
     test_cidrs = [cidr1, cidr2, cidr3, cidr4]
 
 
-cidr_tests :: Test
-cidr_tests =
-  testGroup "CIDR Tests" [
-    test_min_host1,
-    test_max_host1,
-    test_equality1,
-    test_contains1,
-    test_contains2,
-    test_contains_proper1,
-    test_contains_proper2,
-    test_adjacent1,
-    test_adjacent2,
-    test_adjacent3,
-    test_adjacent4,
-    test_combine_contained1,
-    test_combine_contained2,
-    test_combine_all1,
-    test_combine_all2,
-    test_combine_all3 ]
-
-
 -- QuickCheck Tests
 prop_all_cidrs_contain_themselves :: Cidr -> Bool
 prop_all_cidrs_contain_themselves cidr1 = cidr1 `contains` cidr1
@@ -512,15 +540,3 @@ prop_contains_proper_intransitive :: Cidr -> Cidr -> Property
 prop_contains_proper_intransitive cidr1 cidr2 =
     (cidr1 `contains_proper` cidr2) ==>
       (not (cidr2 `contains_proper` cidr1))
-
-cidr_properties :: Test
-cidr_properties =
-  testGroup "CIDR Properties" [
-    testProperty
-      "All CIDRs contain themselves"
-      prop_all_cidrs_contain_themselves,
-
-    testProperty
-      "contains_proper is intransitive"
-      prop_contains_proper_intransitive
-  ]