From a626afee0e8a4d5a8e1b9a22c150073be6a00cc3 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 14 May 2010 00:22:12 -0400 Subject: [PATCH] Added two tests for combine_contained. --- src/Cidr.hs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 ] -- 2.44.2