Added some new Cidr tests.

Fixed the argument order in the existing Cidr tests.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 77f1ae41fe42569d5801c50158aef48f1a595ce7..ff357bee673eac676fffd540844dc3c3eac7c3b9 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -179,13 +179,47 @@ adjacent cidr1 cidr2
 
 -- HUnit Tests
 
 
 -- 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"
 
     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]

-cidr_tests = [ test_contains ]
+cidr_tests = [ test_equality1,
+               test_contains1,
+               test_contains2,
+               test_contains_proper1,
+               test_contains_proper2
+             ]