diff options
| author | Lars Grefer <eclipse@larsgrefer.de> | 2020-08-14 23:00:48 +0200 |
|---|---|---|
| committer | Lars Grefer <eclipse@larsgrefer.de> | 2020-08-14 23:00:48 +0200 |
| commit | 17c4c44c4cd0051b2a0884cd70bdbd9ac3d15b0f (patch) | |
| tree | 897e1ed0d6314c4769dcadd1f2fed4e4a54d0377 /testing/src/test | |
| parent | 05f797adde987f614684cb70999be99c549d6826 (diff) | |
| parent | dbbbac8dbd25a19c56568623b823eba4e6e2906a (diff) | |
| download | aspectj-17c4c44c4cd0051b2a0884cd70bdbd9ac3d15b0f.tar.gz aspectj-17c4c44c4cd0051b2a0884cd70bdbd9ac3d15b0f.zip | |
Merge branch 'master' of github.com:eclipse/org.aspectj into remove-old-version-checks
Diffstat (limited to 'testing/src/test')
| -rw-r--r-- | testing/src/test/java/org/aspectj/testing/OutputSpec.java | 7 | ||||
| -rw-r--r-- | testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/testing/src/test/java/org/aspectj/testing/OutputSpec.java b/testing/src/test/java/org/aspectj/testing/OutputSpec.java index 62a22cb80..ca7d0f232 100644 --- a/testing/src/test/java/org/aspectj/testing/OutputSpec.java +++ b/testing/src/test/java/org/aspectj/testing/OutputSpec.java @@ -36,7 +36,12 @@ public class OutputSpec { private boolean matchesThisVm(String vm) { // vm might be 1.2, 1.3, 1.4, 1.5 or 1.9 possibly with a '+' in there // For now assume + is attached to there only being one version, like "9+" - if (vm.contains(LangUtil.getVmVersionString())) { + // System.out.println("Checking "+vm+" for "+LangUtil.getVmVersionString()); + String v = LangUtil.getVmVersionString(); + if (v.endsWith(".0")) { + v = v.substring(0,v.length()-2); + } + if (vm.contains(v)) { return true; } if (vm.endsWith("+")) { diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java index 92aaec667..ea88c49f1 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java @@ -834,13 +834,11 @@ public class JavaRun implements IAjcRun { throw new ExitCalledException(exitCode); } } - @Override public void checkAwtEventQueueAccess() { if ((null != runThread) && runThread.equals(Thread.currentThread())) { throw new AwtUsedException(); } } - @Override public void checkSystemClipboardAccess() { // permit } @@ -885,7 +883,6 @@ public class JavaRun implements IAjcRun { @Override public void checkListen(int arg0) { } - @Override public void checkMemberAccess(Class arg0, int arg1) { } @Override @@ -930,7 +927,6 @@ public class JavaRun implements IAjcRun { @Override public void checkSetFactory() { } - @Override public boolean checkTopLevelWindow(Object arg0) { return true; } |