fix to exec unit and sample test

Author: kotapiku

egison.cabal

@@ -87,7 +87,7 @@ Test-Suite test
   Hs-Source-Dirs: test
   Main-Is:        Test.hs
   Build-Depends: egison, base >= 4.0 && < 5, transformers, mtl, Glob, HUnit, test-framework, test-framework-hunit, filepath
-  Other-modules:   Paths_egison
+  Other-modules:   Paths_egison, UnitTest
 
 Benchmark benchmark
   Type: exitcode-stdio-1.0

test/Test.hs

@@ -15,12 +15,16 @@ import Language.Egison.Core
 import Language.Egison.Primitives
 import Language.Egison
 
+import UnitTest
+
 main = do
-  testCases <- glob "sample/pi.egi"
-  defaultMain $ hUnitTestToTests $ test $ map runTestCase testCases
+  unitTestCases <- glob "test/**/*.egi"
+  defaultMain $ hUnitTestToTests $ test $ map runUnitTestCase unitTestCases
+  sampleTestCases <- glob "sample/*.egi"
+  defaultMain $ hUnitTestToTests $ test $ map runSampleTestCase sampleTestCases
 
-runTestCase :: FilePath -> Test
-runTestCase file = TestLabel file . TestCase $ do
+runSampleTestCase :: FilePath -> Test
+runSampleTestCase file = TestLabel file . TestCase $ do
   env <- initialEnv
   let directory_path = takeDirectory file
   answers <- readFile (replaceDirectory file ("test/answer/" ++ directory_path))
@@ -34,7 +38,7 @@ runTestCase file = TestLabel file . TestCase $ do
         assertEgisonM answers m = fromEgisonM m >>= assertString . either show (f answers)
 
         collectDefsAndTests (Define name expr) (bindings, tests) =
-          (((stringToVar $ show name), expr) : bindings, tests)
+          ((stringToVar $ show name, expr) : bindings, tests)
         collectDefsAndTests (Test expr) (bindings, tests) =
           (bindings, expr : tests)
         collectDefsAndTests _ r = r

test/UnitTest.hs

@@ -1,25 +1,18 @@
-module Main where
+module UnitTest ( runUnitTestCase ) where
 
 import Control.Applicative
 import Control.Monad
 import Data.IORef
 
-import Test.Framework (defaultMain)
-import Test.Framework.Providers.HUnit (hUnitTestToTests)
 import Test.HUnit
-import System.FilePath.Glob (glob)
 
 import Language.Egison.Types
 import Language.Egison.Core
 import Language.Egison.Primitives
 import Language.Egison
 
-main = do
-  testCases <- glob "test/**/*.egi"
-  defaultMain $ hUnitTestToTests $ test $ map runTestCase testCases
-
-runTestCase :: FilePath -> Test
-runTestCase file = TestLabel file . TestCase $ do
+runUnitTestCase :: FilePath -> Test
+runUnitTestCase file = TestLabel file . TestCase $ do
   env <- initialEnv
   assertEgisonM $ do
     exprs <- loadFile file
@@ -31,7 +24,7 @@ runTestCase file = TestLabel file . TestCase $ do
         assertEgisonM m = fromEgisonM m >>= assertString . either show (const "")
 
         collectDefsAndTests (Define name expr) (bindings, tests) =
-          (((stringToVar $ show name), expr) : bindings, tests)
+          ((stringToVar $ show name, expr) : bindings, tests)
         collectDefsAndTests (Test expr) (bindings, tests) =
           (bindings, expr : tests)
         collectDefsAndTests _ r = r