Finish moving the tests to test-framework.

[spline3.git] / src / Tests / Cardinal.hs

diff --git a/src/Tests/Cardinal.hs b/src/Tests/Cardinal.hs
index c3f60e58c274c41555c1f8d4217c9ab890469223..17860218dec1811280cabd20af5d1fc03f1bc1e8 100644 (file)
--- a/src/Tests/Cardinal.hs
+++ b/src/Tests/Cardinal.hs
@@ -53,9 +53,9 @@ instance Arbitrary Cardinal where
 --   Zeilfelder, p. 87.  This test checks that the directions are
 --   rotated properly.  The order of the letters has to be just right
 --   since I haven't defined a proper Eq instance for Cardinals.
-test_c_tilde_2100_rotation_correct :: Test
+test_c_tilde_2100_rotation_correct :: Assertion
 test_c_tilde_2100_rotation_correct =
-    TestCase $ assertEqual "auto-rotate equals manual rotate" ((ccwz . ccwz . cwy) expr1) expr2
+    assertEqual "auto-rotate equals manual rotate" ((ccwz . ccwz . cwy) expr1) expr2
     where
       expr1 =
           (3/8)*I +
@@ -75,9 +75,6 @@ test_c_tilde_2100_rotation_correct =
           (1/96)*(FL + BR + FR + BL) +
           (1/192)*(FD + LD + RD + BD)
 
-cardinal_tests :: [Test]
-cardinal_tests = [test_c_tilde_2100_rotation_correct]
-
 -- | A list of all directions, sans the interior and composite types.
 all_directions :: [Cardinal]
 all_directions = [L, R, F, B, D, T, FL, FR, FD, FT,