diff --git a/src/swarm-topography/Swarm/Game/Scenario/Topography/Structure/Overlay.hs b/src/swarm-topography/Swarm/Game/Scenario/Topography/Structure/Overlay.hs index a3d3aa281..f29fdd4ea 100644 --- a/src/swarm-topography/Swarm/Game/Scenario/Topography/Structure/Overlay.hs +++ b/src/swarm-topography/Swarm/Game/Scenario/Topography/Structure/Overlay.hs @@ -12,11 +12,11 @@ module Swarm.Game.Scenario.Topography.Structure.Overlay ( OverlayPair (..), ) where -import Debug.Trace (trace) import Control.Applicative import Data.Function (on) import Data.Int (Int32) import Data.Tuple (swap) +import Debug.Trace (trace) import Linear hiding (trace) import Swarm.Game.Location import Swarm.Game.Scenario.Topography.Area diff --git a/test/unit/Main.hs b/test/unit/Main.hs index 539a97b97..e03caccb6 100644 --- a/test/unit/Main.hs +++ b/test/unit/Main.hs @@ -47,10 +47,10 @@ main :: IO () main = do defaultMain statelessTests - -- ms <- runExceptT classicGame0 - -- case ms of - -- Left err -> assertFailure (from err) - -- Right s -> defaultMain (stateDependentTests s) +-- ms <- runExceptT classicGame0 +-- case ms of +-- Left err -> assertFailure (from err) +-- Right s -> defaultMain (stateDependentTests s) -- | Initializing an 'AppState' entails -- loading challenge scenarios, etc. from diff --git a/test/unit/TestOverlay.hs b/test/unit/TestOverlay.hs index 952a34e9d..1ab19012a 100644 --- a/test/unit/TestOverlay.hs +++ b/test/unit/TestOverlay.hs @@ -98,29 +98,27 @@ testOverlay = ] , testGroup "Northwesterly offset of first sibling" - [ - - -- testMergedSize + [ -- testMergedSize -- "test merged size" -- (placeUnshifted "baseLayer" (Location 0 0) [[]]) -- (placeUnshifted "sibling1" (Location (-1) 1) oneByOneGrid) -- (AreaDimensions 1 1) - + -- , testMergedSize -- "test merged size" -- (place (Location 1 (-1)) "sibling1" (Location (-1) 1) oneByOneGrid) -- (placeUnshifted "sibling2" (Location 0 0) twoByTwoGrid) -- (AreaDimensions 3 3) - -- , - - mkOverlaySequenceOriginTest - "positive first south of second" - [ placeUnshifted "sibling1" (Location (-1) 1) oneByOneGrid - , placeUnshifted "sibling2" (Location 0 0) twoByTwoGrid - -- [ placeUnshifted "sibling2" (Location 0 0) twoByTwoGrid - -- , placeUnshifted "sibling1" (Location (-1) 1) oneByOneGrid - ] - (Location 1 (-1)) + -- , + + mkOverlaySequenceOriginTest + "positive first south of second" + [ placeUnshifted "sibling1" (Location (-1) 1) oneByOneGrid + , placeUnshifted "sibling2" (Location 0 0) twoByTwoGrid + -- [ placeUnshifted "sibling2" (Location 0 0) twoByTwoGrid + -- , placeUnshifted "sibling1" (Location (-1) 1) oneByOneGrid + ] + (Location 1 (-1)) ] ] ]