Added some adjacency tests.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index ff357bee673eac676fffd540844dc3c3eac7c3b9..d6bb66106fa92b947172101d870ba2142283806c 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -193,7 +193,7 @@ test_contains1 =
       cidr1 = cidr_from_string "10.1.1.0/23"
       cidr2 = cidr_from_string "10.1.1.0/24"
 
       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)
 test_contains2 :: Test
 test_contains2 =
     TestCase $ assertEqual "10.1.1.0/23 contains itself" True (cidr1 `contains` cidr1)


@@ -215,11 +215,47 @@ test_contains_proper2 =
     where
       cidr1 = cidr_from_string "10.1.1.0/23"
 
     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,
 cidr_tests :: [Test]
 cidr_tests = [ test_equality1,
                test_contains1,
                test_contains2,
                test_contains_proper1,

-               test_contains_proper2
+               test_contains_proper2,
+               test_adjacent1,
+               test_adjacent2,
+               test_adjacent3,
+               test_adjacent4

              ]
              ]