Fix tests

Author: hadrienk

vtl-engine/src/main/java/fr/insee/vtl/engine/VtlScriptEngine.java

@@ -20,6 +20,7 @@
 import java.util.stream.Stream;
 import javax.script.*;
 import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.Interval;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
@@ -103,9 +104,11 @@ public static Positioned fromTokens(Token from, Token to) {
     if (to == null) {
       to = from;
     }
+    var stream = from.getInputStream();
+    var text = stream.getText(new Interval(from.getStartIndex(), to.getStopIndex()));
     var position =
         new Positioned.Position(
-            "",
+            text,
             from.getLine() - 1,
             to.getLine() - 1,
             from.getCharPositionInLine(),

vtl-engine/src/test/java/fr/insee/vtl/engine/utils/dag/DagTest.java

@@ -148,7 +148,7 @@ private static Positioned.Position getPositionOfStatementInScript(
       }
     }
 
-    return new Positioned.Position("", startLine, endLine, startColumn, endColumn);
+    return new Positioned.Position(statement, startLine, endLine, startColumn, endColumn);
   }
 
   @BeforeEach

vtl-engine/src/test/java/fr/insee/vtl/engine/visitors/ClauseVisitorTest.java

@@ -140,8 +140,8 @@ public void testRenameClause_unknownVariable() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename missing to foo];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 47, 58))
-        .hasMessageContaining("Error: source column to rename not found: 'missing'");
+        .is(atPosition(0, 17, 24))
+        .hasMessage("undefined variable 'missing' in 'ds1'");
   }
 
   @Test
@@ -159,8 +159,7 @@ public void testRenameClause_duplicateToNamesShouldFail() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename age to dup, weight to dup];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 47, 58))
-        .hasMessageContaining("Error: source column to rename not found: 'missing'");
+        .hasMessage("'dup', is already defined in 'ds1'");
   }
 
   @Test
@@ -178,8 +177,8 @@ public void testRenameClause_duplicateFromNamesShouldFail() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename age to foo, age to bar];"))
         .isInstanceOf(VtlScriptException.class)
-        .hasMessageContaining("Error: duplicate source name in RENAME clause: 'age'")
-        .is(atPosition(0, 47, 58));
+        .hasMessageContaining("duplicate from name 'age'")
+        .is(atPosition(0, 29, 32));
   }
 
   @Test
@@ -198,9 +197,8 @@ public void testRenameClause_duplicateToNameShouldFail() {
     assertThatThrownBy(
             () -> engine.eval("ds := ds1[rename age to weight, weight to age, name to age];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 47, 58))
-        .hasMessageContaining(
-            "TODO: Improve: Error: duplicate output column name in RENAME clause: 'name'");
+        .hasMessage(
+            "'age', is already defined in 'ds1'");
   }
 
   /** RENAME: duplicate "from" name inside the clause must raise a detailed script error. */
@@ -218,8 +216,8 @@ public void testRenameClause_duplicateFromNameShouldFail() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename age to weight, age to weight2];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 0, 0, 0))
-        .hasMessage("TODO: Improve: duplicate source name in RENAME clause");
+        .is(atPosition(0, 32, 35))
+        .hasMessageContaining("duplicate from name 'age'");
   }
 
   /** RENAME: "from" column must exist in dataset. */
@@ -235,8 +233,8 @@ public void testRenameClause_fromColumnNotFoundShouldFail() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename unknown to something];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 0, 0, 0))
-        .hasMessageContaining("TODO: Improve: source column to rename not found: 'unknown'");
+        .is(atPosition(0, 17, 24))
+        .hasMessage("undefined variable 'unknown' in 'ds1'");
   }
 
   /**
@@ -255,10 +253,8 @@ public void testRenameClause_targetCollidesWithUntouchedShouldFail() {
 
     assertThatThrownBy(() -> engine.eval("ds := ds1[rename name to age];"))
         .isInstanceOf(VtlScriptException.class)
-        .is(atPosition(0, 0, 0, 0))
-        .hasMessageContaining("target name 'age'") // main message
-        .hasMessageContaining("already exists in dataset and is not being renamed")
-        .hasMessageContaining("(role=MEASURE, type=class java.lang.Long)");
+        .is(atPosition(0, 25, 28))
+        .hasMessage("'age', is already defined in 'ds1'");
   }
 
   @Test

vtl-engine/src/test/java/fr/insee/vtl/engine/visitors/expression/functions/JoinFunctionsTest.java

@@ -137,7 +137,7 @@ public void testLeftJoinWithDifferentIdentifiers() throws ScriptException {
                                         result2 := left_join(ds_1_1, ds_2 using Id_2);\
                                         """))
         .isInstanceOf(InvalidArgumentException.class)
-        .hasMessage("using component Id_2 has to be an identifier");
+        .hasMessageContaining("CALC cannot overwrite IDENTIFIER 'Id_2'");
   }
 
   @Test