Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / tests / org.simantics.scl.compiler.tests / src / org / simantics / scl / compiler / tests / TestExpressionEvaluator.java

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 e143c6ab92afcf1a3eadb12d310f092c2b8b556c..b78d485287e5bcfee07a47dc87a8d702135fb0f4 100644 (file)
--- 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
@@ -2,6 +2,7 @@ package org.simantics.scl.compiler.tests;
 
 import java.util.Arrays;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.simantics.scl.compiler.elaboration.expressions.EVariable;
@@ -16,19 +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 junit.framework.Assert;
+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;
 
@@ -50,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;
         }
     }
@@ -66,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;
         }
     }
@@ -75,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);
@@ -151,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;
         }
     }