Author: lzoubek(a)redhat.com Date: 2011-08-17 10:36:04 -0400 (Wed, 17 Aug 2011) New Revision: 34008 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java Log: swtbotext: support junit3 test* methods Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-08-17 14:06:33 UTC (rev 34007) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-08-17 14:36:04 UTC (rev 34008) @@ -1,5 +1,6 @@ package org.jboss.tools.ui.bot.ext; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -128,6 +129,7 @@ } } + public List<RequirementBase> getRequirements() { return Collections.unmodifiableList(this.requirements); @@ -135,14 +137,18 @@ @Override protected List<FrameworkMethod> computeTestMethods() { - List<FrameworkMethod> testMethods = getTestClass() - .getAnnotatedMethods(Test.class); + List<FrameworkMethod> testMethods = new ArrayList<FrameworkMethod>(); + for (Method mm : getTestClass().getJavaClass().getMethods()) { + if (mm.getName().startsWith("test") || mm.getAnnotation(Test.class)!=null) { + testMethods.add(new FrameworkMethod(mm)); + } + } for (FrameworkMethod method : testMethods) { method.getAnnotation(Category.class); } return testMethods; - } + @Override public void run(RunNotifier notifier) { @@ -184,9 +190,12 @@ log.error("Fulfilling failed", e); } log.info("Done"); + + return super.withBeforeClasses(statement); } } + private static final Logger log = Logger .getLogger(RequirementAwareSuite.class);