Added min max migration tests.
Change-Id: Ia4b37fc9b0305516d11aaba817c135f6307e9413
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/generated/testOrderedSet b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/generated/testOrderedSet
index 1eab700..4c76d4d 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/generated/testOrderedSet
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/generated/testOrderedSet
@@ -422,3 +422,5 @@
@Test booleans.oclAsSet() => truefalse
@Test eClasses.oclAsSet() -> collect(name) => ClasseAClasseBAbstractClass
@Test collections.oclAsSet() => abcefg
+@Test integers->min() => 1
+@Test reals->max() => 3.2
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/orderedSetsServices.mtl b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/orderedSetsServices.mtl
index 995dd85..0cd324c 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/orderedSetsServices.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/orderedSetsServices/orderedSetsServices.mtl
@@ -461,8 +461,8 @@
@Test booleans.oclAsSet() => [booleans.oclAsSet()/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses.oclAsSet() -> collect(name)/]
@Test collections.oclAsSet() => [collections.oclAsSet()/]
-[comment]A4-UNSUPPORTED min[/comment]
-[comment]A4-UNSUPPORTED max[/comment]
+@Test integers->min() => [integers->min()/]
+@Test reals->max() => [reals->max()/]
[comment]A4-UNSUPPORTED collectNested[/comment]
[comment]IRRELEVANT-A4-UNSUPPORTED oclIsInvalid[/comment]
[comment]IRRELEVANT-A4-DIFFERS: validation error instead of 'invalid' [strings.oclAsType(Integer)/][/comment]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/generated/testSequence b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/generated/testSequence
index be5ab18..4bf9ab8 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/generated/testSequence
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/generated/testSequence
@@ -428,3 +428,5 @@
@Test booleans.oclAsSet() => truefalsetrue
@Test eClasses.oclAsSet() -> collect(name) => ClasseAClasseBAbstractClass
@Test collections.oclAsSet() => abcefgabc
+@Test integers->min() => 1
+@Test reals->max() => 3.2
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/sequencesServices.mtl b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/sequencesServices.mtl
index c7979b9..c2b543e 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/sequencesServices.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/src/resources/services/sequencesServices/sequencesServices.mtl
@@ -462,8 +462,8 @@
@Test booleans.oclAsSet() => [booleans.oclAsSet()/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses.oclAsSet() -> collect(name)/]
@Test collections.oclAsSet() => [collections.oclAsSet()/]
-[comment]A4-UNSUPPORTED min[/comment]
-[comment]A4-UNSUPPORTED max[/comment]
+@Test integers->min() => [integers->min()/]
+@Test reals->max() => [reals->max()/]
[comment]A4-UNSUPPORTED collectNested[/comment]
[comment]IRRELEVANT-A4-UNSUPPORTED oclIsInvalid[/comment]
[comment]IRRELEVANT-A4-DIFFERS oclAsType: validation error instead of 'invalid' [strings.oclAsType(Integer)/][/comment]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/PASS b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/PASS
index 1e023d5..163dedd 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/PASS
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/PASS
@@ -630,6 +630,8 @@
booleans.oclAsSet()
eClasses.oclAsSet() -> collect(name)
collections.oclAsSet()
+ integers->min()
+ reals->max()
orderedSetsServices
mixed.toString()
strings.toString()
@@ -1018,3 +1020,5 @@
booleans.oclAsSet()
eClasses.oclAsSet() -> collect(name)
collections.oclAsSet()
+ integers->min()
+ reals->max()
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/TODO b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/TODO
index dd832f9..8c32c8b 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/TODO
+++ b/tests/org.eclipse.acceleo.aql.migration.tests.acceleo3/status/TODO
@@ -48,8 +48,6 @@
indexOfSlice
lastIndexOf
lastIndexOfSlice
- max
- min
product
removeAll
selectByKind
@@ -63,8 +61,6 @@
indexOfSlice
lastIndexOf
lastIndexOfSlice
- max
- min
order change: mixed -> union(OrderedSet{'a','b','d'}) => [mixed -> union(OrderedSet{'a','b','d'})/]
order change: mixed -> union(OrderedSet{'a','b'}) => [mixed -> union(OrderedSet{'a','b'})/]
product
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/generated/testOrderedSet-expected.txt b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/generated/testOrderedSet-expected.txt
index 1eab700..4c76d4d 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/generated/testOrderedSet-expected.txt
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/generated/testOrderedSet-expected.txt
@@ -422,3 +422,5 @@
@Test booleans.oclAsSet() => truefalse
@Test eClasses.oclAsSet() -> collect(name) => ClasseAClasseBAbstractClass
@Test collections.oclAsSet() => abcefg
+@Test integers->min() => 1
+@Test reals->max() => 3.2
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-expected.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-expected.mtl
index f239800..5b8e7c9 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-expected.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-expected.mtl
@@ -434,6 +434,8 @@
@Test booleans.oclAsSet() => [booleans->asSequence()->collect(temp75 | temp75->asSet())/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses->asSequence()->collect(temp76 | temp76->asSet())->collect(temp77 | temp77.name)/]
@Test collections.oclAsSet() => [collections->asSequence()->collect(temp78 | temp78->asSet())/]
+ @Test integers->min() => [integers->min()/]
+ @Test reals->max() => [reals->max()/]
[/let]
[/let]
[/let]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-origin.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-origin.mtl
index 995dd85..0cd324c 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-origin.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices-origin.mtl
@@ -461,8 +461,8 @@
@Test booleans.oclAsSet() => [booleans.oclAsSet()/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses.oclAsSet() -> collect(name)/]
@Test collections.oclAsSet() => [collections.oclAsSet()/]
-[comment]A4-UNSUPPORTED min[/comment]
-[comment]A4-UNSUPPORTED max[/comment]
+@Test integers->min() => [integers->min()/]
+@Test reals->max() => [reals->max()/]
[comment]A4-UNSUPPORTED collectNested[/comment]
[comment]IRRELEVANT-A4-UNSUPPORTED oclIsInvalid[/comment]
[comment]IRRELEVANT-A4-DIFFERS: validation error instead of 'invalid' [strings.oclAsType(Integer)/][/comment]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.emtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.emtl
index f76fdfc..a0b6d06 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.emtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.emtl
@@ -6171,6 +6171,18 @@
</body>
<iterator xsi:type="ocl.ecore:Variable" name="temp78" eType="/7/OrderedSet(String)"/>
</body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
@Test integers->min() => "/>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="integers" eType="/7/OrderedSet(Integer)" referredVariable="/0/testOrderedSet/%/%/%/%/integers"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/min"/>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
@Test reals->max() => "/>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="reals" eType="/7/OrderedSet(Real)" referredVariable="/0/testOrderedSet/%/%/%/%/%/reals"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/max"/>
+ </body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/>
<letVariable name="collections" eType="/7/OrderedSet(OrderedSet(String))">
<initExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/7/OrderedSet(OrderedSet(String))" kind="OrderedSet">
@@ -7787,52 +7799,58 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</ocl.ecore:Variable>
<ecore:EAnnotation source="positions">
<eAnnotations source="positions.0" references="/0/testOrderedSet">
<details key="start" value="72"/>
- <details key="end" value="33306"/>
+ <details key="end" value="33312"/>
<details key="line" value="3"/>
</eAnnotations>
<eAnnotations source="positions.1" references="/0/testOrderedSet/%">
<details key="start" value="136"/>
- <details key="end" value="33294"/>
+ <details key="end" value="33300"/>
<details key="line" value="5"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/testOrderedSet/%/%">
<details key="start" value="169"/>
- <details key="end" value="33286"/>
+ <details key="end" value="33292"/>
<details key="line" value="6"/>
</eAnnotations>
<eAnnotations source="positions.3" references="/0/testOrderedSet/%/%/%">
<details key="start" value="235"/>
- <details key="end" value="33280"/>
+ <details key="end" value="33286"/>
<details key="line" value="7"/>
</eAnnotations>
<eAnnotations source="positions.4" references="/0/testOrderedSet/%/%/%/%">
<details key="start" value="296"/>
- <details key="end" value="33274"/>
+ <details key="end" value="33280"/>
<details key="line" value="8"/>
</eAnnotations>
<eAnnotations source="positions.5" references="/0/testOrderedSet/%/%/%/%/%">
<details key="start" value="353"/>
- <details key="end" value="33268"/>
+ <details key="end" value="33274"/>
<details key="line" value="9"/>
</eAnnotations>
<eAnnotations source="positions.6" references="/0/testOrderedSet/%/%/%/%/%/%">
<details key="start" value="410"/>
- <details key="end" value="33262"/>
+ <details key="end" value="33268"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.7" references="/0/testOrderedSet/%/%/%/%/%/%/%">
<details key="start" value="479"/>
- <details key="end" value="33256"/>
+ <details key="end" value="33262"/>
<details key="line" value="11"/>
</eAnnotations>
<eAnnotations source="positions.8" references="/0/testOrderedSet/%/%/%/%/%/%/%/%">
<details key="start" value="548"/>
- <details key="end" value="33250"/>
+ <details key="end" value="33256"/>
<details key="line" value="12"/>
</eAnnotations>
<eAnnotations source="positions.9" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%">
@@ -19457,210 +19475,240 @@
</eAnnotations>
<eAnnotations source="positions.2333" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.639">
<details key="start" value="32951"/>
- <details key="end" value="32952"/>
+ <details key="end" value="32977"/>
<details key="line" value="464"/>
</eAnnotations>
- <eAnnotations source="positions.2334" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections">
+ <eAnnotations source="positions.2334" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.640">
+ <details key="start" value="32978"/>
+ <details key="end" value="32993"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2335" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.640/integers">
+ <details key="start" value="32978"/>
+ <details key="end" value="32986"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2336" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.641">
+ <details key="start" value="32995"/>
+ <details key="end" value="33018"/>
+ <details key="line" value="465"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2337" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.642">
+ <details key="start" value="33019"/>
+ <details key="end" value="33031"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2338" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.642/reals">
+ <details key="start" value="33019"/>
+ <details key="end" value="33024"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2339" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/%.643">
+ <details key="start" value="33033"/>
+ <details key="end" value="33034"/>
+ <details key="line" value="466"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2340" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections">
<details key="start" value="553"/>
<details key="end" value="651"/>
<details key="line" value="12"/>
</eAnnotations>
- <eAnnotations source="positions.2335" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%">
+ <eAnnotations source="positions.2341" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%">
<details key="start" value="601"/>
<details key="end" value="652"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2336" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%/strings">
+ <eAnnotations source="positions.2342" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%/strings">
<details key="start" value="612"/>
<details key="end" value="619"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2337" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%">
+ <eAnnotations source="positions.2343" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%">
<details key="start" value="620"/>
<details key="end" value="643"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2338" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%/%">
+ <eAnnotations source="positions.2344" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%/%">
<details key="start" value="631"/>
<details key="end" value="634"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2339" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.1/%">
+ <eAnnotations source="positions.2345" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.1/%">
<details key="start" value="635"/>
<details key="end" value="638"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2340" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.2/%">
+ <eAnnotations source="positions.2346" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.2/%">
<details key="start" value="639"/>
<details key="end" value="642"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2341" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.2/strings">
+ <eAnnotations source="positions.2347" references="/0/testOrderedSet/%/%/%/%/%/%/%/%/collections/%/%.2/strings">
<details key="start" value="644"/>
<details key="end" value="651"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2342" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses">
+ <eAnnotations source="positions.2348" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses">
<details key="start" value="484"/>
<details key="end" value="546"/>
<details key="line" value="11"/>
</eAnnotations>
- <eAnnotations source="positions.2343" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%">
+ <eAnnotations source="positions.2349" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%">
<details key="start" value="517"/>
<details key="end" value="547"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2344" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%/%">
+ <eAnnotations source="positions.2350" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%/%">
<details key="start" value="517"/>
<details key="end" value="531"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2345" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%/%/p">
+ <eAnnotations source="positions.2351" references="/0/testOrderedSet/%/%/%/%/%/%/%/eClasses/%/%/p">
<details key="start" value="517"/>
<details key="end" value="518"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2346" references="/0/testOrderedSet/%/%/%/%/%/%/booleans">
+ <eAnnotations source="positions.2352" references="/0/testOrderedSet/%/%/%/%/%/%/booleans">
<details key="start" value="415"/>
<details key="end" value="477"/>
<details key="line" value="10"/>
</eAnnotations>
- <eAnnotations source="positions.2347" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%">
+ <eAnnotations source="positions.2353" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%">
<details key="start" value="449"/>
<details key="end" value="478"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2348" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%/%">
+ <eAnnotations source="positions.2354" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%/%">
<details key="start" value="460"/>
<details key="end" value="464"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2349" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%.1/%">
+ <eAnnotations source="positions.2355" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%.1/%">
<details key="start" value="466"/>
<details key="end" value="471"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2350" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%.2/%">
+ <eAnnotations source="positions.2356" references="/0/testOrderedSet/%/%/%/%/%/%/booleans/%/%.2/%">
<details key="start" value="473"/>
<details key="end" value="477"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2351" references="/0/testOrderedSet/%/%/%/%/%/reals">
+ <eAnnotations source="positions.2357" references="/0/testOrderedSet/%/%/%/%/%/reals">
<details key="start" value="358"/>
<details key="end" value="408"/>
<details key="line" value="9"/>
</eAnnotations>
- <eAnnotations source="positions.2352" references="/0/testOrderedSet/%/%/%/%/%/reals/%">
+ <eAnnotations source="positions.2358" references="/0/testOrderedSet/%/%/%/%/%/reals/%">
<details key="start" value="386"/>
<details key="end" value="409"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2353" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%/%">
+ <eAnnotations source="positions.2359" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%/%">
<details key="start" value="397"/>
<details key="end" value="400"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2354" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%.1/%">
+ <eAnnotations source="positions.2360" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%.1/%">
<details key="start" value="401"/>
<details key="end" value="404"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2355" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%.2/%">
+ <eAnnotations source="positions.2361" references="/0/testOrderedSet/%/%/%/%/%/reals/%/%.2/%">
<details key="start" value="405"/>
<details key="end" value="408"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2356" references="/0/testOrderedSet/%/%/%/%/integers">
+ <eAnnotations source="positions.2362" references="/0/testOrderedSet/%/%/%/%/integers">
<details key="start" value="301"/>
<details key="end" value="351"/>
<details key="line" value="8"/>
</eAnnotations>
- <eAnnotations source="positions.2357" references="/0/testOrderedSet/%/%/%/%/integers/%">
+ <eAnnotations source="positions.2363" references="/0/testOrderedSet/%/%/%/%/integers/%">
<details key="start" value="335"/>
<details key="end" value="352"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2358" references="/0/testOrderedSet/%/%/%/%/integers/%/%/%">
+ <eAnnotations source="positions.2364" references="/0/testOrderedSet/%/%/%/%/integers/%/%/%">
<details key="start" value="346"/>
<details key="end" value="347"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2359" references="/0/testOrderedSet/%/%/%/%/integers/%/%.1/%">
+ <eAnnotations source="positions.2365" references="/0/testOrderedSet/%/%/%/%/integers/%/%.1/%">
<details key="start" value="348"/>
<details key="end" value="349"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2360" references="/0/testOrderedSet/%/%/%/%/integers/%/%.2/%">
+ <eAnnotations source="positions.2366" references="/0/testOrderedSet/%/%/%/%/integers/%/%.2/%">
<details key="start" value="350"/>
<details key="end" value="351"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2361" references="/0/testOrderedSet/%/%/%/strings">
+ <eAnnotations source="positions.2367" references="/0/testOrderedSet/%/%/%/strings">
<details key="start" value="240"/>
<details key="end" value="294"/>
<details key="line" value="7"/>
</eAnnotations>
- <eAnnotations source="positions.2362" references="/0/testOrderedSet/%/%/%/strings/%">
+ <eAnnotations source="positions.2368" references="/0/testOrderedSet/%/%/%/strings/%">
<details key="start" value="272"/>
<details key="end" value="295"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2363" references="/0/testOrderedSet/%/%/%/strings/%/%/%">
+ <eAnnotations source="positions.2369" references="/0/testOrderedSet/%/%/%/strings/%/%/%">
<details key="start" value="283"/>
<details key="end" value="286"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2364" references="/0/testOrderedSet/%/%/%/strings/%/%.1/%">
+ <eAnnotations source="positions.2370" references="/0/testOrderedSet/%/%/%/strings/%/%.1/%">
<details key="start" value="287"/>
<details key="end" value="290"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2365" references="/0/testOrderedSet/%/%/%/strings/%/%.2/%">
+ <eAnnotations source="positions.2371" references="/0/testOrderedSet/%/%/%/strings/%/%.2/%">
<details key="start" value="291"/>
<details key="end" value="294"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2366" references="/0/testOrderedSet/%/%/mixed">
+ <eAnnotations source="positions.2372" references="/0/testOrderedSet/%/%/mixed">
<details key="start" value="174"/>
<details key="end" value="233"/>
<details key="line" value="6"/>
</eAnnotations>
- <eAnnotations source="positions.2367" references="/0/testOrderedSet/%/%/mixed/%">
+ <eAnnotations source="positions.2373" references="/0/testOrderedSet/%/%/mixed/%">
<details key="start" value="204"/>
<details key="end" value="234"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2368" references="/0/testOrderedSet/%/%/mixed/%/%/%">
+ <eAnnotations source="positions.2374" references="/0/testOrderedSet/%/%/mixed/%/%/%">
<details key="start" value="215"/>
<details key="end" value="218"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2369" references="/0/testOrderedSet/%/%/mixed/%/%.1/%">
+ <eAnnotations source="positions.2375" references="/0/testOrderedSet/%/%/mixed/%/%.1/%">
<details key="start" value="219"/>
<details key="end" value="222"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2370" references="/0/testOrderedSet/%/%/mixed/%/%.2/%">
+ <eAnnotations source="positions.2376" references="/0/testOrderedSet/%/%/mixed/%/%.2/%">
<details key="start" value="223"/>
<details key="end" value="224"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2371" references="/0/testOrderedSet/%/%/mixed/%/%.3/%">
+ <eAnnotations source="positions.2377" references="/0/testOrderedSet/%/%/mixed/%/%.3/%">
<details key="start" value="225"/>
<details key="end" value="228"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2372" references="/0/testOrderedSet/%/%/mixed/%/%.4/%">
+ <eAnnotations source="positions.2378" references="/0/testOrderedSet/%/%/mixed/%/%.4/%">
<details key="start" value="229"/>
<details key="end" value="233"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2373" references="/0/testOrderedSet/%/%.1">
+ <eAnnotations source="positions.2379" references="/0/testOrderedSet/%/%.1">
<details key="start" value="143"/>
<details key="end" value="159"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2374" references="/0/testOrderedSet/p">
+ <eAnnotations source="positions.2380" references="/0/testOrderedSet/p">
<details key="start" value="104"/>
<details key="end" value="116"/>
<details key="line" value="3"/>
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.mtl
index f239800..5b8e7c9 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/orderedSetsServices/orderedSetsServices.mtl
@@ -434,6 +434,8 @@
@Test booleans.oclAsSet() => [booleans->asSequence()->collect(temp75 | temp75->asSet())/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses->asSequence()->collect(temp76 | temp76->asSet())->collect(temp77 | temp77.name)/]
@Test collections.oclAsSet() => [collections->asSequence()->collect(temp78 | temp78->asSet())/]
+ @Test integers->min() => [integers->min()/]
+ @Test reals->max() => [reals->max()/]
[/let]
[/let]
[/let]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/generated/testSequence-expected.txt b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/generated/testSequence-expected.txt
index be5ab18..4bf9ab8 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/generated/testSequence-expected.txt
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/generated/testSequence-expected.txt
@@ -428,3 +428,5 @@
@Test booleans.oclAsSet() => truefalsetrue
@Test eClasses.oclAsSet() -> collect(name) => ClasseAClasseBAbstractClass
@Test collections.oclAsSet() => abcefgabc
+@Test integers->min() => 1
+@Test reals->max() => 3.2
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-expected.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-expected.mtl
index 6f13b30..b5e4f23 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-expected.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-expected.mtl
@@ -440,6 +440,8 @@
@Test booleans.oclAsSet() => [booleans->collect(temp69 | temp69->asSet())/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses->collect(temp70 | temp70->asSet())->collect(temp71 | temp71.name)/]
@Test collections.oclAsSet() => [collections->collect(temp72 | temp72->asSet())/]
+ @Test integers->min() => [integers->min()/]
+ @Test reals->max() => [reals->max()/]
[/let]
[/let]
[/let]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-origin.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-origin.mtl
index c7979b9..c2b543e 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-origin.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices-origin.mtl
@@ -462,8 +462,8 @@
@Test booleans.oclAsSet() => [booleans.oclAsSet()/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses.oclAsSet() -> collect(name)/]
@Test collections.oclAsSet() => [collections.oclAsSet()/]
-[comment]A4-UNSUPPORTED min[/comment]
-[comment]A4-UNSUPPORTED max[/comment]
+@Test integers->min() => [integers->min()/]
+@Test reals->max() => [reals->max()/]
[comment]A4-UNSUPPORTED collectNested[/comment]
[comment]IRRELEVANT-A4-UNSUPPORTED oclIsInvalid[/comment]
[comment]IRRELEVANT-A4-DIFFERS oclAsType: validation error instead of 'invalid' [strings.oclAsType(Integer)/][/comment]
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.emtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.emtl
index f61efe3..97c8ffc 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.emtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.emtl
@@ -6163,6 +6163,18 @@
</body>
<iterator xsi:type="ocl.ecore:Variable" name="temp72" eType="/7/Sequence(String)"/>
</body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
@Test integers->min() => "/>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="integers" eType="/7/Sequence(Integer)" referredVariable="/0/testSequence/%/%/%/%/integers"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/min"/>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
@Test reals->max() => "/>
+ <body xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="reals" eType="/7/Sequence(Real)" referredVariable="/0/testSequence/%/%/%/%/%/reals"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/max"/>
+ </body>
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/>
<letVariable name="collections" eType="/7/Sequence(Sequence(String))">
<initExpression xsi:type="ocl.ecore:CollectionLiteralExp" eType="/7/Sequence(Sequence(String))" kind="Sequence">
@@ -7780,52 +7792,58 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
</ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</ocl.ecore:Variable>
<ecore:EAnnotation source="positions">
<eAnnotations source="positions.0" references="/0/testSequence">
<details key="start" value="70"/>
- <details key="end" value="32375"/>
+ <details key="end" value="32381"/>
<details key="line" value="3"/>
</eAnnotations>
<eAnnotations source="positions.1" references="/0/testSequence/%">
<details key="start" value="132"/>
- <details key="end" value="32363"/>
+ <details key="end" value="32369"/>
<details key="line" value="5"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/testSequence/%/%">
<details key="start" value="163"/>
- <details key="end" value="32355"/>
+ <details key="end" value="32361"/>
<details key="line" value="6"/>
</eAnnotations>
<eAnnotations source="positions.3" references="/0/testSequence/%/%/%">
<details key="start" value="225"/>
- <details key="end" value="32349"/>
+ <details key="end" value="32355"/>
<details key="line" value="7"/>
</eAnnotations>
<eAnnotations source="positions.4" references="/0/testSequence/%/%/%/%">
<details key="start" value="282"/>
- <details key="end" value="32343"/>
+ <details key="end" value="32349"/>
<details key="line" value="8"/>
</eAnnotations>
<eAnnotations source="positions.5" references="/0/testSequence/%/%/%/%/%">
<details key="start" value="335"/>
- <details key="end" value="32337"/>
+ <details key="end" value="32343"/>
<details key="line" value="9"/>
</eAnnotations>
<eAnnotations source="positions.6" references="/0/testSequence/%/%/%/%/%/%">
<details key="start" value="388"/>
- <details key="end" value="32331"/>
+ <details key="end" value="32337"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.7" references="/0/testSequence/%/%/%/%/%/%/%">
<details key="start" value="453"/>
- <details key="end" value="32325"/>
+ <details key="end" value="32331"/>
<details key="line" value="11"/>
</eAnnotations>
<eAnnotations source="positions.8" references="/0/testSequence/%/%/%/%/%/%/%/%">
<details key="start" value="518"/>
- <details key="end" value="32319"/>
+ <details key="end" value="32325"/>
<details key="line" value="12"/>
</eAnnotations>
<eAnnotations source="positions.9" references="/0/testSequence/%/%/%/%/%/%/%/%/%">
@@ -19425,210 +19443,240 @@
</eAnnotations>
<eAnnotations source="positions.2328" references="/0/testSequence/%/%/%/%/%/%/%/%/%.649">
<details key="start" value="32010"/>
- <details key="end" value="32011"/>
+ <details key="end" value="32036"/>
<details key="line" value="465"/>
</eAnnotations>
- <eAnnotations source="positions.2329" references="/0/testSequence/%/%/%/%/%/%/%/%/collections">
+ <eAnnotations source="positions.2329" references="/0/testSequence/%/%/%/%/%/%/%/%/%.650">
+ <details key="start" value="32037"/>
+ <details key="end" value="32052"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2330" references="/0/testSequence/%/%/%/%/%/%/%/%/%.650/integers">
+ <details key="start" value="32037"/>
+ <details key="end" value="32045"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2331" references="/0/testSequence/%/%/%/%/%/%/%/%/%.651">
+ <details key="start" value="32054"/>
+ <details key="end" value="32077"/>
+ <details key="line" value="466"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2332" references="/0/testSequence/%/%/%/%/%/%/%/%/%.652">
+ <details key="start" value="32078"/>
+ <details key="end" value="32090"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2333" references="/0/testSequence/%/%/%/%/%/%/%/%/%.652/reals">
+ <details key="start" value="32078"/>
+ <details key="end" value="32083"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2334" references="/0/testSequence/%/%/%/%/%/%/%/%/%.653">
+ <details key="start" value="32092"/>
+ <details key="end" value="32093"/>
+ <details key="line" value="467"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2335" references="/0/testSequence/%/%/%/%/%/%/%/%/collections">
<details key="start" value="523"/>
<details key="end" value="613"/>
<details key="line" value="12"/>
</eAnnotations>
- <eAnnotations source="positions.2330" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%">
+ <eAnnotations source="positions.2336" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%">
<details key="start" value="567"/>
<details key="end" value="614"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2331" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%/strings">
+ <eAnnotations source="positions.2337" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%/strings">
<details key="start" value="576"/>
<details key="end" value="583"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2332" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%">
+ <eAnnotations source="positions.2338" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%">
<details key="start" value="584"/>
<details key="end" value="605"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2333" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%/%">
+ <eAnnotations source="positions.2339" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%/%">
<details key="start" value="593"/>
<details key="end" value="596"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2334" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.1/%">
+ <eAnnotations source="positions.2340" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.1/%">
<details key="start" value="597"/>
<details key="end" value="600"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2335" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.2/%">
+ <eAnnotations source="positions.2341" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.1/%/%.2/%">
<details key="start" value="601"/>
<details key="end" value="604"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2336" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.2/strings">
+ <eAnnotations source="positions.2342" references="/0/testSequence/%/%/%/%/%/%/%/%/collections/%/%.2/strings">
<details key="start" value="606"/>
<details key="end" value="613"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2337" references="/0/testSequence/%/%/%/%/%/%/%/eClasses">
+ <eAnnotations source="positions.2343" references="/0/testSequence/%/%/%/%/%/%/%/eClasses">
<details key="start" value="458"/>
<details key="end" value="516"/>
<details key="line" value="11"/>
</eAnnotations>
- <eAnnotations source="positions.2338" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%">
+ <eAnnotations source="positions.2344" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%">
<details key="start" value="489"/>
<details key="end" value="517"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2339" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%/%">
+ <eAnnotations source="positions.2345" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%/%">
<details key="start" value="489"/>
<details key="end" value="503"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2340" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%/%/p">
+ <eAnnotations source="positions.2346" references="/0/testSequence/%/%/%/%/%/%/%/eClasses/%/%/p">
<details key="start" value="489"/>
<details key="end" value="490"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2341" references="/0/testSequence/%/%/%/%/%/%/booleans">
+ <eAnnotations source="positions.2347" references="/0/testSequence/%/%/%/%/%/%/booleans">
<details key="start" value="393"/>
<details key="end" value="451"/>
<details key="line" value="10"/>
</eAnnotations>
- <eAnnotations source="positions.2342" references="/0/testSequence/%/%/%/%/%/%/booleans/%">
+ <eAnnotations source="positions.2348" references="/0/testSequence/%/%/%/%/%/%/booleans/%">
<details key="start" value="425"/>
<details key="end" value="452"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2343" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%/%">
+ <eAnnotations source="positions.2349" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%/%">
<details key="start" value="434"/>
<details key="end" value="438"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2344" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%.1/%">
+ <eAnnotations source="positions.2350" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%.1/%">
<details key="start" value="440"/>
<details key="end" value="445"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2345" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%.2/%">
+ <eAnnotations source="positions.2351" references="/0/testSequence/%/%/%/%/%/%/booleans/%/%.2/%">
<details key="start" value="447"/>
<details key="end" value="451"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2346" references="/0/testSequence/%/%/%/%/%/reals">
+ <eAnnotations source="positions.2352" references="/0/testSequence/%/%/%/%/%/reals">
<details key="start" value="340"/>
<details key="end" value="386"/>
<details key="line" value="9"/>
</eAnnotations>
- <eAnnotations source="positions.2347" references="/0/testSequence/%/%/%/%/%/reals/%">
+ <eAnnotations source="positions.2353" references="/0/testSequence/%/%/%/%/%/reals/%">
<details key="start" value="366"/>
<details key="end" value="387"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2348" references="/0/testSequence/%/%/%/%/%/reals/%/%/%">
+ <eAnnotations source="positions.2354" references="/0/testSequence/%/%/%/%/%/reals/%/%/%">
<details key="start" value="375"/>
<details key="end" value="378"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2349" references="/0/testSequence/%/%/%/%/%/reals/%/%.1/%">
+ <eAnnotations source="positions.2355" references="/0/testSequence/%/%/%/%/%/reals/%/%.1/%">
<details key="start" value="379"/>
<details key="end" value="382"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2350" references="/0/testSequence/%/%/%/%/%/reals/%/%.2/%">
+ <eAnnotations source="positions.2356" references="/0/testSequence/%/%/%/%/%/reals/%/%.2/%">
<details key="start" value="383"/>
<details key="end" value="386"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2351" references="/0/testSequence/%/%/%/%/integers">
+ <eAnnotations source="positions.2357" references="/0/testSequence/%/%/%/%/integers">
<details key="start" value="287"/>
<details key="end" value="333"/>
<details key="line" value="8"/>
</eAnnotations>
- <eAnnotations source="positions.2352" references="/0/testSequence/%/%/%/%/integers/%">
+ <eAnnotations source="positions.2358" references="/0/testSequence/%/%/%/%/integers/%">
<details key="start" value="319"/>
<details key="end" value="334"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2353" references="/0/testSequence/%/%/%/%/integers/%/%/%">
+ <eAnnotations source="positions.2359" references="/0/testSequence/%/%/%/%/integers/%/%/%">
<details key="start" value="328"/>
<details key="end" value="329"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2354" references="/0/testSequence/%/%/%/%/integers/%/%.1/%">
+ <eAnnotations source="positions.2360" references="/0/testSequence/%/%/%/%/integers/%/%.1/%">
<details key="start" value="330"/>
<details key="end" value="331"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2355" references="/0/testSequence/%/%/%/%/integers/%/%.2/%">
+ <eAnnotations source="positions.2361" references="/0/testSequence/%/%/%/%/integers/%/%.2/%">
<details key="start" value="332"/>
<details key="end" value="333"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2356" references="/0/testSequence/%/%/%/strings">
+ <eAnnotations source="positions.2362" references="/0/testSequence/%/%/%/strings">
<details key="start" value="230"/>
<details key="end" value="280"/>
<details key="line" value="7"/>
</eAnnotations>
- <eAnnotations source="positions.2357" references="/0/testSequence/%/%/%/strings/%">
+ <eAnnotations source="positions.2363" references="/0/testSequence/%/%/%/strings/%">
<details key="start" value="260"/>
<details key="end" value="281"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2358" references="/0/testSequence/%/%/%/strings/%/%/%">
+ <eAnnotations source="positions.2364" references="/0/testSequence/%/%/%/strings/%/%/%">
<details key="start" value="269"/>
<details key="end" value="272"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2359" references="/0/testSequence/%/%/%/strings/%/%.1/%">
+ <eAnnotations source="positions.2365" references="/0/testSequence/%/%/%/strings/%/%.1/%">
<details key="start" value="273"/>
<details key="end" value="276"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2360" references="/0/testSequence/%/%/%/strings/%/%.2/%">
+ <eAnnotations source="positions.2366" references="/0/testSequence/%/%/%/strings/%/%.2/%">
<details key="start" value="277"/>
<details key="end" value="280"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2361" references="/0/testSequence/%/%/mixed">
+ <eAnnotations source="positions.2367" references="/0/testSequence/%/%/mixed">
<details key="start" value="168"/>
<details key="end" value="223"/>
<details key="line" value="6"/>
</eAnnotations>
- <eAnnotations source="positions.2362" references="/0/testSequence/%/%/mixed/%">
+ <eAnnotations source="positions.2368" references="/0/testSequence/%/%/mixed/%">
<details key="start" value="196"/>
<details key="end" value="224"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2363" references="/0/testSequence/%/%/mixed/%/%/%">
+ <eAnnotations source="positions.2369" references="/0/testSequence/%/%/mixed/%/%/%">
<details key="start" value="205"/>
<details key="end" value="208"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2364" references="/0/testSequence/%/%/mixed/%/%.1/%">
+ <eAnnotations source="positions.2370" references="/0/testSequence/%/%/mixed/%/%.1/%">
<details key="start" value="209"/>
<details key="end" value="212"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2365" references="/0/testSequence/%/%/mixed/%/%.2/%">
+ <eAnnotations source="positions.2371" references="/0/testSequence/%/%/mixed/%/%.2/%">
<details key="start" value="213"/>
<details key="end" value="214"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2366" references="/0/testSequence/%/%/mixed/%/%.3/%">
+ <eAnnotations source="positions.2372" references="/0/testSequence/%/%/mixed/%/%.3/%">
<details key="start" value="215"/>
<details key="end" value="218"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2367" references="/0/testSequence/%/%/mixed/%/%.4/%">
+ <eAnnotations source="positions.2373" references="/0/testSequence/%/%/mixed/%/%.4/%">
<details key="start" value="219"/>
<details key="end" value="223"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2368" references="/0/testSequence/%/%.1">
+ <eAnnotations source="positions.2374" references="/0/testSequence/%/%.1">
<details key="start" value="139"/>
<details key="end" value="153"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.2369" references="/0/testSequence/p">
+ <eAnnotations source="positions.2375" references="/0/testSequence/p">
<details key="start" value="100"/>
<details key="end" value="112"/>
<details key="line" value="3"/>
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.mtl b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.mtl
index 6f13b30..b5e4f23 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.mtl
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/resources/services/sequencesServices/sequencesServices.mtl
@@ -440,6 +440,8 @@
@Test booleans.oclAsSet() => [booleans->collect(temp69 | temp69->asSet())/]
@Test eClasses.oclAsSet() -> collect(name) => [eClasses->collect(temp70 | temp70->asSet())->collect(temp71 | temp71.name)/]
@Test collections.oclAsSet() => [collections->collect(temp72 | temp72->asSet())/]
+ @Test integers->min() => [integers->min()/]
+ @Test reals->max() => [reals->max()/]
[/let]
[/let]
[/let]
