Tests: silence stderr

test/Spec.hs

@@ -10,8 +10,8 @@ main = defaultMain
   [ constructTestSuite testName testSuite
   | (testName, testSuite) <- [
         ("LIR_PARSER", parserTests)
-      , ("EXAMPLES", examples)
       , ("MODEL_PARSER", modelParserTests)
+      , ("EXAMPLES", examples)
       , ("EQUIV_REAL", genEquivTests "examples/test_equiv/Reals.java")
       , ("EQUIV_ARRAY", genEquivTests "examples/test_equiv/Arrays.java")
       ]

test/TEquivalenceClasses.hs

 module TEquivalenceClasses where
 
 import Control.Monad
-import Data.List (elemIndex)
-import Data.List.Split (splitOn)
+import Data.List          (elemIndex)
+import Data.List.Split    (splitOn)
 import Data.Maybe
-import System.IO.Silently (silence)
-import System.IO.Unsafe (unsafePerformIO)
+import System.IO          (stderr, stdout)
+import System.IO.Silently (hSilence)
+import System.IO.Unsafe   (unsafePerformIO)
 import Test.HUnit
 
+import API
 import Javawlp.Engine.HelperFunctions (parseMethodIds)
 import Model
-import API
 
 testEquiv :: Response -> String -> String -> String -> Assertion
 testEquiv b src s s' =
-  (case unsafePerformIO (silence $ compareSpec Debug File (src, s) (src, s')) of
+  (case unsafePerformIO (hSilence [stdout, stderr] $ compareSpec Debug File (src, s) (src, s')) of
     NotEquivalent x -> NotEquivalent emptyModel
     x               -> x
    ) @?= b
@@ -22,7 +23,7 @@ testEquiv b src s s' =
 (.!=) = testEquiv $ NotEquivalent emptyModel
 
 genEquivTests edslSrc =
-  let methodIds = unsafePerformIO (silence $ parseMethodIds edslSrc)
+  let methodIds = unsafePerformIO (hSilence [stdout, stderr] $ parseMethodIds edslSrc)
       getClass = last . splitOn "_"
       tailFrom :: Eq a => [a] -> a -> [a]
       tailFrom xs x = case elemIndex x xs of Just i  -> snd $ splitAt i xs

test/TExamples.hs

 module TExamples where
-import System.IO.Unsafe (unsafePerformIO)
-import System.IO.Silently (silence)
+import System.IO          (stderr, stdout)
+import System.IO.Silently (hSilence)
+import System.IO.Unsafe   (unsafePerformIO)
 import Test.HUnit
 
-import Model
 import API
+import Model
 
 src = "examples/javawlp_edsl/src/nl/uu/javawlp_edsl/Main.java"
 
 testEquiv :: Response -> String -> String -> Assertion
 testEquiv b s s' =
-  (case unsafePerformIO (silence $ compareSpec Debug File (src, s) (src, s')) of
+  (case unsafePerformIO (hSilence [stdout, stderr] $ compareSpec Debug File (src, s) (src, s')) of
     NotEquivalent _ -> NotEquivalent emptyModel
-    x -> x
+    x               -> x
    ) @?= b
 (.==) = testEquiv Equivalent
 (.!=) = testEquiv $ NotEquivalent emptyModel