From 103f95bf9bf2ad9908ec7a82691b81b1182774c7 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 14 May 2010 00:10:48 -0400 Subject: [PATCH] Added some new Cidr tests. Fixed the argument order in the existing Cidr tests. --- src/Cidr.hs | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/Cidr.hs b/src/Cidr.hs index 77f1ae4..ff357be 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -179,13 +179,47 @@ adjacent cidr1 cidr2 -- HUnit Tests -test_contains :: Test -test_contains = - TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24" (cidr1 `contains` cidr2) True +test_equality1 :: Test +test_equality1 = + TestCase $ assertEqual "10.1.1.0/23 equals itself" True (cidr1 == cidr1) + where + cidr1 = cidr_from_string "10.1.1.0/23" + + +test_contains1 :: Test +test_contains1 = + TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24" True (cidr1 `contains` cidr2) where 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) + where + cidr1 = cidr_from_string "10.1.1.0/23" + + +test_contains_proper1 :: Test +test_contains_proper1 = + TestCase $ assertEqual "10.1.1.0/23 contains 10.1.1.0/24 properly" True (cidr1 `contains_proper` cidr2) + where + cidr1 = cidr_from_string "10.1.1.0/23" + cidr2 = cidr_from_string "10.1.1.0/24" + + +test_contains_proper2 :: Test +test_contains_proper2 = + TestCase $ assertEqual "10.1.1.0/23 does not contain itself properly" False (cidr1 `contains_proper` cidr1) + where + cidr1 = cidr_from_string "10.1.1.0/23" + cidr_tests :: [Test] -cidr_tests = [ test_contains ] +cidr_tests = [ test_equality1, + test_contains1, + test_contains2, + test_contains_proper1, + test_contains_proper2 + ] -- 2.43.2