Added two tests for combine_all.

[hath.git] / src / Cidr.hs

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 94de1234c4ae9616f7b9d351a5b9a0f6ba434bc7..98c42c7e6bdab38a0f2d1da47c142aba445c7182 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -264,7 +264,7 @@ test_adjacent4 =
 
 test_combine_contained1 :: Test
 test_combine_contained1 =
-    TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_all test_cidrs)
+    TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_contained test_cidrs)
     where
       cidr1 = cidr_from_string "10.0.0.0/8"
       cidr2 = cidr_from_string "10.1.0.0/16"
@@ -275,9 +275,32 @@ test_combine_contained1 =
 
 test_combine_contained2 :: Test
 test_combine_contained2 =
-    TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1])
+    TestCase $ assertEqual "192.168.3.0/23 does not contain 192.168.1.0/24" [cidr1, cidr2] (combine_contained [cidr1, cidr2])
     where
-      cidr1 = cidr_from_string "192.168.1.0/24"
+      cidr1 = cidr_from_string "192.168.3.0/23"
+      cidr2 = cidr_from_string "192.168.1.0/24"
+
+
+test_combine_all1 :: Test
+test_combine_all1 =
+    TestCase $ assertEqual "10.0.0.0/24 is adjacent to 10.0.1.0/24 and 10.0.3.0/23 contains 10.0.2.0/24" expected_cidrs (combine_all test_cidrs)
+    where
+      cidr1 = cidr_from_string "10.0.0.0/24"
+      cidr2 = cidr_from_string "10.0.1.0/24"
+      cidr3 = cidr_from_string "10.0.2.0/24"
+      cidr4 = cidr_from_string "10.0.3.0/23"
+      cidr5 = cidr_from_string "10.0.0.0/23"
+      expected_cidrs = [cidr4, cidr5]
+      test_cidrs = [cidr1, cidr2, cidr3, cidr4]
+
+
+test_combine_all2 :: Test
+test_combine_all2 =
+    TestCase $ assertEqual "127.0.0.1/32 combines with itself recursively" expected_cidrs (combine_all test_cidrs)
+    where
+      cidr1 = cidr_from_string "127.0.0.1/32"
+      expected_cidrs = [cidr1]
+      test_cidrs = [cidr1, cidr1, cidr1, cidr1, cidr1]
 
 
 cidr_tests :: [Test]
@@ -291,7 +314,9 @@ cidr_tests = [ test_equality1,
                test_adjacent3,
                test_adjacent4,
                test_combine_contained1,
-               test_combine_contained2
+               test_combine_contained2,
+               test_combine_all1,
+               test_combine_all2
              ]