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

diff --git a/src/Cidr.hs b/src/Cidr.hs
index d772d5b..d6bb661 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -179,11 +179,83 @@ adjacent cidr1 cidr2
 
 -- HUnit Tests
 
-test_contains =
-    TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24" (cidr1 `contains` cidr2) True
+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"
 
 
-cidr_tests = [ test_contains ]
+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
+             ]