]> source.dussan.org Git - aspectj.git/commit
OutputSpec.matchesThisVm better supports version ranges
authorAlexander Kriegisch <Alexander@Kriegisch.name>
Wed, 5 Oct 2022 15:37:21 +0000 (17:37 +0200)
committerAlexander Kriegisch <Alexander@Kriegisch.name>
Wed, 5 Oct 2022 15:37:21 +0000 (17:37 +0200)
commitc84a35837e194f5ac8f38cee2998afb5ec631078
tree406595dbead848c186dccbe67a6ffbbc4e0ebfc9
parent0ff75f28fe7a0b7b4757c02b533704354c1dd46c
OutputSpec.matchesThisVm better supports version ranges

vmVersionRanges might be a single version like "9", a list of versions
like "1.2,1.3,1.4,1.5", an equivalent range of "1.2-1.5", an open range
like "-1.8", "9-" (equivalent to "9+") or a more complex list of ranges
like "-1.6,9-11,13-14,17-" or "8,11,16+".

Empty ranges like in "", " ",  "8,,14", ",5", "6-," will be ignored.
I.e., they will not yield a positive match.

Bogus ranges like "9-11-14" will be ignored, too.

Existing XML test specs using '<line text="..." vm="v,v2,...,vn"/>
have been adjusted to use version ranges rather than long lists of
consecutive versions. Furthermore, ranges with a trailing '+' like '14+'
were replaced by using the new canonical format '14-', even though the
parser still correctly recognises '14+'.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
12 files changed:
testing/src/test/java/org/aspectj/testing/OutputSpec.java
tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml
tests/src/test/resources/org/aspectj/systemtest/ajc151/ajc151.xml
tests/src/test/resources/org/aspectj/systemtest/ajc154/ajc154.xml
tests/src/test/resources/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml
tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
tests/src/test/resources/org/aspectj/systemtest/ajc170/ajc170.xml
tests/src/test/resources/org/aspectj/systemtest/ajc173/ajc173.xml
tests/src/test/resources/org/aspectj/systemtest/ajc174/ajc174.xml
tests/src/test/resources/org/aspectj/systemtest/ajc188/ajc188.xml
tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190_from150.xml