Skip to content

Commit

Permalink
Renamed testers to represent test condition
Browse files Browse the repository at this point in the history
  • Loading branch information
jlink committed Nov 6, 2015
1 parent c32dd8b commit a30844d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Expand Up @@ -20,8 +20,8 @@
import org.junit.gen5.commons.util.ReflectionUtils;
import org.junit.gen5.engine.ClassNameSpecification;
import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.junit5.testers.TestClassTester;
import org.junit.gen5.engine.junit5.testers.TestMethodTester;
import org.junit.gen5.engine.junit5.testers.CanBeTestClass;
import org.junit.gen5.engine.junit5.testers.IsTestMethod;

/**
* @author Stefan Bechtold
Expand All @@ -30,14 +30,14 @@
public class ClassNameTestDescriptorResolver
implements TestDescriptorResolver<ClassNameSpecification, ClassTestDescriptor> {

private static final TestClassTester classTester = new TestClassTester();
private static final CanBeTestClass canBeTestClass = new CanBeTestClass();

private static final TestMethodTester methodTester = new TestMethodTester();
private static final IsTestMethod isTestMethod = new IsTestMethod();

@Override
public ClassTestDescriptor resolve(TestDescriptor parent, ClassNameSpecification element) {
Class<?> clazz = loadClass(element.getClassName());
if (classTester.test(clazz)) {
if (canBeTestClass.test(clazz)) {
return new ClassTestDescriptor(clazz, parent);
}
else {
Expand All @@ -51,7 +51,7 @@ public List<TestDescriptor> resolveChildren(ClassTestDescriptor parent, ClassNam
// TODO Retrieve children resolvers according to type
List<TestDescriptor> children = new LinkedList<>();

List<Method> testMethodCandidates = ReflectionUtils.findMethods(parent.getTestClass(), methodTester,
List<Method> testMethodCandidates = ReflectionUtils.findMethods(parent.getTestClass(), isTestMethod,
ReflectionUtils.MethodSortOrder.HierarchyDown);

// @formatter:off
Expand Down
Expand Up @@ -17,9 +17,9 @@
/**
* @since 5.0
*/
public class TestClassTester extends ReflectionObjectTester implements Predicate<Class<?>> {
public class CanBeTestClass extends ReflectionObjectTester implements Predicate<Class<?>> {

private TestMethodTester methodTester = new TestMethodTester();
private IsTestMethod methodTester = new IsTestMethod();

@Override
public boolean test(Class<?> testClassCandidate) {
Expand Down
Expand Up @@ -19,7 +19,7 @@
* @author Sam Brannen
* @since 5.0
*/
public class TestMethodTester extends ReflectionObjectTester implements Predicate<Method> {
public class IsTestMethod extends ReflectionObjectTester implements Predicate<Method> {

@Override
public boolean test(Method testMethodCandidate) {
Expand Down

0 comments on commit a30844d

Please sign in to comment.