diff options
Diffstat (limited to 'ajde')
| -rw-r--r-- | ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java index 2ea90022a..525e91e52 100644 --- a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java +++ b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java @@ -24,7 +24,9 @@ import java.util.Set; import org.aspectj.ajde.internal.CompilerAdapter; import org.aspectj.bridge.IMessage; +import org.aspectj.tools.ajc.AjcTestCase; import org.aspectj.util.FileUtil; +import org.aspectj.util.LangUtil; /** * Weaving messages are complicated things. There are multiple places where weaving @@ -68,19 +70,6 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase { // 'expected weaving messages' files. regenerate = false; } - - private static boolean is13VMOrGreater = true; - private static boolean is14VMOrGreater = true; - private static boolean is15VMOrGreater = false; - - static { - String vm = System.getProperty("java.vm.version"); - if (vm.startsWith("1.3")) { - is14VMOrGreater = false; - } else if (vm.startsWith("1.5")) { - is15VMOrGreater = true; - } - } private CompilerAdapter compilerAdapter; @@ -175,7 +164,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase { * Weave 'declare @type, @constructor, @method and @field' and check the weave messages that come out. */ public void testWeaveMessagesDeclareAnnotation() { - if (!is15VMOrGreater) return; // annotation classes won't be about pre 15 + if (!LangUtil.is15VMOrGreater()) return; // annotation classes won't be about pre 15 if (debugTests) System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Six.lst"); compilerAdapter = new CompilerAdapter(); compilerAdapter.showInfoMessages(true); |