X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=tests%2Forg.simantics.scl.compiler.tests%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Ftests%2FTestExpressionEvaluator.java;h=b78d485287e5bcfee07a47dc87a8d702135fb0f4;hp=2e887ca1a420b04a0ed1dda7cc702f64bdd9b728;hb=1dfeb7d5c49b1391cd9d877e1eddab18995cb151;hpb=c13c4179bda758e77fe1f2032d3c4268bb9e3120

diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java
index 2e887ca1a..b78d48528 100644
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/TestExpressionEvaluator.java
@@ -17,17 +17,18 @@ import org.simantics.scl.compiler.module.repository.ImportFailure;
 import org.simantics.scl.compiler.module.repository.ImportFailureException;
 import org.simantics.scl.compiler.module.repository.ModuleRepository;
 import org.simantics.scl.compiler.runtime.RuntimeEnvironment;
-import org.simantics.scl.compiler.source.repository.CompositeModuleSourceRepository;
-import org.simantics.scl.compiler.source.repository.SourceRepositories;
 import org.simantics.scl.compiler.top.ExpressionEvaluator;
 import org.simantics.scl.compiler.top.SCLExpressionCompilationException;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.runtime.function.Function;
 import org.simantics.scl.runtime.tuple.Tuple0;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestExpressionEvaluator {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestExpressionEvaluator.class);
     public static final boolean TIMING = false;
     public static final int COUNT = 10000;
 
@@ -49,7 +50,7 @@ public class TestExpressionEvaluator {
                     getClass().getClassLoader());
         } catch(ImportFailureException e) {
             for(ImportFailure failure : e.failures)
-                System.err.println("Failed to import " + failure.moduleName);
+                LOGGER.warn("Failed to import " + failure.moduleName);
             throw e;
         }
     }
@@ -65,7 +66,7 @@ public class TestExpressionEvaluator {
             if(expectedValue != null)
                 Assert.assertEquals(expectedValue, result);
         } catch(SCLExpressionCompilationException e) {
-            System.out.println(CompilationErrorFormatter.toString(expressionText, e.getErrors()));
+            LOGGER.error(CompilationErrorFormatter.toString(expressionText, e.getErrors()));
             throw e;
         }
     }
@@ -74,12 +75,12 @@ public class TestExpressionEvaluator {
             Object expectedValue,
             Type expectedType) throws Exception {
         if(TIMING) {
-            System.out.println(expressionText);
+            LOGGER.info(expressionText);
             long beginTime = System.nanoTime();
             for(int i=0;i<COUNT;++i)
                 testExpression0(expressionText, expectedValue, expectedType);
             long endTime = System.nanoTime();
-            System.out.println( "    " + (endTime-beginTime)*1e-6/COUNT + " ms");
+            LOGGER.info( "    " + (endTime-beginTime)*1e-6/COUNT + " ms");
         }
         else
             testExpression0(expressionText, expectedValue, expectedType);
@@ -150,7 +151,7 @@ public class TestExpressionEvaluator {
                     Double.valueOf(15.0),
                     ((Function)result).apply(7.0, 8.0));
         } catch(SCLExpressionCompilationException e) {
-            System.out.println(CompilationErrorFormatter.toString(expressionText, e.getErrors()));
+            LOGGER.error(CompilationErrorFormatter.toString(expressionText, e.getErrors()));
             throw e;
         }
     }