Fixed allInstances(Set) documentation and added a test.

eclipse-acceleo · Feb 23, 2024 · bc5661b · bc5661b
1 parent 6322c35
commit bc5661b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/...ins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EObjectServices.java b/...ins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/EObjectServices.java
@@ -1682,14 +1682,14 @@ public List<EObject> allInstances(EClass type) {
 
 	// @formatter:off
 	@Documentation(
-		value = "Returns all instances of any EClass from the OrderedSet",
+		value = "Returns all instances of each EClass from the OrderedSet",
 		params = {
 			@Param(name = "types", value = "The OrderedSet of EClass"),
 		},
-		result = "all instances of any EClass from the OrderedSet",
+		result = "all instances of each EClass from the OrderedSet",
 		examples = {
 			@Example(
-				expression = "anEClass.allInstances({ecore::EPackage | ecore::EClass})",
+				expression = "{ecore::EPackage | ecore::EClass}->allInstances()",
 				result = "Sequence{ePackage, eClass, ...}"
 			)
 		}

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
@@ -2340,6 +2340,33 @@ public void allInstancesTest() {
 		assertEquals(0, validationResult.getMessages(((Call)ast).getArguments().get(0)).size());
 	}
 
+	@Test
+	public void allInstancesSetTest() {
+		final IValidationResult validationResult = engine.validate(
+				"{ecore::EPackage | ecore::EClass}->allInstances()", variableTypes);
+		final Expression ast = validationResult.getAstResult().getAst();
+		final Set<IType> possibleTypes = validationResult.getPossibleTypes(ast);
+
+		assertEquals(2, possibleTypes.size());
+		final Iterator<IType> it = possibleTypes.iterator();
+		IType possibleType = it.next();
+		assertTrue(possibleType instanceof SequenceType);
+		assertTrue(((SequenceType)possibleType).getCollectionType() instanceof EClassifierType);
+		assertEquals(EcorePackage.eINSTANCE.getEPackage(), ((EClassifierType)((SequenceType)possibleType)
+				.getCollectionType()).getType());
+
+		possibleType = it.next();
+		assertTrue(possibleType instanceof SequenceType);
+		assertTrue(((SequenceType)possibleType).getCollectionType() instanceof EClassifierType);
+		assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)((SequenceType)possibleType)
+				.getCollectionType()).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.
 	 *