X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMaskable.hs;h=4f028a02ae519b731a5922479a7bd01a2370179d;hb=a767881c16a119a90ff80d9c14106348d8bc310d;hp=40cd9ccddf7ac8f6952bc34c97fca964aa8486d4;hpb=a34db6dec4124cb42473d61d92a59df66b2609da;p=hath.git

diff --git a/src/Maskable.hs b/src/Maskable.hs
index 40cd9cc..4f028a0 100644
--- a/src/Maskable.hs
+++ b/src/Maskable.hs
@@ -1,5 +1,7 @@
 module Maskable where
 
+import Test.HUnit
+
 import qualified Bit as B
 import IPv4Address
 import Maskbits
@@ -40,37 +42,37 @@ instance Maskable IPv4Address where
     apply_mask _ Maskbits.None = IPv4Address.None
     apply_mask addr mask
         | mask == ThirtyTwo = ipv4address_from_octets oct1 oct2 oct3 oct4
-        | mask == ThirtyOne = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 One)
-        | mask == Thirty = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Two)
-        | mask == TwentyNine = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Three)
+        | mask == ThirtyOne = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Seven)
+        | mask == Thirty = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Six)
+        | mask == TwentyNine = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Five)
         | mask == TwentyEight = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Four)
-        | mask == TwentySeven = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Five)
-        | mask == TwentySix = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Six)
-        | mask == TwentyFive = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Seven)
+        | mask == TwentySeven = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Three)
+        | mask == TwentySix = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Two)
+        | mask == TwentyFive = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 One)
         | mask == TwentyFour = ipv4address_from_octets oct1 oct2 oct3 (min_octet)
-        | mask == TwentyThree = ipv4address_from_octets oct1 oct2 (apply_mask oct3 One) (min_octet)
-        | mask == TwentyTwo = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Two) (min_octet)
-        | mask == TwentyOne = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Three) (min_octet)
+        | mask == TwentyThree = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Seven) (min_octet)
+        | mask == TwentyTwo = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Six) (min_octet)
+        | mask == TwentyOne = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Five) (min_octet)
         | mask == Twenty = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Four) (min_octet)
-        | mask == Nineteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Five) (min_octet)
-        | mask == Eighteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Six) (min_octet)
-        | mask == Seventeen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Seven) (min_octet)
+        | mask == Nineteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Three) (min_octet)
+        | mask == Eighteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Two) (min_octet)
+        | mask == Seventeen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 One) (min_octet)
         | mask == Sixteen = ipv4address_from_octets oct1 oct2 (min_octet) (min_octet)
-        | mask == Fifteen = ipv4address_from_octets oct1 (apply_mask oct2 One) (min_octet) (min_octet)
-        | mask == Fourteen = ipv4address_from_octets oct1 (apply_mask oct2 Two) (min_octet) (min_octet)
-        | mask == Thirteen = ipv4address_from_octets oct1 (apply_mask oct2 Three) (min_octet) (min_octet)
+        | mask == Fifteen = ipv4address_from_octets oct1 (apply_mask oct2 Seven) (min_octet) (min_octet)
+        | mask == Fourteen = ipv4address_from_octets oct1 (apply_mask oct2 Six) (min_octet) (min_octet)
+        | mask == Thirteen = ipv4address_from_octets oct1 (apply_mask oct2 Five) (min_octet) (min_octet)
         | mask == Twelve = ipv4address_from_octets oct1 (apply_mask oct2 Four) (min_octet) (min_octet)
-        | mask == Eleven = ipv4address_from_octets oct1 (apply_mask oct2 Five) (min_octet) (min_octet)
-        | mask == Ten = ipv4address_from_octets oct1 (apply_mask oct2 Six) (min_octet) (min_octet)
-        | mask == Nine = ipv4address_from_octets oct1 (apply_mask oct2 Seven) (min_octet) (min_octet)
+        | mask == Eleven = ipv4address_from_octets oct1 (apply_mask oct2 Three) (min_octet) (min_octet)
+        | mask == Ten = ipv4address_from_octets oct1 (apply_mask oct2 Two) (min_octet) (min_octet)
+        | mask == Nine = ipv4address_from_octets oct1 (apply_mask oct2 One) (min_octet) (min_octet)
         | mask == Eight = ipv4address_from_octets oct1 (min_octet) (min_octet) (min_octet)
-        | mask == Seven = ipv4address_from_octets (apply_mask oct1 One) (min_octet) (min_octet) (min_octet)
-        | mask == Six = ipv4address_from_octets (apply_mask oct1 Two) (min_octet) (min_octet) (min_octet)
-        | mask == Five = ipv4address_from_octets (apply_mask oct1 Three) (min_octet) (min_octet) (min_octet)
+        | mask == Seven = ipv4address_from_octets (apply_mask oct1 Seven) (min_octet) (min_octet) (min_octet)
+        | mask == Six = ipv4address_from_octets (apply_mask oct1 Six) (min_octet) (min_octet) (min_octet)
+        | mask == Five = ipv4address_from_octets (apply_mask oct1 Five) (min_octet) (min_octet) (min_octet)
         | mask == Four =  ipv4address_from_octets (apply_mask oct1 Four) (min_octet) (min_octet) (min_octet)
-        | mask == Three = ipv4address_from_octets (apply_mask oct1 Five) (min_octet) (min_octet) (min_octet)
-        | mask == Two = ipv4address_from_octets (apply_mask oct1 Six) (min_octet) (min_octet) (min_octet)
-        | mask == One = ipv4address_from_octets (apply_mask oct1 Seven) (min_octet) (min_octet) (min_octet)
+        | mask == Three = ipv4address_from_octets (apply_mask oct1 Three) (min_octet) (min_octet) (min_octet)
+        | mask == Two = ipv4address_from_octets (apply_mask oct1 Two) (min_octet) (min_octet) (min_octet)
+        | mask == One = ipv4address_from_octets (apply_mask oct1 One) (min_octet) (min_octet) (min_octet)
         | mask == Zero = ipv4address_from_octets (min_octet) (min_octet) (min_octet) (min_octet)
         | otherwise = IPv4Address.None
         where
@@ -78,3 +80,27 @@ instance Maskable IPv4Address where
           oct2 = (octet2 addr)
           oct3 = (octet3 addr)
           oct4 = (octet4 addr)
+
+
+
+-- HUnit Tests
+
+test_octet_mask1 :: Test
+test_octet_mask1 =
+    TestCase $ assertEqual "The network bits of 255/4 should equal 240" oct2 (apply_mask oct1 Four)
+    where
+      oct1 = octet_from_int 255
+      oct2 = octet_from_int 240
+
+
+test_octet_mask2 :: Test
+test_octet_mask2 =
+    TestCase $ assertEqual "The network bits of 255/1 should equal 128" oct2 (apply_mask oct1 One)
+    where
+      oct1 = octet_from_int 255
+      oct2 = octet_from_int 128
+
+
+maskable_tests :: [Test]
+maskable_tests = [ test_octet_mask1,
+                   test_octet_mask2 ]