X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FCidr.hs;h=d6bb66106fa92b947172101d870ba2142283806c;hb=efe82ac98887fb6326f2ba0bce0cb4b179959d3b;hp=08eebcba23fd75a533e687cd742fb6db4a7e6af8;hpb=f74d9ccfb98a2ac25b4eebbfadf9a16b7a5202e1;p=hath.git

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 08eebcb..d6bb661 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -1,10 +1,12 @@
 module Cidr
 ( Cidr(..),
   cidr_from_string,
+  cidr_tests,
   combine_all
 ) where
 
 import Data.List (nubBy)
+import Test.HUnit
 
 import IPv4Address
 import ListUtils
@@ -170,3 +172,90 @@ adjacent cidr1 cidr2
     addr2 = ipv4address cidr2
     mbits1 = maskbits cidr1
     mbits2 = maskbits cidr2
+
+
+
+
+
+-- HUnit Tests
+
+test_equality1 :: Test
+test_equality1 =
+    TestCase $ assertEqual "10.1.1.0/23 equals itself" True (cidr1 == cidr1)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_contains1 :: Test
+test_contains1 =
+    TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24" True (cidr1 `contains` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/23"
+      cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_contains2 :: Test
+test_contains2 =
+    TestCase $ assertEqual "10.1.1.0/23 contains itself" True (cidr1 `contains` cidr1)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_contains_proper1 :: Test
+test_contains_proper1 =
+    TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24 properly" True (cidr1 `contains_proper` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/23"
+      cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_contains_proper2 :: Test
+test_contains_proper2 =
+    TestCase $ assertEqual "10.1.1.0/23 does not contain itself properly" False (cidr1 `contains_proper` cidr1)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/23"
+
+
+test_adjacent1 :: Test
+test_adjacent1 =
+    TestCase $ assertEqual "10.1.0.0/24 is adjacent to 10.1.1.0/24" True (cidr1 `adjacent` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.0.0/24"
+      cidr2 = cidr_from_string "10.1.1.0/24"
+
+
+test_adjacent2 :: Test
+test_adjacent2 =
+    TestCase $ assertEqual "10.1.0.0/23 is not adjacent to 10.1.0.0/24" False (cidr1 `adjacent` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.0.0/23"
+      cidr2 = cidr_from_string "10.1.0.0/24"
+
+
+test_adjacent3 :: Test
+test_adjacent3 =
+    TestCase $ assertEqual "10.1.0.0/24 is not adjacent to 10.2.5.0/24" False (cidr1 `adjacent` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.0.0/24"
+      cidr2 = cidr_from_string "10.2.5.0/24"
+
+
+test_adjacent4 :: Test
+test_adjacent4 =
+    TestCase $ assertEqual "10.1.1.0/24 is not adjacent to 10.1.2.0/24" False (cidr1 `adjacent` cidr2)
+    where
+      cidr1 = cidr_from_string "10.1.1.0/24"
+      cidr2 = cidr_from_string "10.1.2.0/24"
+
+
+cidr_tests :: [Test]
+cidr_tests = [ test_equality1,
+               test_contains1,
+               test_contains2,
+               test_contains_proper1,
+               test_contains_proper2,
+               test_adjacent1,
+               test_adjacent2,
+               test_adjacent3,
+               test_adjacent4
+             ]