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

diff --git a/src/Cidr.hs b/src/Cidr.hs
index d6bb661..c0c639a 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -248,6 +248,24 @@ test_adjacent4 =
       cidr2 = cidr_from_string "10.1.2.0/24"
 
 
+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)
+    where
+      cidr1 = cidr_from_string "10.0.0.0/8"
+      cidr2 = cidr_from_string "10.1.0.0/16"
+      cidr3 = cidr_from_string "10.1.1.0/24"
+      expected_cidrs = [cidr1]
+      test_cidrs = [cidr1, cidr2, cidr3]
+
+
+test_combine_contained2 :: Test
+test_combine_contained2 =
+    TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1])
+    where
+      cidr1 = cidr_from_string "192.168.1.0/24"
+
+
 cidr_tests :: [Test]
 cidr_tests = [ test_equality1,
                test_contains1,
@@ -257,5 +275,7 @@ cidr_tests = [ test_equality1,
                test_adjacent1,
                test_adjacent2,
                test_adjacent3,
-               test_adjacent4
+               test_adjacent4,
+               test_combine_contained1,
+               test_combine_contained2
              ]