Fixed #152 AQL: Incorrect query validation when a service is used as …

…a collector and then normally.
eclipse-acceleo · Apr 11, 2024 · 0b59c70 · 0b59c70
1 parent c84f0c6
commit 0b59c70
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/AbstractService.java b/...org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/AbstractService.java
@@ -103,7 +103,7 @@ public Set<IType> getType(IReadOnlyQueryEnvironment queryEnvironment) {
 			returnTypes = computeType(queryEnvironment);
 		}
 
-		return returnTypes;
+		return new LinkedHashSet<>(returnTypes);
 	}
 
 	/**

diff --git a/...clipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java b/...clipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
@@ -2389,6 +2389,25 @@ public void allInstancesSetTest() {
 		assertEquals(0, validationResult.getMessages(((Call)ast).getArguments().get(0)).size());
 	}
 
+	@Test
+	public void bug152() {
+		final IValidationResult validationResult = engine.validate(
+				"Sequence{'1','2'}.toInteger()->first() > '1'.toInteger()", variableTypes);
+		final Expression ast = validationResult.getAstResult().getAst();
+		final Set<IType> possibleTypes = validationResult.getPossibleTypes(ast);
+
+		assertEquals(1, possibleTypes.size());
+		final Iterator<IType> it = possibleTypes.iterator();
+		IType possibleType = it.next();
+		assertTrue(possibleType instanceof ClassType);
+		assertEquals(Boolean.class, possibleType.getType());
+
+		assertEquals(0, validationResult.getMessages().size());
+
+		assertEquals(0, validationResult.getMessages(ast).size());
+		assertEquals(0, validationResult.getMessages(((Call)ast).getArguments().get(0)).size());
+	}
+
 	/**
 	 * Asserts the given {@link IValidationMessage} against expected values.
 	 *