X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhalcyon.git;a=blobdiff_plain;f=src%2FStringUtils.hs;h=a9e2625289c65be857d068f35a850e32009369ae;hp=43e42646764c083ae2ddedac22a36b637709ba59;hb=0ed071e75268da9ba8273d5c13817fa1297c94e2;hpb=7bb00e04c15781d889f950d00babf3f183047bff

diff --git a/src/StringUtils.hs b/src/StringUtils.hs
index 43e4264..a9e2625 100644
--- a/src/StringUtils.hs
+++ b/src/StringUtils.hs
@@ -1,14 +1,11 @@
 -- | Miscellaneous functions for manipulating string.
 module StringUtils (
   listify,
-  string_utils_tests
-  )
+  string_utils_tests )
 where
 
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.HUnit (Assertion, assertEqual)
-
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( (@?=), testCase )
 
 -- | Takes a list of strings, call them string1, string2, etc. and
 --   numbers them like a list. So,
@@ -29,16 +26,13 @@ listify =
 -- Tests
 --
 
-test_listify :: Assertion
-test_listify =
-  assertEqual description expected_items actual_items
-  where
-    description = "All items are numbered correctly."
-    actual_items = listify [ "item1", "item2" ]
-    expected_items = ["1. item1", "2. item2" ]
-
-string_utils_tests :: Test
+string_utils_tests :: TestTree
 string_utils_tests =
-  testGroup "StringUtils Tests" [ tc1 ]
+  testGroup "StringUtils Tests" [ test_listify ]
+
+test_listify :: TestTree
+test_listify = testCase description $ actual @?= expected
   where
-    tc1 = testCase "All items are numbered correctly." test_listify
+    description = "all items are numbered correctly"
+    actual = listify [ "item1", "item2" ]
+    expected = ["1. item1", "2. item2" ]