Fix all orphan instances.

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

diff --git a/src/Tests/Tetrahedron.hs b/src/Tests/Tetrahedron.hs
index 5e176719b7f22f27490f3e5a09c25b18943f18d2..a2a7b6ebdf54fdaf6e8cdf729e4fe49d05d41ee1 100644 (file)
--- a/src/Tests/Tetrahedron.hs
+++ b/src/Tests/Tetrahedron.hs
@@ -2,25 +2,15 @@ module Tests.Tetrahedron
 where
 
 import Test.HUnit
-import Test.QuickCheck
+import Test.QuickCheck (Property, (==>))
 
 import Cardinal
 import Comparisons
-import Point
 import FunctionValues
 import Tests.FunctionValues()
 import Tetrahedron
 import ThreeDimensional
 
-instance Arbitrary Tetrahedron where
-    arbitrary = do
-      rnd_v0 <- arbitrary :: Gen Point
-      rnd_v1 <- arbitrary :: Gen Point
-      rnd_v2 <- arbitrary :: Gen Point
-      rnd_v3 <- arbitrary :: Gen Point
-      rnd_fv <- arbitrary :: Gen FunctionValues
-      return (Tetrahedron rnd_fv rnd_v0 rnd_v1 rnd_v2 rnd_v3)
-
 -- HUnit Tests
 
 
@@ -304,7 +294,7 @@ prop_x_rotation_doesnt_affect_front t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwx
+      fv1 = rotate cwx (Tetrahedron.fv t)
       expr1 = front fv0
       expr2 = front fv1
 
@@ -313,7 +303,7 @@ prop_x_rotation_doesnt_affect_back t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwx
+      fv1 = rotate cwx (Tetrahedron.fv t)
       expr1 = back fv0
       expr2 = back fv1
 
@@ -323,7 +313,7 @@ prop_y_rotation_doesnt_affect_left t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwy
+      fv1 = rotate cwy (Tetrahedron.fv t)
       expr1 = left fv0
       expr2 = left fv1
 
@@ -332,7 +322,7 @@ prop_y_rotation_doesnt_affect_right t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwy
+      fv1 = rotate cwy (Tetrahedron.fv t)
       expr1 = right fv0
       expr2 = right fv1
 
@@ -342,7 +332,7 @@ prop_z_rotation_doesnt_affect_down t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwz
+      fv1 = rotate cwz (Tetrahedron.fv t)
       expr1 = down fv0
       expr2 = down fv1
 
@@ -352,7 +342,7 @@ prop_z_rotation_doesnt_affect_top t =
     expr1 == expr2
     where
       fv0 = Tetrahedron.fv t
-      fv1 = rotate (Tetrahedron.fv t) cwz
+      fv1 = rotate cwz (Tetrahedron.fv t)
       expr1 = top fv0
       expr2 = top fv1