Author: lzoubek(a)redhat.com
Date: 2011-09-06 09:17:00 -0400 (Tue, 06 Sep 2011)
New Revision: 34542
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
swtbotext: better conditions for running 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-09-06
13:11:35 UTC (rev 34541)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-09-06
13:17:00 UTC (rev 34542)
@@ -1,6 +1,7 @@
package org.jboss.tools.ui.bot.ext;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -139,7 +140,13 @@
protected List<FrameworkMethod> computeTestMethods() {
List<FrameworkMethod> testMethods = new ArrayList<FrameworkMethod>();
for (Method mm : getTestClass().getJavaClass().getMethods()) {
- if (mm.getName().startsWith("test") || mm.getAnnotation(Test.class)!=null)
{
+ if (mm.getAnnotation(Test.class)!=null
+ ||
+ (mm.getName().startsWith("test")
+ && !Modifier.isStatic(mm.getModifiers())
+ && mm.getParameterTypes().length==0
+ && Void.TYPE.equals(mm.getReturnType())
+ )) {
testMethods.add(new FrameworkMethod(mm));
}
}
Show replies by date