From efe82ac98887fb6326f2ba0bce0cb4b179959d3b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 14 May 2010 00:17:31 -0400 Subject: [PATCH] Added some adjacency tests. --- src/Cidr.hs | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/Cidr.hs b/src/Cidr.hs index ff357be..d6bb661 100644 --- 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" - + 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" - + +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, - test_contains_proper2 + test_contains_proper2, + test_adjacent1, + test_adjacent2, + test_adjacent3, + test_adjacent4 ] -- 2.44.2