Fix flight-earth:cylinder test

GlideAngle · Mar 7, 2024 · cebfb18 · cebfb18
1 parent e7e489a
commit cebfb18
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -91,11 +91,10 @@ jobs:
     # - name: flight-earth:zone
     #   run: cabal test flight-earth:zone --test-show-details=direct --test-option="--color=always"
 
-    # compile error
-    # - name: flight-earth:cylinder
-    #   run: cabal test flight-earth:cylinder --test-show-details=direct --test-option="--color=always"
+    - name: flight-earth:cylinder
+      run: cabal test flight-earth:cylinder --test-show-details=direct --test-option="--color=always"
 
-    # compile error
+    # failures and takes a long time to run
     # - name: flight-earth:cylinder-r
     #   run: cabal test flight-earth:cylinder-r --test-show-details=direct --test-option="--color=always"
 

diff --git a/lang-haskell/earth/flight-earth.cabal b/lang-haskell/earth/flight-earth.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: f671804c388a802f7bd37e520d4ff533860c4d4aa640056b7d7e98ec266dd76c
+-- hash: 2514baec9e9f504a36011c753c195eda8758c6562d8a51c93773eb5209a46cf0
 
 name:           flight-earth
 version:        0.1.0
@@ -235,7 +235,6 @@ test-suite cylinder
     , tasty-smallcheck
     , text
     , uom-plugin
-  buildable: False
   default-language: Haskell2010
 
 test-suite cylinder-r
@@ -337,7 +336,6 @@ test-suite cylinder-r
     , tasty-smallcheck
     , text
     , uom-plugin
-  buildable: False
   default-language: Haskell2010
 
 test-suite doctest

diff --git a/lang-haskell/earth/package.dhall b/lang-haskell/earth/package.dhall
@@ -253,7 +253,6 @@ in  let defs = ./../defaults.dhall
                             , "test-suite/cylinder"
                             , "test-suite-cylinder"
                             ]
-                          , buildable = False
                           }
                         , cylinder-r =
                           { dependencies =
@@ -274,7 +273,6 @@ in  let defs = ./../defaults.dhall
                             , "test-suite/cylinder"
                             , "test-suite-cylinder-r"
                             ]
-                          , buildable = False
                           }
                         }
                   }
diff --git a/lang-haskell/earth/test-suite-cylinder-r/CylinderRMain.hs b/lang-haskell/earth/test-suite-cylinder-r/CylinderRMain.hs
@@ -1,6 +1,6 @@
 import Test.Tasty (TestTree, testGroup, defaultMain)
 
-import qualified Cylinder.Sphere.Sphere as S
+import qualified Cylinder.Sphere as S
 import qualified Cylinder.Ellipsoid.Vincenty as V
 
 main :: IO ()

diff --git a/lang-haskell/earth/test-suite-zones/Ellipsoid/Coincident.hs b/lang-haskell/earth/test-suite-zones/Ellipsoid/Coincident.hs
@@ -11,7 +11,7 @@ import Flight.Zone.Path (distancePointToPoint)
 import Zone (MkZone, QLL, showQ, describedZones)
 import qualified Distance as D (DistanceEqual, toDistanceEqual)
 import Flight.Earth.Ellipsoid (wgs84)
-import Ellipsoid.Span (spanD, spanR)
+import Cylinder.Ellipsoid.Vincenty.Span (spanD, spanR)
 
 coincidentUnits :: TestTree
 coincidentUnits =

diff --git a/lang-haskell/earth/test-suite/cylinder/Cylinder/Ellipsoid/Vincenty/Span.hs b/lang-haskell/earth/test-suite/cylinder/Cylinder/Ellipsoid/Vincenty/Span.hs
@@ -44,14 +44,14 @@ csR = circumSample @Rational @Rational (Vincenty, EarthAsEllipsoid wgs84, defEps
 spD :: SampleParams Double
 spD =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 
 spR :: SampleParams Rational
 spR =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 

diff --git a/lang-haskell/earth/test-suite/cylinder/Cylinder/Flat/Outer.hs b/lang-haskell/earth/test-suite/cylinder/Cylinder/Flat/Outer.hs
@@ -11,7 +11,7 @@ import Data.UnitsOfMeasure.Internal (Quantity(..))
 import Flight.Units ()
 import Flight.Units.Angle (Angle(..))
 import Flight.LatLng (Lat(..), Lng(..), LatLng(..))
-import Flight.Zone (QBearing, Bearing(..), Radius(..))
+import Flight.Zone (QBearing, Bearing(..))
 import Flight.Zone.Cylinder (Tolerance(..))
 import Cylinder.Flat.Span
     ( spanD, csD, spD

diff --git a/lang-haskell/earth/test-suite/cylinder/Cylinder/Flat/Span.hs b/lang-haskell/earth/test-suite/cylinder/Cylinder/Flat/Span.hs
@@ -41,14 +41,14 @@ csR = circumSample @Rational @Rational (Pythagorus, EarthAsFlat UTM, eps)
 spD :: SampleParams Double
 spD =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 
 spR :: SampleParams Rational
 spR =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 

diff --git a/lang-haskell/earth/test-suite/cylinder/Cylinder/Sphere/Span.hs b/lang-haskell/earth/test-suite/cylinder/Cylinder/Sphere/Span.hs
@@ -53,14 +53,14 @@ csR = circumSample @Rational @Rational (Haversines, EarthAsSphere earthRadius, e
 spD :: SampleParams Double
 spD =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 
 spR :: SampleParams Rational
 spR =
     SampleParams
-        { spSamples = Samples 100
+        { spSamples = [Samples 100]
         , spTolerance = mm30
         }
 

diff --git a/lang-haskell/task/test-suite-task/EdgeToEdge.hs b/lang-haskell/task/test-suite-task/EdgeToEdge.hs
@@ -58,7 +58,7 @@ mm1 :: Tolerance Rational
 mm1 = Tolerance $ 1 % 1000
 
 sampleParams :: SampleParams Rational
-sampleParams = SampleParams { spSamples = Samples 100
+sampleParams = SampleParams { spSamples = [Samples 100]
                             , spTolerance = mm30
                             }