Added type signatures for all of the tests.

diff --git a/src/Cidr.hs b/src/Cidr.hs
index d772d5bcd5f469d48cda8ee396add0aba353d34a..77f1ae41fe42569d5801c50158aef48f1a595ce7 100644 (file)
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -179,6 +179,7 @@ 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
     where
@@ -186,4 +187,5 @@ test_contains =
       cidr2 = cidr_from_string "10.1.1.0/24"
 
 
+cidr_tests :: [Test]
 cidr_tests = [ test_contains ]

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index 29afa5f3dd2c34264a98b39c250d93b5160db6af..e91e67325a070abde0a0af82afd2d05a3175bc4d 100644 (file)
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -355,14 +355,16 @@ mk_testaddr a b c d =
       oct4 = octet_from_int d
 
 
+test_most_sig_bit_different1 :: Test
 test_most_sig_bit_different1 =
     TestCase $ assertEqual "10.1.1.0 and 10.1.0.0 differ in bit 24" TwentyFour (most_sig_bit_different (mk_testaddr 10 1 1 0) (mk_testaddr 10 1 0 0))
 
 
+test_most_sig_bit_different2 :: Test
 test_most_sig_bit_different2 =
     TestCase $ assertEqual "10.1.2.0 and 10.1.1.0 differ in bit 23" TwentyThree (most_sig_bit_different (mk_testaddr 10 1 2 0) (mk_testaddr 10 1 1 0))
 
 
-
+ipv4address_tests :: [Test]
 ipv4address_tests = [ test_most_sig_bit_different1,
                       test_most_sig_bit_different2 ]

diff --git a/src/Maskable.hs b/src/Maskable.hs
index 9300ee1fcf2ae00e28bf361573dde0964aa9d938..4f028a02ae519b731a5922479a7bd01a2370179d 100644 (file)
--- a/src/Maskable.hs
+++ b/src/Maskable.hs
@@ -85,6 +85,7 @@ instance Maskable IPv4Address where
 
 -- HUnit Tests
 
+test_octet_mask1 :: Test
 test_octet_mask1 =
     TestCase $ assertEqual "The network bits of 255/4 should equal 240" oct2 (apply_mask oct1 Four)
     where
@@ -92,6 +93,7 @@ test_octet_mask1 =
       oct2 = octet_from_int 240
 
 
+test_octet_mask2 :: Test
 test_octet_mask2 =
     TestCase $ assertEqual "The network bits of 255/1 should equal 128" oct2 (apply_mask oct1 One)
     where
@@ -99,5 +101,6 @@ test_octet_mask2 =
       oct2 = octet_from_int 128
 
 
+maskable_tests :: [Test]
 maskable_tests = [ test_octet_mask1,
                    test_octet_mask2 ]

diff --git a/src/Octet.hs b/src/Octet.hs
index efc19d5607550e98da3bd47221fecb403e76d9e6..04caae54fa6bcefab22d28415f5e2e8f6aa81064 100644 (file)
--- a/src/Octet.hs
+++ b/src/Octet.hs
@@ -73,10 +73,12 @@ max_octet = Octet One One One One One One One One
 
 
 -- HUnit Tests
+test_octet_from_int1 :: Test
 test_octet_from_int1 =
     TestCase $ assertEqual "octet_from_int 128 should parse as 10000000" oct1 (octet_from_int 128)
     where
       oct1 = Octet One Zero Zero Zero Zero Zero Zero Zero
 
 
+octet_tests :: [Test]
 octet_tests = [ test_octet_from_int1 ]