Use test-framework instead of bare HUnit for the test suite.

[dead/halcyon.git] / src / StringUtils.hs

diff --git a/src/StringUtils.hs b/src/StringUtils.hs
index b5feccb3f079a32755784ad2afc63b894802233b..55939680467bb314f24aae53e70485e693c6055d 100644 (file)
--- a/src/StringUtils.hs
+++ b/src/StringUtils.hs
@@ -1,8 +1,10 @@
--- |Miscellaneous functions for manipulating string.
+-- | Miscellaneous functions for manipulating string.
 module StringUtils
 where
 
-import Test.HUnit
+import Test.Framework (Test, testGroup)
+import Test.Framework.Providers.HUnit (testCase)
+import Test.HUnit (Assertion, assertEqual)
 
 
 -- | Takes a list of strings, call them string1, string2, etc. and
@@ -20,15 +22,20 @@ listify =
       show_with_dot x = (show x) ++ ". "
 
 
+--
+-- Tests
+--
 
-string_utils_tests :: [Test]
-string_utils_tests = [ test_listify ]
-
-
-test_listify :: Test
+test_listify :: Assertion
 test_listify =
-    TestCase $ assertEqual description expected_items actual_items
-    where
-      description = "All items are numbered correctly."
-      actual_items = listify [ "item1", "item2" ]
-      expected_items = ["1. item1", "2. item2" ]
+  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 =
+  testGroup "StringUtils Tests" [ tc1 ]
+  where
+    tc1 = testCase "All items are numbered correctly." test_listify