From: Michael Orlitzky <michael@orlitzky.com>
Date: Thu, 20 May 2010 05:02:42 +0000 (-0400)
Subject: Updated the combine_contains unit tests to actually call combine_contains.
X-Git-Tag: 0.0.1~39
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=f5fe2e052e033696b36071b568be6568a5a47db0;p=hath.git

Updated the combine_contains unit tests to actually call combine_contains.
Changed the test case for the second combine_contains test; the existing one should have failed.
---

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 94de123..427be15 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -264,7 +264,7 @@ test_adjacent4 =
 
 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)
+    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_contained test_cidrs)
     where
       cidr1 = cidr_from_string "10.0.0.0/8"
       cidr2 = cidr_from_string "10.1.0.0/16"
@@ -275,9 +275,10 @@ test_combine_contained1 =
 
 test_combine_contained2 :: Test
 test_combine_contained2 =
-    TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1])
+    TestCase $ assertEqual "192.168.3.0/23 does not contain 192.168.1.0/24" [cidr1, cidr2] (combine_contained [cidr1, cidr2])
     where
-      cidr1 = cidr_from_string "192.168.1.0/24"
+      cidr1 = cidr_from_string "192.168.3.0/23"
+      cidr2 = cidr_from_string "192.168.1.0/24"
 
 
 cidr_tests :: [Test]