X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=src%2FIPv4Address.hs;h=d262a5c0537ea47092d0255ab417b6516d1cdab8;hp=f4bfc9749cab1adb63ffcb7b0907d0ce3c9ebae2;hb=eee156f562f9c1c1194a67cef12f146304d88ce9;hpb=9b637112e7112180e3ddb6129a62b5e21953b469

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index f4bfc97..d262a5c 100644
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -5,11 +5,15 @@ module IPv4Address(
   most_sig_bit_different )
 where
 
-import Test.HUnit (assertEqual)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck (Arbitrary(..), Gen, Property, (==>))
+
+import Test.QuickCheck ( Gen ) -- Not re-exported by tasty
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( (@?=), testCase )
+import Test.Tasty.QuickCheck (
+  Arbitrary(..),
+  Property,
+  (==>),
+  testProperty )
 
 import Maskable (Maskable(..))
 import Maskbits (Maskbits(..))
@@ -323,7 +327,7 @@ most_sig_bit_different addr1 addr2
 
 
 -- Test lists.
-ipv4address_tests :: Test
+ipv4address_tests :: TestTree
 ipv4address_tests =
   testGroup "IPv4 Address Tests" [
     test_enum,
@@ -333,19 +337,21 @@ ipv4address_tests =
     test_most_sig_bit_different2,
     test_to_enum ]
 
-ipv4address_properties :: Test
+ipv4address_properties :: TestTree
 ipv4address_properties =
   testGroup
     "IPv4 Address Properties "
-    [ testProperty
-        "fromEnum/toEnum are inverses"
-        prop_from_enum_to_enum_inverses ]
+    [ prop_from_enum_to_enum_inverses ]
 
 -- QuickCheck properties
-prop_from_enum_to_enum_inverses :: Int -> Property
-prop_from_enum_to_enum_inverses x =
-  (0 <= x) && (x <= 2^(32 :: Integer) - 1) ==>
-    fromEnum (toEnum x :: IPv4Address) == x
+prop_from_enum_to_enum_inverses :: TestTree
+prop_from_enum_to_enum_inverses =
+  testProperty "fromEnum and toEnum are inverses" prop
+  where
+    prop :: Int -> Property
+    prop x =
+      (0 <= x) && (x <= 2^(32 :: Integer) - 1) ==>
+        fromEnum (toEnum x :: IPv4Address) == x
 
 -- HUnit Tests
 mk_testaddr :: Int -> Int -> Int -> Int -> IPv4Address
@@ -357,25 +363,28 @@ mk_testaddr a b c d =
     oct3 = toEnum c
     oct4 = toEnum d
 
-test_minBound :: Test
+
+test_minBound :: TestTree
 test_minBound =
-  testCase desc $ assertEqual desc expected actual
+  testCase desc $ actual @?= expected
   where
     desc = "minBound should be 0.0.0.0"
     expected = mk_testaddr 0 0 0 0
     actual = minBound :: IPv4Address
 
-test_maxBound :: Test
+
+test_maxBound :: TestTree
 test_maxBound =
-  testCase desc $ assertEqual desc expected actual
+  testCase desc $ actual @?= expected
   where
     desc = "maxBound should be 255.255.255.255"
     expected = mk_testaddr 255 255 255 255
     actual = maxBound :: IPv4Address
 
-test_enum :: Test
+
+test_enum :: TestTree
 test_enum =
-  testCase desc $ assertEqual desc expected actual
+  testCase desc $ actual @?= expected
   where
     desc = "enumerating a /24 gives the correct addresses"
     expected = ["192.168.0." ++ (show x) | x <- [0..255::Int] ]
@@ -383,34 +392,33 @@ test_enum =
     ub = mk_testaddr 192 168 0 255
     actual = map show [lb..ub]
 
-test_most_sig_bit_different1 :: Test
+
+test_most_sig_bit_different1 :: TestTree
 test_most_sig_bit_different1 =
-  testCase desc $ assertEqual desc
-             TwentyFour
-             bit
+  testCase desc $ actual @?= expected
   where
     desc = "10.1.1.0 and 10.1.0.0 differ in bit 24"
     addr1 = mk_testaddr 10 1 1 0
     addr2 = (mk_testaddr 10 1 0 0)
-    bit = most_sig_bit_different addr1 addr2
+    expected = TwentyFour
+    actual = most_sig_bit_different addr1 addr2
 
 
 
-test_most_sig_bit_different2 :: Test
+test_most_sig_bit_different2 :: TestTree
 test_most_sig_bit_different2 =
-  testCase desc $ assertEqual desc
-               TwentyThree
-               bit
+  testCase desc $ actual @?= expected
   where
     desc = "10.1.2.0 and 10.1.1.0 differ in bit 23"
     addr1 = mk_testaddr 10 1 2 0
     addr2 = mk_testaddr 10 1 1 0
-    bit = most_sig_bit_different addr1 addr2
+    expected = TwentyThree
+    actual = most_sig_bit_different addr1 addr2
 
 
-test_to_enum :: Test
+test_to_enum :: TestTree
 test_to_enum =
-  testCase desc $ assertEqual desc expected actual
+  testCase desc $ actual @?= expected
   where
     desc     = "192.168.0.0 in base-10 is 3232235520"
     expected = mk_testaddr 192 168 0 0