diff --git a/lib/Track.hs b/lib/Track.hs index 3c61c4b..fa3eff4 100644 --- a/lib/Track.hs +++ b/lib/Track.hs @@ -1,6 +1,12 @@ {-# LANGUAGE OverloadedStrings #-} -module Track where +module Track ( + Track, + Pos(..), + pos, + parse, + Track.length + ) where import Data.Time import qualified Data.List -- import qualified Text.XML as X @@ -14,7 +20,7 @@ import Data.List as List import Data.Map as Map import Control.Exception -data Pos = Pos Float Float Float deriving (Show) +data Pos = Pos Float Float Float deriving (Show, Eq) type Power = Maybe Int diff --git a/tests/UnitTest.hs b/tests/UnitTest.hs index 00a0957..b459b80 100644 --- a/tests/UnitTest.hs +++ b/tests/UnitTest.hs @@ -1,6 +1,6 @@ module Main where -import qualified Track (Track, parse, length ) +import qualified Track (Track, Pos(..), pos, parse, length ) import Test.HUnit import qualified System.Exit as Exit import Control.Exception @@ -21,9 +21,10 @@ test2 = TestCase $ \ " of Left err -> assertFailure (displayException err) - Right trk -> - traceShow trk $ - assertEqual "one el" 1 (Track.length trk) + Right (p:ps) -> + assertEqual "matches lat/lon" + (Track.pos p) + (Track.Pos 51.0 (-0.1) 0.0) tests :: Test tests = TestList [